X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68bc8549d81adc1b6f031bdbb03b91a71944197c..b7d681eb049c69e2bdd1199105cf34067c8dbb78:/wxPython/contrib/glcanvas/msw/glcanvas.py

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index 6ae845efc3..fa4d7f1c4a 100644
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -47,26 +47,29 @@ class wxGLContextPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,glcanvasc=glcanvasc):
-        if self.thisown == 1 :
-            glcanvasc.delete_wxGLContext(self)
+    def __del__(self, delfunc=glcanvasc.delete_wxGLContext):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetCurrent(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLContext_SetCurrent(self, *_args, **_kwargs)
         return val
     def SetColour(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLContext_SetColour(self, *_args, **_kwargs)
         return val
     def SwapBuffers(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLContext_SwapBuffers(self, *_args, **_kwargs)
         return val
     def GetWindow(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLContext_GetWindow(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxGLContext instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxGLContext(wxGLContextPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
+        self.this = glcanvasc.new_wxGLContext(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -77,44 +80,44 @@ class wxGLCanvasPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def SetCurrent(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_SetCurrent(self, *_args, **_kwargs)
         return val
     def SetColour(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_SetColour(self, *_args, **_kwargs)
         return val
     def SwapBuffers(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_SwapBuffers(self, *_args, **_kwargs)
         return val
     def GetContext(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_GetContext(self, *_args, **_kwargs)
         if val: val = wxGLContextPtr(val) 
         return val
     def SetupPixelFormat(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SetupPixelFormat,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_SetupPixelFormat(self, *_args, **_kwargs)
         return val
     def SetupPalette(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_SetupPalette,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_SetupPalette(self, *_args, **_kwargs)
         return val
     def CreateDefaultPalette(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_CreateDefaultPalette,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_CreateDefaultPalette(self, *_args, **_kwargs)
         if val: val = wxPalettePtr(val) ; val.thisown = 1
         return val
     def GetPalette(self, *_args, **_kwargs):
-        val = apply(glcanvasc.wxGLCanvas_GetPalette,(self,) + _args, _kwargs)
+        val = glcanvasc.wxGLCanvas_GetPalette(self, *_args, **_kwargs)
         if val: val = wxPalettePtr(val) 
         return val
     def __repr__(self):
-        return "<C wxGLCanvas instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxGLCanvas(wxGLCanvasPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
+        self.this = glcanvasc.new_wxGLCanvas(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxGLCanvasWithContext(*_args,**_kwargs):
-    val = wxGLCanvasPtr(apply(glcanvasc.new_wxGLCanvasWithContext,_args,_kwargs))
+    val = wxGLCanvasPtr(glcanvasc.new_wxGLCanvasWithContext(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(self)
     return val