X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cd7d9b2355834dfabd0faeab0c5e812ebc3905a..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/msw/evtloop.cpp?ds=sidebyside

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index ed84e41c76..dca66aba58 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -29,11 +29,11 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-#include "wx/window.h"
-#include "wx/app.h"
 #include "wx/tooltip.h"
 
 #include "wx/msw/private.h"
@@ -43,7 +43,7 @@
     WX_DECLARE_OBJARRAY(MSG, wxMsgArray);
     // VS: this is a bit dirty - it duplicates same declaration in app.cpp
     //     (and there's no WX_DEFINE_OBJARRAY for that reason - it is already
-    //     defined in app.cpp). 
+    //     defined in app.cpp).
 #endif
 
 // ----------------------------------------------------------------------------
@@ -146,6 +146,8 @@ bool wxEventLoopImpl::SendIdleMessage()
 // wxEventLoop implementation
 // ============================================================================
 
+wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
@@ -166,6 +168,9 @@ int wxEventLoop::Run()
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
+    
+    wxEventLoop *oldLoop = ms_activeLoop;
+    ms_activeLoop = this;
 
     for ( ;; )
     {
@@ -191,6 +196,8 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
+    ms_activeLoop = oldLoop;
+
     return exitcode;
 }
 
@@ -251,8 +258,7 @@ bool wxEventLoop::Dispatch()
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
-        if ( !wxIsWaitingForThread() ||
-                msg.message != WM_COMMAND )
+        if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND )
         {
             s_aSavedMessages.Add(msg);
         }