X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0df68c9ff5756bb1e479142ddf2c2039573097c8..83448d71476c44b449f09395cda06fa72b19a50e:/wxPython/contrib/glcanvas/gtk/glcanvas.py diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py index e51a645336..e72e91fd30 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas.py +++ b/wxPython/contrib/glcanvas/gtk/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): @@ -62,6 +62,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 @@ -85,9 +87,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 @@ -100,7 +101,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): @@ -123,7 +124,7 @@ 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, + long style=0, String name=GLCanvasNameStr, int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas """ val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)