compilation fix for wxMGL

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

diff --git a/wxPython/contrib/ogl/oglbasic.py b/wxPython/contrib/ogl/oglbasic.py
index 1bb9b5c3075ff6aa5d23e15111d75c1e33f37665..162de090961a953897b1d73ac6cdab0825fb6d21 100644 (file)
--- a/wxPython/contrib/ogl/oglbasic.py
+++ b/wxPython/contrib/ogl/oglbasic.py
@@ -42,7 +42,7 @@ from filesys import *
 from utils import *
 import wx
 from oglcanvas import wxPyShapeCanvasPtr
 from utils import *
 import wx
 from oglcanvas import wxPyShapeCanvasPtr

-class wxShapeRegionPtr :
+class wxShapeRegionPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -143,12 +143,12 @@ class wxShapeRegion(wxShapeRegionPtr):
 
 
 
 
 
 

-class wxPyShapeEvtHandlerPtr :
+class wxPyShapeEvtHandlerPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglbasicc.wxPyShapeEvtHandler__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler__setCallbackInfo,(self,) + _args, _kwargs)

         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs)
         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs)


@@ -158,18 +158,15 @@ class wxPyShapeEvtHandlerPtr :
         return val
     def GetShape(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_GetShape,(self,) + _args, _kwargs)
         return val
     def GetShape(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_GetShape,(self,) + _args, _kwargs)

-        if val: val = wxPyShapePtr(val) 

         return val
     def SetPreviousHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs)
         return val
     def GetPreviousHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)
         return val
     def SetPreviousHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs)
         return val
     def GetPreviousHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)

-        if val: val = wxPyShapeEvtHandlerPtr(val) 

         return val
     def CreateNewCopy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_CreateNewCopy,(self,) + _args, _kwargs)
         return val
     def CreateNewCopy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_CreateNewCopy,(self,) + _args, _kwargs)

-        if val: val = wxPyShapeEvtHandlerPtr(val) 

         return val
     def base_OnDelete(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDelete,(self,) + _args, _kwargs)
         return val
     def base_OnDelete(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDelete,(self,) + _args, _kwargs)


@@ -264,7 +261,7 @@ class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
         self.thisown = 1

-        self._setSelf(self, wxPyShapeEvtHandler)
+        self._setCallbackInfo(self, wxPyShapeEvtHandler)

 
 
 
 
 
 


@@ -273,8 +270,8 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglbasicc.wxPyShape__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape__setCallbackInfo,(self,) + _args, _kwargs)

         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)
         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)


@@ -290,7 +287,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
         return val
     def GetCanvas(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetCanvas,(self,) + _args, _kwargs)
         return val
     def GetCanvas(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetCanvas,(self,) + _args, _kwargs)

-        if val: val = wxPyShapeCanvasPtr(val) 

         return val
     def SetCanvas(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetCanvas,(self,) + _args, _kwargs)
         return val
     def SetCanvas(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetCanvas,(self,) + _args, _kwargs)


@@ -318,14 +314,12 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
         return val
     def GetParent(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetParent,(self,) + _args, _kwargs)
         return val
     def GetParent(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetParent,(self,) + _args, _kwargs)

-        if val: val = wxPyShapePtr(val) 

         return val
     def SetParent(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetParent,(self,) + _args, _kwargs)
         return val
     def GetTopAncestor(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetTopAncestor,(self,) + _args, _kwargs)
         return val
     def SetParent(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetParent,(self,) + _args, _kwargs)
         return val
     def GetTopAncestor(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetTopAncestor,(self,) + _args, _kwargs)

-        if val: val = wxPyShapePtr(val) 

         return val
     def GetChildren(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetChildren,(self,) + _args, _kwargs)
         return val
     def GetChildren(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetChildren,(self,) + _args, _kwargs)


@@ -350,7 +344,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
         return val
     def GetEventHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetEventHandler,(self,) + _args, _kwargs)
         return val
     def GetEventHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetEventHandler,(self,) + _args, _kwargs)

-        if val: val = wxPyShapeEvtHandlerPtr(val) 

         return val
     def SetEventHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetEventHandler,(self,) + _args, _kwargs)
         return val
     def SetEventHandler(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetEventHandler,(self,) + _args, _kwargs)


@@ -668,7 +661,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
         return val
     def CreateNewCopy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_CreateNewCopy,(self,) + _args, _kwargs)
         return val
     def CreateNewCopy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_CreateNewCopy,(self,) + _args, _kwargs)

-        if val: val = wxPyShapePtr(val) 

         return val
     def Copy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_Copy,(self,) + _args, _kwargs)
         return val
     def Copy(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_Copy,(self,) + _args, _kwargs)