added support for underlined fonts

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

diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py
index 96c0948e77ee60d1b46aca8f611808cc8bd9ea06..550270f00fb4a9251c91f40b3047e5c4b6d1d6ce 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.py
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py
@@ -63,45 +63,14 @@ class GLContext(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """
-        __init__(self, bool isRGB, GLCanvas win, Palette palette=wxNullPalette, 
-            GLContext other=None) -> GLContext
-        """
+        """__init__(self, GLCanvas win, GLContext other=None) -> GLContext"""

         _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
     __swig_destroy__ = _glcanvas.delete_GLContext
     __del__ = lambda self : None;
     def SetCurrent(*args, **kwargs):
         _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
     __swig_destroy__ = _glcanvas.delete_GLContext
     __del__ = lambda self : None;
     def SetCurrent(*args, **kwargs):

-        """SetCurrent(self)"""
+        """SetCurrent(self, GLCanvas win)"""

         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 

-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLContext_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
-
-    def SetupPixelFormat(*args, **kwargs):
-        """SetupPixelFormat(self)"""
-        return _glcanvas.GLContext_SetupPixelFormat(*args, **kwargs)
-
-    def SetupPalette(*args, **kwargs):
-        """SetupPalette(self, Palette palette)"""
-        return _glcanvas.GLContext_SetupPalette(*args, **kwargs)
-
-    def CreateDefaultPalette(*args, **kwargs):
-        """CreateDefaultPalette(self) -> Palette"""
-        return _glcanvas.GLContext_CreateDefaultPalette(*args, **kwargs)
-
-    def GetPalette(*args, **kwargs):
-        """GetPalette(self) -> Palette"""
-        return _glcanvas.GLContext_GetPalette(*args, **kwargs)
-
-    def GetWindow(*args, **kwargs):
-        """GetWindow(self) -> Window"""
-        return _glcanvas.GLContext_GetWindow(*args, **kwargs)
-

 _glcanvas.GLContext_swigregister(GLContext)
 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
 _glcanvas.GLContext_swigregister(GLContext)
 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr


@@ -135,9 +104,12 @@ class GLCanvas(_core.Window):
         _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
         self._setOORInfo(self)
 
         _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
         self._setOORInfo(self)
 

-    def SetCurrent(*args, **kwargs):
-        """SetCurrent(self)"""
-        return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
+    def SetCurrent(*args):
+        """
+        SetCurrent(self)
+        SetCurrent(self, GLContext RC)
+        """
+        return _glcanvas.GLCanvas_SetCurrent(*args)

 
     def SetColour(*args, **kwargs):
         """SetColour(self, String colour)"""
 
     def SetColour(*args, **kwargs):
         """SetColour(self, String colour)"""


@@ -151,6 +123,7 @@ class GLCanvas(_core.Window):
         """GetContext(self) -> GLContext"""
         return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
 
         """GetContext(self) -> GLContext"""
         return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
 

+    Context = property(GetContext,doc="See `GetContext`") 

 _glcanvas.GLCanvas_swigregister(GLCanvas)
 
 def GLCanvasWithContext(*args, **kwargs):
 _glcanvas.GLCanvas_swigregister(GLCanvas)
 
 def GLCanvasWithContext(*args, **kwargs):