SWIGged updates for wxMac

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

diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py
index d4e0d0c096549f6172ce7b626c2f57d4a2da30b7..0780c1886a0d9b00c2a7681ad7f9355585fe2306 100644 (file)
--- a/wxPython/src/mac/misc2.py
+++ b/wxPython/src/mac/misc2.py
@@ -98,9 +98,12 @@ class wxCaretPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxCaret(self)
+    def __del__(self, delfunc=misc2c.delete_wxCaret):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs)
         return val
@@ -156,9 +159,12 @@ class wxBusyCursorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxBusyCursor(self)
+    def __del__(self, delfunc=misc2c.delete_wxBusyCursor):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxBusyCursor instance at %s>" % (self.this,)
 class wxBusyCursor(wxBusyCursorPtr):
@@ -173,9 +179,12 @@ class wxWindowDisablerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxWindowDisabler(self)
+    def __del__(self, delfunc=misc2c.delete_wxWindowDisabler):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxWindowDisabler instance at %s>" % (self.this,)
 class wxWindowDisabler(wxWindowDisablerPtr):
@@ -190,9 +199,12 @@ class wxMutexGuiLockerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxMutexGuiLocker(self)
+    def __del__(self, delfunc=misc2c.delete_wxMutexGuiLocker):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMutexGuiLocker instance at %s>" % (self.this,)
 class wxMutexGuiLocker(wxMutexGuiLockerPtr):
@@ -207,9 +219,12 @@ class wxTipProviderPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxTipProvider(self)
+    def __del__(self, delfunc=misc2c.delete_wxTipProvider):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetTip(self, *_args, **_kwargs):
         val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs)
         return val
@@ -250,17 +265,20 @@ class wxDragImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxDragImage(self)
+    def __del__(self, delfunc=misc2c.delete_wxDragImage):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetBackingBitmap(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs)
         return val
     def BeginDrag(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_BeginDrag,(self,) + _args, _kwargs)
         return val
-    def BeginDrag2(self, *_args, **_kwargs):
-        val = apply(misc2c.wxDragImage_BeginDrag2,(self,) + _args, _kwargs)
+    def BeginDragBounded(self, *_args, **_kwargs):
+        val = apply(misc2c.wxDragImage_BeginDragBounded,(self,) + _args, _kwargs)
         return val
     def EndDrag(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_EndDrag,(self,) + _args, _kwargs)
@@ -283,6 +301,7 @@ class wxDragImagePtr(wxObjectPtr):
         return val
     def __repr__(self):
         return "<C wxDragImage instance at %s>" % (self.this,)
+    BeginDrag2 = BeginDragBounded
 class wxDragImage(wxDragImagePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxDragImage,_args,_kwargs)
@@ -315,9 +334,12 @@ class wxPyTimerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxPyTimer(self)
+    def __del__(self, delfunc=misc2c.delete_wxPyTimer):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetInterval(self, *_args, **_kwargs):
         val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
         return val
@@ -350,9 +372,12 @@ class wxStopWatchPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxStopWatch(self)
+    def __del__(self, delfunc=misc2c.delete_wxStopWatch):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val
@@ -504,9 +529,12 @@ class wxLogNullPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxLogNull(self)
+    def __del__(self, delfunc=misc2c.delete_wxLogNull):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxLogNull instance at %s>" % (self.this,)
 class wxLogNull(wxLogNullPtr):
@@ -631,9 +659,12 @@ class wxJoystickPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxJoystick(self)
+    def __del__(self, delfunc=misc2c.delete_wxJoystick):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPosition(self, *_args, **_kwargs):
         val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -775,9 +806,12 @@ class wxWavePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxWave(self)
+    def __del__(self, delfunc=misc2c.delete_wxWave):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
         return val
@@ -895,9 +929,12 @@ class wxFileTypePtr :
     def Unassociate(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileType_Unassociate,(self,) + _args, _kwargs)
         return val
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxFileType(self)
+    def __del__(self, delfunc=misc2c.delete_wxFileType):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxFileType instance at %s>" % (self.this,)
 class wxFileType(wxFileTypePtr):
@@ -945,9 +982,12 @@ class wxMimeTypesManagerPtr :
     def Unassociate(self, *_args, **_kwargs):
         val = apply(misc2c.wxMimeTypesManager_Unassociate,(self,) + _args, _kwargs)
         return val
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxMimeTypesManager(self)
+    def __del__(self, delfunc=misc2c.delete_wxMimeTypesManager):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMimeTypesManager instance at %s>" % (self.this,)
 class wxMimeTypesManager(wxMimeTypesManagerPtr):
@@ -980,9 +1020,12 @@ class wxFileHistoryPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxFileHistory(self)
+    def __del__(self, delfunc=misc2c.delete_wxFileHistory):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def AddFileToHistory(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs)
         return val
@@ -1091,9 +1134,12 @@ class wxSingleInstanceCheckerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxSingleInstanceChecker(self)
+    def __del__(self, delfunc=misc2c.delete_wxSingleInstanceChecker):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Create(self, *_args, **_kwargs):
         val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs)
         return val
@@ -1186,32 +1232,6 @@ def wxGetTopLevelParent(*_args, **_kwargs):
     val = apply(misc2c.wxGetTopLevelParent,_args,_kwargs)
     return val
 
-wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
-
-wxResourceClear = misc2c.wxResourceClear
-
-def wxResourceCreateBitmap(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateBitmap,_args,_kwargs)
-    if val: val = wxBitmapPtr(val); val.thisown = 1
-    return val
-
-def wxResourceCreateIcon(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateIcon,_args,_kwargs)
-    if val: val = wxIconPtr(val); val.thisown = 1
-    return val
-
-def wxResourceCreateMenuBar(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
-    return val
-
-wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
-
-wxResourceParseData = misc2c.wxResourceParseData
-
-wxResourceParseFile = misc2c.wxResourceParseFile
-
-wxResourceParseString = misc2c.wxResourceParseString
-
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
@@ -1249,6 +1269,8 @@ wxLogMessage = misc2c.wxLogMessage
 
 wxLogInfo = misc2c.wxLogInfo
 
+wxLogDebug = misc2c.wxLogDebug
+
 wxLogVerbose = misc2c.wxLogVerbose
 
 wxLogStatus = misc2c.wxLogStatus
@@ -1338,6 +1360,10 @@ wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask
 
 wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask
 
+wxLog_SetLogLevel = misc2c.wxLog_SetLogLevel
+
+wxLog_GetLogLevel = misc2c.wxLog_GetLogLevel
+
 wxProcess_Kill = misc2c.wxProcess_Kill
 
 wxProcess_Exists = misc2c.wxProcess_Exists
@@ -1367,8 +1393,6 @@ def wxArtProvider_GetIcon(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
-wxArtProvider_CleanUpProviders = misc2c.wxArtProvider_CleanUpProviders
-
 
 
 #-------------- VARIABLE WRAPPERS ------------------