Send all menu item actions to a dedicated target. This is to ensure

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 73d459dac2f9b4c177f5f3db3d4a8768a96e6dc8..94874f5da1b7073dc6282f40e36a5e8678c2ab0b 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -29,14 +29,23 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/window.h"
+    #include "wx/app.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.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"
 
 
 #include "wx/msw/private.h"
 

+#if wxUSE_THREADS
+    // define the array of MSG strutures
+    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).
+#endif
+

 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 // ----------------------------------------------------------------------------


@@ -128,15 +137,15 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
 
 bool wxEventLoopImpl::SendIdleMessage()
 {
 
 bool wxEventLoopImpl::SendIdleMessage()
 {

-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();

 }
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 
 }
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 

+wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+

 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------


@@ -157,6 +166,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 ( ;; )
     {


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

+    ms_activeLoop = oldLoop;
+

     return exitcode;
 }
 
     return exitcode;
 }
 


@@ -242,10 +256,9 @@ bool wxEventLoop::Dispatch()
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice

-        if ( !wxIsWaitingForThread() ||
-                s_currentMsg.message != WM_COMMAND )
+        if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND )

         {
         {

-            s_aSavedMessages.Add(s_currentMsg);
+            s_aSavedMessages.Add(msg);

         }
 
         return TRUE;
         }
 
         return TRUE;