Another package name fix

[wxWidgets.git] / wxPython / contrib / glcanvas / msw / glcanvas.py

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index d217b83ff59edfdee6553974ba2caa539c033e01..dabff1a972a492798d6e07db83b270ff6cfab1d9 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -63,31 +63,15 @@ class GLContext(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """
-        __init__(self, bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 
-            GLContext other=None) -> GLContext
-        """
+        """__init__(self, GLCanvas win, GLContext other=None) -> GLContext"""

         _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
     __swig_destroy__ = _glcanvas.delete_GLContext
     __del__ = lambda self : None;
     def SetCurrent(*args, **kwargs):
         _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
     __swig_destroy__ = _glcanvas.delete_GLContext
     __del__ = lambda self : None;
     def SetCurrent(*args, **kwargs):

-        """SetCurrent(self)"""
+        """SetCurrent(self, GLCanvas win)"""

         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 

-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLContext_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
-
-    def GetWindow(*args, **kwargs):
-        """GetWindow(self) -> Window"""
-        return _glcanvas.GLContext_GetWindow(*args, **kwargs)
-
-GLContext_swigregister = _glcanvas.GLContext_swigregister
-GLContext_swigregister(GLContext)
+_glcanvas.GLContext_swigregister(GLContext)

 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
 
 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
 


@@ -115,14 +99,17 @@ class GLCanvas(_core.Window):
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 

-            int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
+            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas

         """
         _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
         self._setOORInfo(self)
 
         """
         _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
         self._setOORInfo(self)
 

-    def SetCurrent(*args, **kwargs):
-        """SetCurrent(self)"""
-        return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
+    def SetCurrent(*args):
+        """
+        SetCurrent(self)
+        SetCurrent(self, GLContext RC)
+        """
+        return _glcanvas.GLCanvas_SetCurrent(*args)

 
     def SetColour(*args, **kwargs):
         """SetColour(self, String colour)"""
 
     def SetColour(*args, **kwargs):
         """SetColour(self, String colour)"""


@@ -141,26 +128,26 @@ class GLCanvas(_core.Window):
         return _glcanvas.GLCanvas_SetupPixelFormat(*args, **kwargs)
 
     def SetupPalette(*args, **kwargs):
         return _glcanvas.GLCanvas_SetupPixelFormat(*args, **kwargs)
 
     def SetupPalette(*args, **kwargs):

-        """SetupPalette(self, wxPalette palette)"""
+        """SetupPalette(self, Palette palette)"""

         return _glcanvas.GLCanvas_SetupPalette(*args, **kwargs)
 
     def CreateDefaultPalette(*args, **kwargs):
         return _glcanvas.GLCanvas_SetupPalette(*args, **kwargs)
 
     def CreateDefaultPalette(*args, **kwargs):

-        """CreateDefaultPalette(self) -> wxPalette"""
+        """CreateDefaultPalette(self) -> Palette"""

         return _glcanvas.GLCanvas_CreateDefaultPalette(*args, **kwargs)
 
     def GetPalette(*args, **kwargs):
         return _glcanvas.GLCanvas_CreateDefaultPalette(*args, **kwargs)
 
     def GetPalette(*args, **kwargs):

-        """GetPalette(self) -> wxPalette"""
+        """GetPalette(self) -> Palette"""

         return _glcanvas.GLCanvas_GetPalette(*args, **kwargs)
 
         return _glcanvas.GLCanvas_GetPalette(*args, **kwargs)
 

-GLCanvas_swigregister = _glcanvas.GLCanvas_swigregister
-GLCanvas_swigregister(GLCanvas)
+    Context = property(GetContext,doc="See `GetContext`") 
+_glcanvas.GLCanvas_swigregister(GLCanvas)

 
 def GLCanvasWithContext(*args, **kwargs):
     """
     GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
         Size size=DefaultSize, 
         long style=0, String name=GLCanvasNameStr, 
 
 def GLCanvasWithContext(*args, **kwargs):
     """
     GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
         Size size=DefaultSize, 
         long style=0, String name=GLCanvasNameStr, 

-        int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
+        int attribList=None, Palette palette=wxNullPalette) -> GLCanvas

     """
     val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
     val._setOORInfo(val)
     """
     val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
     val._setOORInfo(val)