X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41f1cec7ae286b1bc5cc189bbf31c060c7ff812a..69d818954b5e6e7b4b4e5093dd26dbe2d5f8546c:/wxPython/contrib/glcanvas/msw/glcanvas.py?ds=sidebyside

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index e51f86aa14..7b4865a3a1 100644
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -28,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):
@@ -46,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
@@ -69,9 +71,8 @@ class GLCanvas(core.Window):
     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
+            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
@@ -84,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):
@@ -119,14 +120,14 @@ class GLCanvasPtr(GLCanvas):
         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, 
-        long style=0, wxString name=wxPyGLCanvasNameStr, 
+        long style=0, String name=GLCanvasNameStr, 
         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