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 ac95be0d082d24ed0428d9fbb84777cd60598486..a90baddb0f627488a0c0793e4420cd1a63f5a8db 100644 (file)
--- a/wxPython/contrib/glcanvas/mac/glcanvas.py
+++ b/wxPython/contrib/glcanvas/mac/glcanvas.py
@@ -6,12 +6,13 @@ import _glcanvas
 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"""
+        """
+        __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
@@ -27,7 +28,7 @@ class GLContext(core.Object):
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
-        """SetColour(wxString colour)"""
+        """SetColour(String colour)"""
         return _glcanvas.GLContext_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
@@ -45,6 +46,8 @@ class GLContextPtr(GLContext):
         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
@@ -63,14 +66,14 @@ 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):
         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__(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
@@ -82,7 +85,7 @@ class GLCanvas(core.Window):
         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
-        """SetColour(wxString colour)"""
+        """SetColour(String colour)"""
         return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
@@ -101,12 +104,14 @@ class GLCanvasPtr(GLCanvas):
         self.__class__ = GLCanvas
 _glcanvas.GLCanvas_swigregister(GLCanvasPtr)
 
-def wxGLCanvasWithContext(*args, **kwargs):
-    """wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
-    Size size=DefaultSize, 
-    long style=0, wxString name=wxPyGLCanvasNameStr, 
-    int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas"""
-    val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)
+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