if we are not in the main thread, output the assert directly and trap since

[wxWidgets.git] / wxPython / src / mac / controls.py

diff --git a/wxPython/src/mac/controls.py b/wxPython/src/mac/controls.py
index 4b766fec3af36e0cdf00941d4050f3c7cf5871b0..3491f87a54ffcf4ca8731e9c77ebd2d017ba5d18 100644 (file)
--- a/wxPython/src/mac/controls.py
+++ b/wxPython/src/mac/controls.py
@@ -200,6 +200,9 @@ class wxCheckBoxPtr(wxControlPtr):
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_IsChecked,(self,) + _args, _kwargs)
+        return val
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)
         return val
@@ -533,6 +536,12 @@ class wxCheckListBoxPtr(wxListBoxPtr):
     def InsertItems(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_InsertItems,(self,) + _args, _kwargs)
         return val
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTest,(self,) + _args, _kwargs)
+        return val
+    def HitTestXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTestXY,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxCheckListBox instance at %s>" % (self.this,)
 class wxCheckListBox(wxCheckListBoxPtr):
@@ -554,9 +563,12 @@ class wxTextAttrPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,controlsc=controlsc):
-        if self.thisown == 1 :
-            controlsc.delete_wxTextAttr(self)
+    def __del__(self, delfunc=controlsc.delete_wxTextAttr):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
         return val
@@ -915,6 +927,9 @@ class wxRadioBoxPtr(wxControlPtr):
     def GetRowCount(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs)
         return val
+    def GetNextItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetNextItem,(self,) + _args, _kwargs)
+        return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val