merged fixes for accel and command event non propagation from 2.2

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

diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index dd70b6014f8d973b3f06bfdaafee0f002e0523b1..b55c6c048a6598c2fcffeda21504b19024f6d123 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)
@@ -162,6 +160,23 @@ class wxWindowDisabler(wxWindowDisablerPtr):
 
 
 
+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 __repr__(self):
+        return "<C wxMutexGuiLocker instance at %s>" % (self.this,)
+class wxMutexGuiLocker(wxMutexGuiLockerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxMutexGuiLocker,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxTipProviderPtr :
     def __init__(self,this):
         self.this = this
@@ -198,7 +213,7 @@ class wxPyTipProvider(wxPyTipProviderPtr):
 
 
 
-class wxDragImagePtr :
+class wxDragImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -240,7 +255,7 @@ class wxDragImage(wxDragImagePtr):
 
 
 
-class wxPyTimerPtr :
+class wxPyTimerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -352,7 +367,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)
@@ -471,7 +485,7 @@ class wxProcess(wxProcessPtr):
 
 
 
-class wxJoystickPtr :
+class wxJoystickPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -620,6 +634,8 @@ wxFileSelector = misc2c.wxFileSelector
 
 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
+wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
+
 wxGetSingleChoice = misc2c.wxGetSingleChoice
 
 wxGetSingleChoiceIndex = misc2c.wxGetSingleChoiceIndex
@@ -648,23 +664,27 @@ def wxGetDisplaySizeMM(*_args, **_kwargs):
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 
+wxClientDisplayRect = misc2c.wxClientDisplayRect
+
+def wxGetClientDisplayRect(*_args, **_kwargs):
+    val = apply(misc2c.wxGetClientDisplayRect,_args,_kwargs)
+    if val: val = wxRectPtr(val); val.thisown = 1
+    return val
+
 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
 
 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
@@ -683,7 +703,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
@@ -714,11 +733,19 @@ wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
 
+wxSafeYield = misc2c.wxSafeYield
+
 wxPostEvent = misc2c.wxPostEvent
 
 wxWakeUpIdle = misc2c.wxWakeUpIdle
 
-wxSafeYield = misc2c.wxSafeYield
+wxWakeUpMainThread = misc2c.wxWakeUpMainThread
+
+wxMutexGuiEnter = misc2c.wxMutexGuiEnter
+
+wxMutexGuiLeave = misc2c.wxMutexGuiLeave
+
+wxThread_IsMain = misc2c.wxThread_IsMain
 
 wxShowTip = misc2c.wxShowTip
 
@@ -905,3 +932,4 @@ wxLOG_Debug = misc2c.wxLOG_Debug
 wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User
+wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS