Fix wxGenericListCtrl best size calculation in report view.

[wxWidgets.git] / src / common / evtloopcmn.cpp

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index f4adbbed10bcd5218273b592f51770b0a72ddde6..f6f7c4aa1f33e6a6d07b8a90826a169e9b232dfb 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -82,7 +82,7 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded)
 }
 
 // wxEventLoopManual is unused in the other ports
 }
 
 // wxEventLoopManual is unused in the other ports

-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && wxUSE_BASE)
+#if defined(__WINDOWS__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE)

 
 // ============================================================================
 // wxEventLoopManual implementation
 
 // ============================================================================
 // wxEventLoopManual implementation


@@ -94,18 +94,51 @@ wxEventLoopManual::wxEventLoopManual()
     m_shouldExit = false;
 }
 
     m_shouldExit = false;
 }
 

+bool wxEventLoopManual::ProcessEvents()
+{
+    // process pending wx events first as they correspond to low-level events
+    // which happened before, i.e. typically pending events were queued by a
+    // previous call to Dispatch() and if we didn't process them now the next
+    // call to it might enqueue them again (as happens with e.g. socket events
+    // which would be generated as long as there is input available on socket
+    // and this input is only removed from it when pending event handlers are
+    // executed)
+    if ( wxTheApp )
+    {
+        const bool hadExitedBefore = m_shouldExit;
+
+        wxTheApp->ProcessPendingEvents();
+
+        // One of the pending event handlers could have decided to exit the
+        // loop so check for the flag before trying to dispatch more events
+        // (which could block indefinitely if no more are coming).
+        if ( !hadExitedBefore && m_shouldExit )
+        {
+            // We still need to dispatch any remaining pending events, just as
+            // we do in the event loop in Run() if the loop is exited from a
+            // normal event handler.
+            while ( wxTheApp->HasPendingEvents() )
+                wxTheApp->ProcessPendingEvents();
+
+            return false;
+        }
+    }
+
+    return Dispatch();
+}
+

 int wxEventLoopManual::Run()
 {
     // event loops are not recursive, you need to create another loop!
 int wxEventLoopManual::Run()
 {
     // event loops are not recursive, you need to create another loop!

-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );

 
 

-    // ProcessIdle() and Dispatch() below may throw so the code here should
+    // ProcessIdle() and ProcessEvents() below may throw so the code here should

     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(this);
 
     // we must ensure that OnExit() is called even if an exception is thrown
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(this);
 
     // we must ensure that OnExit() is called even if an exception is thrown

-    // from inside Dispatch() but we must call it from Exit() in normal
+    // from inside ProcessEvents() but we must call it from Exit() in normal

     // situations because it is supposed to be called synchronously,
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)
     // situations because it is supposed to be called synchronously,
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)


@@ -124,7 +157,7 @@ int wxEventLoopManual::Run()
 
                 // generate and process idle events for as long as we don't
                 // have anything else to do
 
                 // generate and process idle events for as long as we don't
                 // have anything else to do

-                while ( !Pending() && ProcessIdle() )
+                while ( !Pending() && ProcessIdle() && !m_shouldExit )

                     ;
 
                 // if the "should exit" flag is set, the loop should terminate
                     ;
 
                 // if the "should exit" flag is set, the loop should terminate


@@ -133,14 +166,15 @@ int wxEventLoopManual::Run()
                 if ( m_shouldExit )
                 {
                     while ( Pending() )
                 if ( m_shouldExit )
                 {
                     while ( Pending() )

-                        Dispatch();
+                        ProcessEvents();

 
                     break;
                 }
 
 
                     break;
                 }
 

-                // a message came or no more idle processing to do, sit in
-                // Dispatch() waiting for the next message
-                if ( !Dispatch() )
+                // a message came or no more idle processing to do, dispatch
+                // all the pending events and call Dispatch() to wait for the
+                // next message
+                if ( !ProcessEvents() )

                 {
                     // we got WM_QUIT
                     break;
                 {
                     // we got WM_QUIT
                     break;


@@ -179,7 +213,7 @@ int wxEventLoopManual::Run()
 
 void wxEventLoopManual::Exit(int rc)
 {
 
 void wxEventLoopManual::Exit(int rc)
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );

 
     m_exitcode = rc;
     m_shouldExit = true;
 
     m_exitcode = rc;
     m_shouldExit = true;


@@ -197,5 +231,5 @@ void wxEventLoopManual::Exit(int rc)
     WakeUp();
 }
 
     WakeUp();
 }
 

-#endif // __WXMSW__ || __WXMAC__ || __WXDFB__
+#endif // __WINDOWS__ || __WXMAC__ || __WXDFB__