typo fix

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

diff --git a/wxPython/contrib/ogl/oglshapes.py b/wxPython/contrib/ogl/oglshapes.py
index d43293b5954f6a9960a046d2fa7e9d9fdbe73322..4090867d0838f944bb216031d4b82152cedf6220 100644 (file)
--- a/wxPython/contrib/ogl/oglshapes.py
+++ b/wxPython/contrib/ogl/oglshapes.py
@@ -9,10 +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 *
@@ -35,24 +41,23 @@ from printfw import *
 
 from sizers import *
 
+from filesys import *
+
 from oglbasic import *
 import wx
-class wxPseudoMetaFilePtr :
+class wxPseudoMetaFilePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,oglshapesc=oglshapesc):
-        if self.thisown == 1 :
-            oglshapesc.delete_wxPseudoMetaFile(self)
+    def __del__(self, delfunc=oglshapesc.delete_wxPseudoMetaFile):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Draw(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPseudoMetaFile_Draw,(self,) + _args, _kwargs)
         return val
-    def WriteAttributes(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPseudoMetaFile_WriteAttributes,(self,) + _args, _kwargs)
-        return val
-    def ReadAttributes(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPseudoMetaFile_ReadAttributes,(self,) + _args, _kwargs)
-        return val
     def Clear(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPseudoMetaFile_Clear,(self,) + _args, _kwargs)
         return val
@@ -183,8 +188,8 @@ class wxPyRectangleShapePtr(wxPyShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyRectangleShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyRectangleShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def SetCornerRadius(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyRectangleShape_SetCornerRadius,(self,) + _args, _kwargs)
@@ -282,7 +287,8 @@ class wxPyRectangleShape(wxPyRectangleShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyRectangleShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyRectangleShape)
+        self._setCallbackInfo(self, wxPyRectangleShape)
+        self._setOORInfo(self)
 
 
 
@@ -291,8 +297,8 @@ class wxPyControlPointPtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyControlPoint__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def SetCornerRadius(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyControlPoint_SetCornerRadius,(self,) + _args, _kwargs)
@@ -390,7 +396,8 @@ class wxPyControlPoint(wxPyControlPointPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyControlPoint,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyControlPoint)
+        self._setCallbackInfo(self, wxPyControlPoint)
+        self._setOORInfo(self)
 
 
 
@@ -399,8 +406,8 @@ class wxPyBitmapShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyBitmapShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyBitmapShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def GetBitmap(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyBitmapShape_GetBitmap,(self,) + _args, _kwargs)
@@ -508,7 +515,8 @@ class wxPyBitmapShape(wxPyBitmapShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyBitmapShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyBitmapShape)
+        self._setCallbackInfo(self, wxPyBitmapShape)
+        self._setOORInfo(self)
 
 
 
@@ -517,8 +525,8 @@ class wxPyDrawnShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyDrawnShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyDrawnShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def CalculateSize(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDrawnShape_CalculateSize,(self,) + _args, _kwargs)
@@ -564,7 +572,6 @@ class wxPyDrawnShapePtr(wxPyRectangleShapePtr):
         return val
     def GetMetaFile(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDrawnShape_GetMetaFile,(self,) + _args, _kwargs)
-        if val: val = wxPseudoMetaFilePtr(val) 
         return val
     def GetRotation(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDrawnShape_GetRotation,(self,) + _args, _kwargs)
@@ -698,18 +705,16 @@ class wxPyDrawnShape(wxPyDrawnShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyDrawnShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyDrawnShape)
+        self._setCallbackInfo(self, wxPyDrawnShape)
+        self._setOORInfo(self)
 
 
 
 
-class wxOGLConstraintPtr :
+class wxOGLConstraintPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,oglshapesc=oglshapesc):
-        if self.thisown == 1 :
-            oglshapesc.delete_wxOGLConstraint(self)
     def Evaluate(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxOGLConstraint_Evaluate,(self,) + _args, _kwargs)
         return val
@@ -733,23 +738,20 @@ class wxPyCompositeShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyCompositeShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyCompositeShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def AddChild(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_AddChild,(self,) + _args, _kwargs)
         return val
     def AddConstraint(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_AddConstraint,(self,) + _args, _kwargs)
-        if val: val = wxOGLConstraintPtr(val) 
         return val
     def AddConstrainedShapes(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_AddConstrainedShapes,(self,) + _args, _kwargs)
-        if val: val = wxOGLConstraintPtr(val) 
         return val
     def AddSimpleConstraint(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_AddSimpleConstraint,(self,) + _args, _kwargs)
-        if val: val = wxOGLConstraintPtr(val) 
         return val
     def CalculateSize(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_CalculateSize,(self,) + _args, _kwargs)
@@ -765,7 +767,6 @@ class wxPyCompositeShapePtr(wxPyRectangleShapePtr):
         return val
     def FindContainerImage(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_FindContainerImage,(self,) + _args, _kwargs)
-        if val: val = wxPyShapePtr(val) 
         return val
     def GetConstraints(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyCompositeShape_GetConstraints,(self,) + _args, _kwargs)
@@ -875,7 +876,8 @@ class wxPyCompositeShape(wxPyCompositeShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyCompositeShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyCompositeShape)
+        self._setCallbackInfo(self, wxPyCompositeShape)
+        self._setOORInfo(self)
 
 
 
@@ -884,8 +886,8 @@ class wxPyDividedShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyDividedShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyDividedShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def EditRegions(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDividedShape_EditRegions,(self,) + _args, _kwargs)
@@ -986,7 +988,8 @@ class wxPyDividedShape(wxPyDividedShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyDividedShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyDividedShape)
+        self._setCallbackInfo(self, wxPyDividedShape)
+        self._setOORInfo(self)
 
 
 
@@ -995,8 +998,8 @@ class wxPyDivisionShapePtr(wxPyCompositeShapePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPyDivisionShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyDivisionShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def AdjustBottom(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_AdjustBottom,(self,) + _args, _kwargs)
@@ -1018,14 +1021,12 @@ class wxPyDivisionShapePtr(wxPyCompositeShapePtr):
         return val
     def GetBottomSide(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetBottomSide,(self,) + _args, _kwargs)
-        if val: val = wxPyDivisionShapePtr(val) 
         return val
     def GetHandleSide(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetHandleSide,(self,) + _args, _kwargs)
         return val
     def GetLeftSide(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetLeftSide,(self,) + _args, _kwargs)
-        if val: val = wxPyDivisionShapePtr(val) 
         return val
     def GetLeftSideColour(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetLeftSideColour,(self,) + _args, _kwargs)
@@ -1036,11 +1037,9 @@ class wxPyDivisionShapePtr(wxPyCompositeShapePtr):
         return val
     def GetRightSide(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetRightSide,(self,) + _args, _kwargs)
-        if val: val = wxPyDivisionShapePtr(val) 
         return val
     def GetTopSide(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetTopSide,(self,) + _args, _kwargs)
-        if val: val = wxPyDivisionShapePtr(val) 
         return val
     def GetTopSidePen(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPyDivisionShape_GetTopSidePen,(self,) + _args, _kwargs)
@@ -1172,7 +1171,8 @@ class wxPyDivisionShape(wxPyDivisionShapePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglshapesc.new_wxPyDivisionShape,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyDivisionShape)
+        self._setCallbackInfo(self, wxPyDivisionShape)
+        self._setOORInfo(self)