Added a typemap that converts the references returned for some GDI

[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 f9962bb71b05d91d63bf3cb09e31cc1cdb46acde..a90baddb0f627488a0c0793e4420cd1a63f5a8db 100644 (file)
--- a/wxPython/contrib/glcanvas/mac/glcanvas.py
+++ b/wxPython/contrib/glcanvas/mac/glcanvas.py
@@ -1,113 +1,119 @@
 # 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 clip_dnd import *
-
-from events import *
-
-from streams 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 *
+import core
+wx = core 
+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):
+        """
+        __init__(bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 
+            GLContext other=None) -> GLContext
+        """
+        newobj = _glcanvas.new_GLContext(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_glcanvas.delete_GLContext):
+        """__del__()"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass

 
 

-from sizers import *
+    def SetCurrent(*args, **kwargs):
+        """SetCurrent()"""
+        return _glcanvas.GLContext_SetCurrent(*args, **kwargs)

 
 

-from filesys import *
-
-from utils import *
-import wx
-class wxGLContextPtr(wxObjectPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,glcanvasc=glcanvasc):
-        if self.thisown == 1 :
-            glcanvasc.delete_wxGLContext(self)
-    def SetCurrent(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
-        return val
-    def SetColour(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
-        return val
-    def SwapBuffers(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
-        return val
-    def GetWindow(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxGLContext instance at %s>" % (self.this,)
-class wxGLContext(wxGLContextPtr):
-    def __init__(self,this):
-        self.this = this
+    def SetColour(*args, **kwargs):
+        """SetColour(String colour)"""
+        return _glcanvas.GLContext_SetColour(*args, **kwargs)

 
 

+    def SwapBuffers(*args, **kwargs):
+        """SwapBuffers()"""
+        return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)

 
 

+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _glcanvas.GLContext_GetWindow(*args, **kwargs)

 
 
 
 

-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 = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
-        return val
-    def SetColour(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
-        return val
-    def SwapBuffers(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
-        return val
-    def GetContext(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
-        if val: val = wxGLContextPtr(val) 
-        return val
+        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_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 __repr__(self):
     def __repr__(self):

-        return "<C wxGLCanvas instance at %s>" % (self.this,)
-class wxGLCanvas(wxGLCanvasPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
+        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, String name=GLCanvasNameStr, 
+            int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
+        """
+        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):
+        """SetCurrent()"""
+        return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)

 
 

+    def SetColour(*args, **kwargs):
+        """SetColour(String colour)"""
+        return _glcanvas.GLCanvas_SetColour(*args, **kwargs)

 
 

-def wxGLCanvasWithContext(*_args,**_kwargs):
-    val = wxGLCanvasPtr(apply(glcanvasc.new_wxGLCanvasWithContext,_args,_kwargs))
-    val.thisown = 1
-    val._setOORInfo(self)
-    return val
-
-
-
+    def SwapBuffers(*args, **kwargs):
+        """SwapBuffers()"""
+        return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)

 
 

-#-------------- FUNCTION WRAPPERS ------------------
+    def GetContext(*args, **kwargs):
+        """GetContext() -> GLContext"""
+        return _glcanvas.GLCanvas_GetContext(*args, **kwargs)

 
 
 
 

+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 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
+    """
+    val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 

-#-------------- VARIABLE WRAPPERS ------------------