Fixed Ron's fix

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

diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index 8260fac59caf2bbaabed6ac88a00eb83628d6138..f14a5b3935f5d98685684e64538c828bef8c321a 100644 (file)
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/misc2.py
@@ -12,7 +12,7 @@ from clip_dnd import *
 from events import *
 
 from streams import *
-class wxToolTipPtr :
+class wxToolTipPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -24,7 +24,6 @@ class wxToolTipPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(misc2c.wxToolTip_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def __repr__(self):
         return "<C wxToolTip instance at %s>" % (self.this,)
@@ -65,7 +64,6 @@ class wxCaretPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def MoveXY(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_MoveXY,(self,) + _args, _kwargs)
@@ -215,13 +213,16 @@ class wxPyTipProvider(wxPyTipProviderPtr):
 
 
 
-class wxDragImagePtr :
+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 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
@@ -256,8 +257,28 @@ class wxDragImage(wxDragImagePtr):
 
 
 
+def wxDragIcon(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragIcon,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxDragString(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragString,_args,_kwargs))
+    val.thisown = 1
+    return val
 
-class wxPyTimerPtr :
+def wxDragTreeItem(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragTreeItem,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxDragListItem(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragListItem,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
+class wxPyTimerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -369,7 +390,6 @@ class wxLogWindowPtr(wxLogPtr):
         return val
     def GetFrame(self, *_args, **_kwargs):
         val = apply(misc2c.wxLogWindow_GetFrame,(self,) + _args, _kwargs)
-        if val: val = wxFramePtr(val) 
         return val
     def GetOldLog(self, *_args, **_kwargs):
         val = apply(misc2c.wxLogWindow_GetOldLog,(self,) + _args, _kwargs)
@@ -488,10 +508,13 @@ class wxProcess(wxProcessPtr):
 
 
 
-class wxJoystickPtr :
+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 GetPosition(self, *_args, **_kwargs):
         val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -629,6 +652,29 @@ class wxJoystick(wxJoystickPtr):
 
 
 
+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 IsOk(self, *_args, **_kwargs):
+        val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
+        return val
+    def Play(self, *_args, **_kwargs):
+        val = apply(misc2c.wxWave_Play,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxWave instance at %s>" % (self.this,)
+class wxWave(wxWavePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxWave,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -678,21 +724,30 @@ wxSetCursor = misc2c.wxSetCursor
 
 def wxFindWindowByLabel(*_args, **_kwargs):
     val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
 def wxFindWindowByName(*_args, **_kwargs):
     val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):
     val = apply(misc2c.wxGetActiveWindow,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
+def wxGenericFindWindowAtPoint(*_args, **_kwargs):
+    val = apply(misc2c.wxGenericFindWindowAtPoint,_args,_kwargs)
+    return val
+
+def wxFindWindowAtPoint(*_args, **_kwargs):
+    val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs)
+    return val
+
+wxCheckForInterrupt = misc2c.wxCheckForInterrupt
+
+wxFlushEvents = misc2c.wxFlushEvents
+
 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
 
 wxResourceClear = misc2c.wxResourceClear
@@ -709,7 +764,6 @@ def wxResourceCreateIcon(*_args, **_kwargs):
 
 def wxResourceCreateMenuBar(*_args, **_kwargs):
     val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
-    if val: val = wxMenuBarPtr(val)
     return val
 
 wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
@@ -732,10 +786,6 @@ def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
 
 wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric
 
-wxToolTip_Enable = misc2c.wxToolTip_Enable
-
-wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
-
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
@@ -761,26 +811,6 @@ def wxCreateFileTipProvider(*_args, **_kwargs):
     if val: val = wxTipProviderPtr(val); val.thisown = 1
     return val
 
-def wxDragIcon(*_args, **_kwargs):
-    val = apply(misc2c.wxDragIcon,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragString(*_args, **_kwargs):
-    val = apply(misc2c.wxDragString,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragTreeItem(*_args, **_kwargs):
-    val = apply(misc2c.wxDragTreeItem,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragListItem(*_args, **_kwargs):
-    val = apply(misc2c.wxDragListItem,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
 wxSysErrorCode = misc2c.wxSysErrorCode
 
 wxSysErrorMsg = misc2c.wxSysErrorMsg
@@ -805,6 +835,15 @@ wxLogSysError = misc2c.wxLogSysError
 
 wxExecute = misc2c.wxExecute
 
+def wxWaveData(*_args, **_kwargs):
+    val = apply(misc2c.wxWaveData,_args,_kwargs)
+    if val: val = wxWavePtr(val); val.thisown = 1
+    return val
+
+wxToolTip_Enable = misc2c.wxToolTip_Enable
+
+wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
+
 wxLog_IsEnabled = misc2c.wxLog_IsEnabled
 
 wxLog_EnableLogging = misc2c.wxLog_EnableLogging