implementing rollover and pressed image for bitmapbutton on osx_cocoa

[wxWidgets.git] / src / osx / carbon / evtloop.cpp

diff --git a/src/osx/carbon/evtloop.cpp b/src/osx/carbon/evtloop.cpp
index 45aad41e2539f5d83a58412669dc3c3e4c9df759..cdfda0653dac13b3b2344724164b7e8dd70b71b8 100644 (file)
--- a/src/osx/carbon/evtloop.cpp
+++ b/src/osx/carbon/evtloop.cpp
@@ -28,6 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"


@@ -88,6 +89,8 @@ bool wxGUIEventLoop::Dispatch()
     switch (status)
     {
         case eventLoopTimedOutErr :
     switch (status)
     {
         case eventLoopTimedOutErr :

+            // process pending wx events before sending idle events
+            wxTheApp->ProcessPendingEvents();

             if ( wxTheApp->ProcessIdle() )
                 m_sleepTime = kEventDurationNoWait ;
             else
             if ( wxTheApp->ProcessIdle() )
                 m_sleepTime = kEventDurationNoWait ;
             else


@@ -137,3 +140,43 @@ int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
     }
 }
 
     }
 }
 

+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+#if wxUSE_THREADS
+    // Yielding from a non-gui thread needs to bail out, otherwise we end up
+    // possibly sending events in the thread too.
+    if ( !wxThread::IsMain() )
+    {
+        return true;
+    }
+#endif // wxUSE_THREADS
+
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+#if wxUSE_LOG
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+#endif // wxUSE_LOG
+
+    // process all pending events:
+    while ( Pending() )
+        Dispatch();
+
+    // it's necessary to call ProcessIdle() to update the frames sizes which
+    // might have been changed (it also will update other things set from
+    // OnUpdateUI() which is a nice (and desired) side effect)
+    while ( ProcessIdle() ) {}
+
+    // if there are pending events, we must process them.
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();
+    
+#if wxUSE_LOG
+    wxLog::Resume();
+#endif // wxUSE_LOG
+    m_isInsideYield = false;
+
+    return true;
+}