removed stray return from SetFont()

[wxWidgets.git] / src / dfb / evtloop.cpp

diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp
index 52b940c9f40078835bd909e8d5d488e899a16db0..ee7154ff1ef0dd2b9d6c66d0d3cd4de023f5f5c8 100644 (file)
--- a/src/dfb/evtloop.cpp
+++ b/src/dfb/evtloop.cpp
@@ -25,8 +25,11 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

+#include "wx/thread.h"

 #include "wx/timer.h"
 #include "wx/timer.h"

+#include "wx/private/socketevtdispatch.h"

 #include "wx/dfb/private.h"
 #include "wx/dfb/private.h"

+#include "wx/nonownedwnd.h"

 
 #define TRACE_EVENTS _T("events")
 
 
 #define TRACE_EVENTS _T("events")
 


@@ -85,11 +88,18 @@ bool wxEventLoop::Dispatch()
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that
     //     OnNextIteration() will be called frequently enough
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that
     //     OnNextIteration() will be called frequently enough

-    //
-    //     FIXME: call NotifyTimers() from here (and loop) instead?

     const int TIMEOUT = 100;
 
     const int TIMEOUT = 100;
 

-    if ( ms_buffer->WaitForEventWithTimeout(0, TIMEOUT) )
+    // release the GUI mutex so that other threads have a chance to post
+    // events:
+    wxMutexGuiLeave();
+
+    bool rv = ms_buffer->WaitForEventWithTimeout(0, TIMEOUT);
+
+    // and acquire it back before calling any event handlers:
+    wxMutexGuiEnter();
+
+    if ( rv )

     {
         switch ( ms_buffer->GetLastResult() )
         {
     {
         switch ( ms_buffer->GetLastResult() )
         {


@@ -126,9 +136,23 @@ void wxEventLoop::WakeUp()
 void wxEventLoop::OnNextIteration()
 {
 #if wxUSE_TIMER
 void wxEventLoop::OnNextIteration()
 {
 #if wxUSE_TIMER

-    // see the comment in Dispatch

     wxTimer::NotifyTimers();
 #endif
     wxTimer::NotifyTimers();
 #endif

+
+#if wxUSE_SOCKETS
+    // handle any pending socket events:
+    wxSocketEventDispatcher::Get().RunLoop();
+#endif
+}
+
+void wxEventLoop::Yield()
+{
+    // process all pending events:
+    while ( Pending() )
+        Dispatch();
+
+    // handle timers, sockets etc.
+    OnNextIteration();

 }
 
 
 }
 
 


@@ -143,7 +167,7 @@ void wxEventLoop::HandleDFBEvent(const wxDFBEvent& event)
         case DFEC_WINDOW:
         {
             wxDFBWindowEvent winevent(((const DFBEvent&)event).window);
         case DFEC_WINDOW:
         {
             wxDFBWindowEvent winevent(((const DFBEvent&)event).window);

-            wxTopLevelWindowDFB::HandleDFBWindowEvent(winevent);
+            wxNonOwnedWindow::HandleDFBWindowEvent(winevent);

             break;
         }
 
             break;
         }