Removed deprecation warnings in OGL and Gizmos

[wxWidgets.git] / wxPython / contrib / ogl / oglshapes2.py

diff --git a/wxPython/contrib/ogl/oglshapes2.py b/wxPython/contrib/ogl/oglshapes2.py
index 5d1a7f6566f117abb3b7fdf4859c521c3a8d986e..60d4c2947e9bca6b5df9df506cdf78fd9402cad3 100644 (file)
--- a/wxPython/contrib/ogl/oglshapes2.py
+++ b/wxPython/contrib/ogl/oglshapes2.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -39,8 +43,6 @@ from sizers import *
 
 from filesys import *
 
-from utils import *
-
 from oglbasic import *
 
 from oglshapes import *
@@ -49,8 +51,8 @@ class wxPyEllipseShapePtr(wxPyShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapes2c.wxPyEllipseShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnDraw(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyEllipseShape_base_OnDraw,(self,) + _args, _kwargs)
@@ -142,7 +144,8 @@ class wxPyEllipseShape(wxPyEllipseShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyEllipseShape)
+        self._setCallbackInfo(self, wxPyEllipseShape)
+        self._setOORInfo(self)
 
 
 
@@ -151,8 +154,8 @@ class wxPyCircleShapePtr(wxPyEllipseShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapes2c.wxPyCircleShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnDraw(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyCircleShape_base_OnDraw,(self,) + _args, _kwargs)
@@ -244,7 +247,8 @@ class wxPyCircleShape(wxPyCircleShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyCircleShape)
+        self._setCallbackInfo(self, wxPyCircleShape)
+        self._setOORInfo(self)
 
 
 
@@ -253,9 +257,12 @@ class wxArrowHeadPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,oglshapes2c=oglshapes2c):
-        if self.thisown == 1 :
-            oglshapes2c.delete_wxArrowHead(self)
+    def __del__(self, delfunc=oglshapes2c.delete_wxArrowHead):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def _GetType(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs)
         return val
@@ -318,8 +325,8 @@ class wxPyLineShapePtr(wxPyShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapes2c.wxPyLineShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def AddArrow(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyLineShape_AddArrow,(self,) + _args, _kwargs)
@@ -389,7 +396,7 @@ class wxPyLineShapePtr(wxPyShapePtr):
         return val
     def GetNextControlPoint(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyLineShape_GetNextControlPoint,(self,) + _args, _kwargs)
-        if val: val = wxPointPtr(val) 
+        if val: val = wxRealPointPtr(val) 
         return val
     def GetTo(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyLineShape_GetTo,(self,) + _args, _kwargs)
@@ -532,7 +539,8 @@ class wxPyLineShape(wxPyLineShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyLineShape)
+        self._setCallbackInfo(self, wxPyLineShape)
+        self._setOORInfo(self)
 
 
 
@@ -541,8 +549,8 @@ class wxPyPolygonShapePtr(wxPyShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapes2c.wxPyPolygonShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def Create(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyPolygonShape_Create,(self,) + _args, _kwargs)
@@ -652,7 +660,8 @@ class wxPyPolygonShape(wxPyPolygonShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyPolygonShape)
+        self._setCallbackInfo(self, wxPyPolygonShape)
+        self._setOORInfo(self)
 
 
 
@@ -661,8 +670,8 @@ class wxPyTextShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapes2c.wxPyTextShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnDelete(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxPyTextShape_base_OnDelete,(self,) + _args, _kwargs)
@@ -757,7 +766,8 @@ class wxPyTextShape(wxPyTextShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyTextShape)
+        self._setCallbackInfo(self, wxPyTextShape)
+        self._setOORInfo(self)