Updated docstring patch for new SWIG CVS

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

diff --git a/wxPython/contrib/glcanvas/mac/glcanvas.py b/wxPython/contrib/glcanvas/mac/glcanvas.py
index a63c8ac7d30bf27ae2cec5b1b76a445664794671..81a92af688dac698748ca04d2fde3d7a9ba2c81c 100644 (file)
--- a/wxPython/contrib/glcanvas/mac/glcanvas.py
+++ b/wxPython/contrib/glcanvas/mac/glcanvas.py
@@ -1,134 +1,75 @@
 # This file was created automatically by SWIG.
 # This file was created automatically by SWIG.

-import glcanvasc
+# Don't modify this file, modify the SWIG interface instead.

 
 

-from misc import *
+import _glcanvas

 
 

-from misc2 import *
-
-from windows import *
-
-from gdi import *
-
-from fonts import *
-
-from clip_dnd import *
-
-from events import *
-
-from streams import *
-
-from utils import *
-
-from mdi import *
-
-from frames import *
-
-from stattool import *
-
-from controls import *
-
-from controls2 import *
-
-from windows2 import *
-
-from cmndlgs import *
-
-from windows3 import *
-
-from image import *
-
-from printfw import *
-
-from sizers import *
-
-from filesys import *
-import wx
-class wxGLContextPtr(wxObjectPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self, delfunc=glcanvasc.delete_wxGLContext):
-        if self.thisown == 1:
-            try:
-                delfunc(self)
-            except:
-                pass
-    def SetCurrent(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetCurrent(self, *_args, **_kwargs)
-        return val
-    def SetColour(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetColour(self, *_args, **_kwargs)
-        return val
-    def SwapBuffers(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SwapBuffers(self, *_args, **_kwargs)
-        return val
-    def GetWindow(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_GetWindow(self, *_args, **_kwargs)
-        return val
+import core
+wx = core 
+class GLContext(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _glcanvas.new_GLContext(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_glcanvas.delete_GLContext):
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+    def SetCurrent(*args, **kwargs): return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
+    def SetColour(*args, **kwargs): return _glcanvas.GLContext_SetColour(*args, **kwargs)
+    def SwapBuffers(*args, **kwargs): return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
+    def GetWindow(*args, **kwargs): return _glcanvas.GLContext_GetWindow(*args, **kwargs)

     def __repr__(self):
     def __repr__(self):

-        return "<%s.%s instance; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxGLContext(wxGLContextPtr):
-    def __init__(self,this):
-        self.this = this
-
+        return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 

-
-
-class wxGLCanvasPtr(wxWindowPtr):
-    def __init__(self,this):
+class GLContextPtr(GLContext):
+    def __init__(self, this):

         self.this = this
         self.this = this

-        self.thisown = 0
-    def SetCurrent(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SetCurrent(self, *_args, **_kwargs)
-        return val
-    def SetColour(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SetColour(self, *_args, **_kwargs)
-        return val
-    def SwapBuffers(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SwapBuffers(self, *_args, **_kwargs)
-        return val
-    def GetContext(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_GetContext(self, *_args, **_kwargs)
-        if val: val = wxGLContextPtr(val) 
-        return val
-    def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxGLCanvas(wxGLCanvasPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = glcanvasc.new_wxGLCanvas(*_args,**_kwargs)
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = GLContext
+_glcanvas.GLContext_swigregister(GLContextPtr)
+
+WX_GL_RGBA = _glcanvas.WX_GL_RGBA
+WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
+WX_GL_LEVEL = _glcanvas.WX_GL_LEVEL
+WX_GL_DOUBLEBUFFER = _glcanvas.WX_GL_DOUBLEBUFFER
+WX_GL_STEREO = _glcanvas.WX_GL_STEREO
+WX_GL_AUX_BUFFERS = _glcanvas.WX_GL_AUX_BUFFERS
+WX_GL_MIN_RED = _glcanvas.WX_GL_MIN_RED
+WX_GL_MIN_GREEN = _glcanvas.WX_GL_MIN_GREEN
+WX_GL_MIN_BLUE = _glcanvas.WX_GL_MIN_BLUE
+WX_GL_MIN_ALPHA = _glcanvas.WX_GL_MIN_ALPHA
+WX_GL_DEPTH_SIZE = _glcanvas.WX_GL_DEPTH_SIZE
+WX_GL_STENCIL_SIZE = _glcanvas.WX_GL_STENCIL_SIZE
+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
+class GLCanvas(core.Window):
+    def __init__(self, *args, **kwargs):
+        newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
+        self.this = newobj.this

         self.thisown = 1
         self.thisown = 1

+        del newobj.thisown

         self._setOORInfo(self)
         self._setOORInfo(self)

+    def SetCurrent(*args, **kwargs): return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
+    def SetColour(*args, **kwargs): return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
+    def SwapBuffers(*args, **kwargs): return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
+    def GetContext(*args, **kwargs): return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 

+class GLCanvasPtr(GLCanvas):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = GLCanvas
+_glcanvas.GLCanvas_swigregister(GLCanvasPtr)

 
 

-
-def wxGLCanvasWithContext(*_args,**_kwargs):
-    val = wxGLCanvasPtr(glcanvasc.new_wxGLCanvasWithContext(*_args,**_kwargs))
+def wxGLCanvasWithContext(*args, **kwargs):
+    val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)

     val.thisown = 1
     val.thisown = 1

-    val._setOORInfo(self)
+    val._setOORInfo(val)

     return val
 
 
     return val
 
 

-
-
-#-------------- FUNCTION WRAPPERS ------------------
-
-
-
-#-------------- VARIABLE WRAPPERS ------------------
-
-WX_GL_RGBA = glcanvasc.WX_GL_RGBA
-WX_GL_BUFFER_SIZE = glcanvasc.WX_GL_BUFFER_SIZE
-WX_GL_LEVEL = glcanvasc.WX_GL_LEVEL
-WX_GL_DOUBLEBUFFER = glcanvasc.WX_GL_DOUBLEBUFFER
-WX_GL_STEREO = glcanvasc.WX_GL_STEREO
-WX_GL_AUX_BUFFERS = glcanvasc.WX_GL_AUX_BUFFERS
-WX_GL_MIN_RED = glcanvasc.WX_GL_MIN_RED
-WX_GL_MIN_GREEN = glcanvasc.WX_GL_MIN_GREEN
-WX_GL_MIN_BLUE = glcanvasc.WX_GL_MIN_BLUE
-WX_GL_MIN_ALPHA = glcanvasc.WX_GL_MIN_ALPHA
-WX_GL_DEPTH_SIZE = glcanvasc.WX_GL_DEPTH_SIZE
-WX_GL_STENCIL_SIZE = glcanvasc.WX_GL_STENCIL_SIZE
-WX_GL_MIN_ACCUM_RED = glcanvasc.WX_GL_MIN_ACCUM_RED
-WX_GL_MIN_ACCUM_GREEN = glcanvasc.WX_GL_MIN_ACCUM_GREEN
-WX_GL_MIN_ACCUM_BLUE = glcanvasc.WX_GL_MIN_ACCUM_BLUE
-WX_GL_MIN_ACCUM_ALPHA = glcanvasc.WX_GL_MIN_ACCUM_ALPHA