Don't try to typedef off_t twice (eVC++)

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

diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py
index e51a645336c64e7bda8453c5022356ea4ee42626..8c5f7b607b0c5f678fafbb9c25237abf61f9d172 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.py
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py
@@ -1,16 +1,21 @@
 # This file was created automatically by SWIG.
 # Don't modify this file, modify the SWIG interface instead.
 
 # This file was created automatically by SWIG.
 # Don't modify this file, modify the SWIG interface instead.
 

+"""
+`GLCanvas` provides an OpenGL Context on a `wx.Window`.
+"""
+

 import _glcanvas
 
 import _glcanvas
 

-import core
-wx = core 
-class GLContext(core.Object):
+import _core
+wx = _core 
+__docfilter__ = wx.__DocFilter(globals()) 
+class GLContext(_core.Object):

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 
+        __init__(self, bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 

             GLContext other=None) -> GLContext
         """
         newobj = _glcanvas.new_GLContext(*args, **kwargs)
             GLContext other=None) -> GLContext
         """
         newobj = _glcanvas.new_GLContext(*args, **kwargs)


@@ -18,41 +23,41 @@ class GLContext(core.Object):
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_glcanvas.delete_GLContext):
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_glcanvas.delete_GLContext):

-        """__del__()"""
+        """__del__(self)"""

         try:
             if self.thisown: destroy(self)
         except: pass
 
     def SetCurrent(*args, **kwargs):
         try:
             if self.thisown: destroy(self)
         except: pass
 
     def SetCurrent(*args, **kwargs):

-        """SetCurrent()"""
+        """SetCurrent(self)"""

         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxString colour)"""
+        """SetColour(self, String colour)"""

         return _glcanvas.GLContext_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
         return _glcanvas.GLContext_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):

-        """SwapBuffers()"""
+        """SwapBuffers(self)"""

         return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
 
     def SetupPixelFormat(*args, **kwargs):
         return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
 
     def SetupPixelFormat(*args, **kwargs):

-        """SetupPixelFormat()"""
+        """SetupPixelFormat(self)"""

         return _glcanvas.GLContext_SetupPixelFormat(*args, **kwargs)
 
     def SetupPalette(*args, **kwargs):
         return _glcanvas.GLContext_SetupPixelFormat(*args, **kwargs)
 
     def SetupPalette(*args, **kwargs):

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

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

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

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

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

         return _glcanvas.GLContext_GetPalette(*args, **kwargs)
 
     def GetWindow(*args, **kwargs):
         return _glcanvas.GLContext_GetPalette(*args, **kwargs)
 
     def GetWindow(*args, **kwargs):

-        """GetWindow() -> Window"""
+        """GetWindow(self) -> Window"""

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


@@ -62,6 +67,8 @@ class GLContextPtr(GLContext):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = GLContext
 _glcanvas.GLContext_swigregister(GLContextPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = GLContext
 _glcanvas.GLContext_swigregister(GLContextPtr)

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

 
 WX_GL_RGBA = _glcanvas.WX_GL_RGBA
 WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
 
 WX_GL_RGBA = _glcanvas.WX_GL_RGBA
 WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE


@@ -79,15 +86,14 @@ WX_GL_MIN_ACCUM_RED = _glcanvas.WX_GL_MIN_ACCUM_RED
 WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
 WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
 WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
 WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
 WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
 WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA

-class GLCanvas(core.Window):
+class GLCanvas(_core.Window):

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, wxString name=wxPyGLCanvasNameStr, 
-            int attribList=None, 
-            wxPalette palette=wxNullPalette) -> GLCanvas
+        __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

         """
         newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
         self.this = newobj.this


@@ -96,19 +102,19 @@ class GLCanvas(core.Window):
         self._setOORInfo(self)
 
     def SetCurrent(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetCurrent(*args, **kwargs):

-        """SetCurrent()"""
+        """SetCurrent(self)"""

         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxString colour)"""
+        """SetColour(self, String colour)"""

         return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
         return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):

-        """SwapBuffers()"""
+        """SwapBuffers(self)"""

         return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
 
     def GetContext(*args, **kwargs):
         return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
 
     def GetContext(*args, **kwargs):

-        """GetContext() -> GLContext"""
+        """GetContext(self) -> GLContext"""

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


@@ -119,14 +125,14 @@ class GLCanvasPtr(GLCanvas):
         self.__class__ = GLCanvas
 _glcanvas.GLCanvas_swigregister(GLCanvasPtr)
 
         self.__class__ = GLCanvas
 _glcanvas.GLCanvas_swigregister(GLCanvasPtr)
 

-def wxGLCanvasWithContext(*args, **kwargs):
+def GLCanvasWithContext(*args, **kwargs):

     """
     """

-    wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
+    GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 

         Size size=DefaultSize, 
         Size size=DefaultSize, 

-        long style=0, wxString name=wxPyGLCanvasNameStr, 
+        long style=0, String name=GLCanvasNameStr, 

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

-    val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)
+    val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)

     val.thisown = 1
     val._setOORInfo(val)
     return val
     val.thisown = 1
     val._setOORInfo(val)
     return val