better support for ui action simulation

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

diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h
index 600c2056cdc242c1424dc9d460fa80f4994b9cce..c5bb71b643a4d90b84690266e64695ed86135e2f 100644 (file)
--- a/include/wx/osx/core/evtloop.h
+++ b/include/wx/osx/core/evtloop.h
@@ -55,6 +55,13 @@ public:
 #endif // wxUSE_EVENTLOOP_SOURCE
 
     bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
+    
+#if wxUSE_UIACTIONSIMULATOR
+    // notifies Yield and Dispatch to wait for at least one event before
+    // returning, this is necessary, because the synthesized events need to be
+    // converted by the OS before being available on the native event queue
+    void SetShouldWaitForEvent(bool should) { m_shouldWaitForEvent = should; }
+#endif
 protected:
     void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
     void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
@@ -92,6 +99,9 @@ protected:
     // set to false to avoid idling at unexpected moments - eg when having native message boxes
     bool m_processIdleEvents;
 
+#if wxUSE_UIACTIONSIMULATOR
+    bool m_shouldWaitForEvent;
+#endif
 private:
     // process all already pending events and dispatch a new one (blocking
     // until it appears in the event queue if necessary)

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 8d3ef5f84389c5ee284ada073078c74cbc7d1597..19b10e49116492876d520c5ea14bb82f93981100 100644 (file)
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -203,6 +203,10 @@ wxCFEventLoop::wxCFEventLoop()
     m_shouldExit = false;
     m_processIdleEvents = true;
 
+#if wxUSE_UIACTIONSIMULATOR
+    m_shouldWaitForEvent = false;
+#endif
+    
     m_runLoop = CFGetCurrentRunLoop();
 
     CFRunLoopObserverContext ctxt;
@@ -298,6 +302,12 @@ bool wxCFEventLoop::Pending() const
 
 int wxCFEventLoop::DoProcessEvents()
 {
+    if ( m_shouldWaitForEvent )
+    {
+        int  handled = DispatchTimeout( 10000 );
+        wxASSERT_MSG( handled == 1, "No Event Available");
+        m_shouldWaitForEvent = false;
+    }
     return DispatchTimeout( 0 );
 }