No need to use wxPyMake_wxObject for wxImageList. There are no

[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 66a60626befb6fa21a5641c84b299841a3303370..38f48cc8c25a3466d8594a9634903b3ae1af7a0f 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.py
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py
@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.

 # Don't modify this file, modify the SWIG interface instead.
 
 """
 # Don't modify this file, modify the SWIG interface instead.
 
 """


@@ -6,17 +6,17 @@
 """
 
 import _glcanvas
 """
 
 import _glcanvas

-
+import new
+new_instancemethod = new.instancemethod

 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):

+    if (name == "thisown"): return self.this.own(value)

     if (name == "this"):
     if (name == "this"):

-        if isinstance(value, class_type):
-            self.__dict__[name] = value.this
-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
-            del value.thisown
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value

             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)

-    if (not static) or hasattr(self,name) or (name == "thisown"):
+    if (not static) or hasattr(self,name):

         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)


@@ -25,10 +25,16 @@ def _swig_setattr(self,class_type,name,value):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):

+    if (name == "thisown"): return self.this.own()

     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 

+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+

 import types
 try:
     _object = types.ObjectType
 import types
 try:
     _object = types.ObjectType


@@ -41,7 +47,8 @@ del types
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):

-        if hasattr(self,name) or (name in ("this", "thisown")):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):

             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)
             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)


@@ -53,62 +60,18 @@ wx = _core
 __docfilter__ = wx.__DocFilter(globals()) 
 class GLContext(_core.Object):
     """Proxy of C++ GLContext class"""
 __docfilter__ = wx.__DocFilter(globals()) 
 class GLContext(_core.Object):
     """Proxy of C++ GLContext class"""

-    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__(self, 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__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    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, 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):
     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, wxPalette palette)"""
-        return _glcanvas.GLContext_SetupPalette(*args, **kwargs)
-
-    def CreateDefaultPalette(*args, **kwargs):
-        """CreateDefaultPalette(self) -> wxPalette"""
-        return _glcanvas.GLContext_CreateDefaultPalette(*args, **kwargs)
-
-    def GetPalette(*args, **kwargs):
-        """GetPalette(self) -> wxPalette"""
-        return _glcanvas.GLContext_GetPalette(*args, **kwargs)
-
-    def GetWindow(*args, **kwargs):
-        """GetWindow(self) -> Window"""
-        return _glcanvas.GLContext_GetWindow(*args, **kwargs)
-
-
-class GLContextPtr(GLContext):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = GLContext
-_glcanvas.GLContext_swigregister(GLContextPtr)
+_glcanvas.GLContext_swigregister(GLContext)

 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
 
 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
 


@@ -130,22 +93,19 @@ 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):
     """Proxy of C++ GLCanvas class"""
 WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
 class GLCanvas(_core.Window):
     """Proxy of C++ GLCanvas class"""

-    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):
+    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, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 

-            int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
+            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas

         """
         """

-        newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))

         self._setOORInfo(self)
 
     def SetCurrent(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetCurrent(*args, **kwargs):

-        """SetCurrent(self)"""
+        """SetCurrent(self, GLContext RC)"""

         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):


@@ -160,23 +120,17 @@ class GLCanvas(_core.Window):
         """GetContext(self) -> GLContext"""
         return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
 
         """GetContext(self) -> 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)
+    Context = property(GetContext,doc="See `GetContext`") 
+_glcanvas.GLCanvas_swigregister(GLCanvas)

 
 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, 
 
 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
+        int attribList=None, Palette palette=wxNullPalette) -> GLCanvas

     """
     val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
     """
     val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)

-    val.thisown = 1

     val._setOORInfo(val)
     return val
 
     val._setOORInfo(val)
     return val