notify the event loop that synthesized events are on the queue, wait for them to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/uiactioncmn.cpp b/src/common/uiactioncmn.cpp
index bfd5135e0c845fa01449846c06242caa1b1cdf2f..bc7344bd9544c164c6d702afbc7b2a105584d77b 100644 (file)
--- a/src/common/uiactioncmn.cpp
+++ b/src/common/uiactioncmn.cpp
@@ -25,6 +25,8 @@ bool wxUIActionSimulator::MouseClick(int button)
     return true;
 }
 
     return true;
 }
 

+#ifndef __WXOSX__
+

 bool wxUIActionSimulator::MouseDblClick(int button)
 {
     MouseDown(button);
 bool wxUIActionSimulator::MouseDblClick(int button)
 {
     MouseDown(button);


@@ -35,6 +37,8 @@ bool wxUIActionSimulator::MouseDblClick(int button)
     return true;
 }
 
     return true;
 }
 

+#endif
+

 bool
 wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
                                    int button)
 bool
 wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
                                    int button)

diff --git a/src/osx/uiaction_osx.cpp b/src/osx/uiaction_osx.cpp
index 2819bca848de13852f864c3b5f20e6af6f0b2d5c..d480f8381771c2879399ba6a9bdb6e2cb5d5e02f 100644 (file)
--- a/src/osx/uiaction_osx.cpp
+++ b/src/osx/uiaction_osx.cpp
@@ -26,6 +26,8 @@
 #include "wx/osx/private.h"
 #include "wx/osx/core/cfref.h"
 
 #include "wx/osx/private.h"
 #include "wx/osx/core/cfref.h"
 

+#include "wx/evtloop.h"
+

 namespace
 {
     
 namespace
 {
     


@@ -77,7 +79,39 @@ bool wxUIActionSimulator::MouseDown(int button)
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);

+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
+    return true;
+}
+
+bool wxUIActionSimulator::MouseDblClick(int button)
+{
+    CGEventType downtype = CGEventTypeForMouseButton(button, true);
+    CGEventType uptype = CGEventTypeForMouseButton(button, false);
+    wxCFRef<CGEventRef> event(
+                              CGEventCreateMouseEvent(NULL, downtype, GetMousePosition(), button));
+    
+    if ( !event )
+        return false;
+    
+    CGEventSetType(event,downtype);
+    CGEventPost(tap, event);

 
 

+    CGEventSetType(event, uptype);
+    CGEventPost(tap, event);
+    
+    CGEventSetIntegerValueField(event, kCGMouseEventClickState, 2);
+    CGEventSetType(event, downtype);
+    CGEventPost(tap, event);
+    
+    CGEventSetType(event, uptype);
+    CGEventPost(tap, event);
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    

     return true;
 }
 
     return true;
 }
 


@@ -96,7 +130,10 @@ bool wxUIActionSimulator::MouseMove(long x, long y)
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);

-
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    

     return true;
 }
 
     return true;
 }
 


@@ -111,7 +148,10 @@ bool wxUIActionSimulator::MouseUp(int button)
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);

-
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    

     return true;
 }
 
     return true;
 }
 


@@ -126,6 +166,10 @@ wxUIActionSimulator::DoKey(int keycode, int WXUNUSED(modifiers), bool isDown)
         return false;
 
     CGEventPost(kCGHIDEventTap, event);
         return false;
 
     CGEventPost(kCGHIDEventTap, event);

+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+

     return true;
 }
 
     return true;
 }