[Wxlua-commit] wxLua/bindings/wxwidgets gdi.i,1.33,1.34

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

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

Modified Files:
	gdi.i 
Log Message:
update wxGLXXX for 2.8


Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** gdi.i	19 Dec 2006 06:18:02 -0000	1.33
--- gdi.i	23 Dec 2006 05:58:14 -0000	1.34
***************
*** 1243,1264 ****
  
  %class wxGLCanvas, wxWindow
      wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
      %constructor wxGLCanvasFromContext wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
!     %constructor wxGLCanvasFromCCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
  
!     wxGLContext* GetContext()
      void SetCurrent()
      void SetColour(const wxString& colour)
      void SwapBuffers()
  %endclass
  
  %class wxGLContext, wxObject
!     wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette)
!     %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other)
  
-     const wxWindow*  GetWindow()
-     void SetCurrent()
-     void SetColour(const wxString& colour)
-     void SwapBuffers()
  %endclass
  
--- 1243,1275 ----
  
  %class wxGLCanvas, wxWindow
+     // %override Note: attribList[] parameter is a lua table with integer indexes
      wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
      %constructor wxGLCanvasFromContext wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
!     %constructor wxGLCanvasFromCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette)
  
!     wxGLContext* GetContext() const
      void SetCurrent()
+     %wxchkver28 void SetCurrent(const wxGLContext& RC) const
      void SetColour(const wxString& colour)
      void SwapBuffers()
  %endclass
  
+ 
  %class wxGLContext, wxObject
!     // for <= 2.6
!     !%wxchkver28 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette)
!     !%wxchkver28 %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other)
! 
!     !%wxchkver28 const wxWindow*  GetWindow()
!     !%wxchkver28 void SetCurrent()
!     !%wxchkver28 void SetColour(const wxString& colour)
!     !%wxchkver28 void SwapBuffers()
! 
!     // for >= 2.8
! 
!     %wxchkver28 wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL )
! 
!     %wxchkver28 void SetCurrent(const wxGLCanvas& win) const
  
  %endclass