Attempt at fixing deepCopyHostent/Servent.

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

diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp
index 78bca48df8a374dd731db0c736f013e9f647b9a6..3cc18ac29091a7979c572b1730813172744f1d76 100644 (file)
--- a/src/dfb/evtloop.cpp
+++ b/src/dfb/evtloop.cpp
@@ -25,7 +25,9 @@
     #include "wx/app.h"
 #endif
 
+#include "wx/thread.h"
 #include "wx/timer.h"
+#include "wx/private/socketevtdispatch.h"
 #include "wx/dfb/private.h"
 
 #define TRACE_EVENTS _T("events")
@@ -52,6 +54,12 @@ void wxEventLoop::InitBuffer()
     ms_buffer = wxIDirectFB::Get()->CreateEventBuffer();
 }
 
+/* static */
+void wxEventLoop::CleanUp()
+{
+    ms_buffer.Reset();
+}
+
 /* static */
 wxIDirectFBEventBufferPtr wxEventLoop::GetDirectFBEventBuffer()
 {
@@ -79,11 +87,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
-    //
-    //     FIXME: call NotifyTimers() from here (and loop) instead?
     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() )
         {
@@ -120,12 +135,24 @@ void wxEventLoop::WakeUp()
 void wxEventLoop::OnNextIteration()
 {
 #if wxUSE_TIMER
-    // see the comment in Dispatch
     wxTimer::NotifyTimers();
 #endif
+
+#if wxUSE_SOCKETS
+    // handle any pending socket events:
+    wxSocketEventDispatcher::Get().RunLoop();
+#endif
 }
 
-#warning "FIXME: cleanup wxEventLoop::ms_buffer before exiting"
+void wxEventLoop::Yield()
+{
+    // process all pending events:
+    while ( Pending() )
+        Dispatch();
+
+    // handle timers, sockets etc.
+    OnNextIteration();
+}
 
 
 //-----------------------------------------------------------------------------