Add wxTimer::StartOnce().

[wxWidgets.git] / src / osx / core / evtloop_cf.cpp

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 20f01f8fd6a3feae583e19667b6aed652bb53b8a..7fb81172b28671dea2de7860b81027518def2562 100644 (file)
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -163,13 +163,13 @@ void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(obs
         // and this input is only removed from it when pending event handlers are
         // executed)
 
         // and this input is only removed from it when pending event handlers are
         // executed)
 

-        if ( wxTheApp )
+        if ( wxTheApp && ShouldProcessIdleEvents() )

             wxTheApp->ProcessPendingEvents();
     }
 
     if ( activity & kCFRunLoopBeforeWaiting )
     {
             wxTheApp->ProcessPendingEvents();
     }
 
     if ( activity & kCFRunLoopBeforeWaiting )
     {

-        if ( m_processIdleEvents && ProcessIdle() )
+        if ( ShouldProcessIdleEvents() && ProcessIdle() )

         {
             WakeUp();
         }
         {
             WakeUp();
         }


@@ -203,6 +203,10 @@ wxCFEventLoop::wxCFEventLoop()
     m_shouldExit = false;
     m_processIdleEvents = true;
 
     m_shouldExit = false;
     m_processIdleEvents = true;
 

+#if wxUSE_UIACTIONSIMULATOR
+    m_shouldWaitForEvent = false;
+#endif
+    

     m_runLoop = CFGetCurrentRunLoop();
 
     CFRunLoopObserverContext ctxt;
     m_runLoop = CFGetCurrentRunLoop();
 
     CFRunLoopObserverContext ctxt;


@@ -298,7 +302,17 @@ bool wxCFEventLoop::Pending() const
 
 int wxCFEventLoop::DoProcessEvents()
 {
 
 int wxCFEventLoop::DoProcessEvents()
 {

-    return DispatchTimeout( 0 );
+#if wxUSE_UIACTIONSIMULATOR
+    if ( m_shouldWaitForEvent )
+    {
+        int  handled = DispatchTimeout( 1000 );
+        wxASSERT_MSG( handled == 1, "No Event Available");
+        m_shouldWaitForEvent = false;
+        return handled;
+    }
+    else
+#endif
+        return DispatchTimeout( 0 );

 }
 
 bool wxCFEventLoop::Dispatch()
 }
 
 bool wxCFEventLoop::Dispatch()


@@ -445,14 +459,19 @@ wxCFEventLoopPauseIdleEvents::wxCFEventLoopPauseIdleEvents()
 {
     wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
     if ( cfl )
 {
     wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
     if ( cfl )

+    {
+        m_formerState = cfl->ShouldProcessIdleEvents();

         cfl->SetProcessIdleEvents(false);
         cfl->SetProcessIdleEvents(false);

+    }
+    else
+        m_formerState = true;

 }
 
 wxCFEventLoopPauseIdleEvents::~wxCFEventLoopPauseIdleEvents()
 {
     wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
     if ( cfl )
 }
 
 wxCFEventLoopPauseIdleEvents::~wxCFEventLoopPauseIdleEvents()
 {
     wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
     if ( cfl )

-        cfl->SetProcessIdleEvents(true);
+        cfl->SetProcessIdleEvents(m_formerState);

 }
 
 // TODO Move to thread_osx.cpp
 }
 
 // TODO Move to thread_osx.cpp