corrected thread detection for Darwin / Mac OS X

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

diff --git a/wxPython/contrib/ogl/oglbasic.py b/wxPython/contrib/ogl/oglbasic.py
index 162de090961a953897b1d73ac6cdab0825fb6d21..f9270c70d8d8de39cbfd86b30c16bf5215090bd2 100644 (file)
--- a/wxPython/contrib/ogl/oglbasic.py
+++ b/wxPython/contrib/ogl/oglbasic.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 

+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -38,8 +42,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
 from sizers import *
 
 from filesys import *

-
-from utils import *

 import wx
 from oglcanvas import wxPyShapeCanvasPtr
 class wxShapeRegionPtr(wxObjectPtr):
 import wx
 from oglcanvas import wxPyShapeCanvasPtr
 class wxShapeRegionPtr(wxObjectPtr):


@@ -153,6 +155,9 @@ class wxPyShapeEvtHandlerPtr(wxObjectPtr):
     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)
         return val

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

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


@@ -262,6 +267,7 @@ class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr):
         self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyShapeEvtHandler)
         self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyShapeEvtHandler)

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -273,9 +279,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     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 GetBoundingBoxMax(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetBoundingBoxMax,(self,) + _args, _kwargs)
         return val
     def GetBoundingBoxMax(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_GetBoundingBoxMax,(self,) + _args, _kwargs)
         return val


@@ -450,12 +453,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
     def SetBrush(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetBrush,(self,) + _args, _kwargs)
         return val
     def SetBrush(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_SetBrush,(self,) + _args, _kwargs)
         return val

-    def SetClientData(self, *_args, **_kwargs):
-        val = apply(oglbasicc.wxPyShape_SetClientData,(self,) + _args, _kwargs)
-        return val
-    def GetClientData(self, *_args, **_kwargs):
-        val = apply(oglbasicc.wxPyShape_GetClientData,(self,) + _args, _kwargs)
-        return val

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


@@ -683,6 +680,14 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
     def ClearPointList(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_ClearPointList,(self,) + _args, _kwargs)
         return val
     def ClearPointList(self, *_args, **_kwargs):
         val = apply(oglbasicc.wxPyShape_ClearPointList,(self,) + _args, _kwargs)
         return val

+    def GetBackgroundPen(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBackgroundPen,(self,) + _args, _kwargs)
+        if val: val = wxPenPtr(val) ; val.thisown = 1
+        return val
+    def GetBackgroundBrush(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBackgroundBrush,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) ; val.thisown = 1
+        return val

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


@@ -772,6 +777,15 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
         return val
     def __repr__(self):
         return "<C wxPyShape instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxPyShape instance at %s>" % (self.this,)

+    
+    def SetClientData(self, data):
+        self.clientData = data
+    def GetClientData(self):
+        if hasattr(self, 'clientData'):
+            return self.clientData
+        else:
+            return None
+

 class wxPyShape(wxPyShapePtr):
     def __init__(self,this):
         self.this = this
 class wxPyShape(wxPyShapePtr):
     def __init__(self,this):
         self.this = this