fix order of initializiton of rootless treectrl

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 8c9f562a332c712ed73892767404cc0ae5882577..dca66aba583c6d2cdbbd0789ae69f67dfef167c8 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -146,6 +146,8 @@ bool wxEventLoopImpl::SendIdleMessage()
 // wxEventLoop implementation
 // ============================================================================
 
 // wxEventLoop implementation
 // ============================================================================
 

+wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+

 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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;
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;

+    
+    wxEventLoop *oldLoop = ms_activeLoop;
+    ms_activeLoop = this;

 
     for ( ;; )
     {
 
     for ( ;; )
     {


@@ -191,6 +196,8 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

+    ms_activeLoop = oldLoop;
+

     return exitcode;
 }
 
     return exitcode;
 }