[Wxlua-commit] wxLua/bindings/wxwidgets wxgl_gl.i,1.1,1.2

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16085/wxwidgets

Modified Files:
	wxgl_gl.i 
Log Message:
Update for OSX since its wxGLXXX doesn't match MSW's or GTK's


Index: wxgl_gl.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxgl_gl.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxgl_gl.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxgl_gl.i	9 Jan 2008 05:00:49 -0000	1.2
***************
*** 42,50 ****
      wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
      wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
!     wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette)
  
      wxGLContext* GetContext() const
!     void SetCurrent()
!     %wxchkver_2_8 void SetCurrent(const wxGLContext& RC) const
      void SetColour(const wxString& colour)
      void SwapBuffers()
--- 42,50 ----
      wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
      wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
!     !%mac wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette)
  
      wxGLContext* GetContext() const
!     %mac void SetCurrent()
!     %wxchkver_2_8&!%mac void SetCurrent(const wxGLContext& RC) const
      void SetColour(const wxString& colour)
      void SwapBuffers()
***************
*** 57,63 ****
  
      %if %wxchkver_2_8
!         wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL )
  
!         void SetCurrent(const wxGLCanvas& win) const
      %endif // %wxchkver_2_8
  
--- 57,64 ----
  
      %if %wxchkver_2_8
!         !%mac wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) // FIXME
  
!         !%mac void SetCurrent(const wxGLCanvas& win) const
!         %mac void SetCurrent() const
      %endif // %wxchkver_2_8