fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)

[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 95426b60e7859cc0c2d0055a9659a9b7f0c9c7f5..55eb961e27e5bca2eb3c07572d5aea465b081ab7 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): 
-        """
-        __init__(self, bool isRGB, GLCanvas win, Palette 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):
-        """SetCurrent(self)"""
+        """SetCurrent(self, GLCanvas win)"""
         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
 
@@ -113,16 +97,21 @@ class GLCanvas(_core.Window):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
-            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
+        __init__(self, Window parent, int id=-1, int attribList=None, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=0, String name=GLCanvasNameStr, Palette palette=wxNullPalette) -> GLCanvas
         """
         _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 Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=wxGLCanvasName, 
+            int attribList=None, 
+            Palette palette=wxNullPalette) -> bool
+        """
+        return _glcanvas.GLCanvas_Create(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         """SetColour(self, String colour)"""
@@ -136,9 +125,12 @@ class GLCanvas(_core.Window):
         """GetContext(self) -> GLContext"""
         return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
 
-    def SetupPixelFormat(*args, **kwargs):
-        """SetupPixelFormat(self, int attribList=None)"""
-        return _glcanvas.GLCanvas_SetupPixelFormat(*args, **kwargs)
+    def SetCurrent(*args):
+        """
+        SetCurrent(self, GLContext context)
+        SetCurrent(self)
+        """
+        return _glcanvas.GLCanvas_SetCurrent(*args)
 
     def SetupPalette(*args, **kwargs):
         """SetupPalette(self, Palette palette)"""
@@ -152,8 +144,8 @@ class GLCanvas(_core.Window):
         """GetPalette(self) -> Palette"""
         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):
     """