Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index aa294c31c4787f1559d037d4f8b11c9d2fa9c822..97342164839fcc70cabb00512d871cd1c3b99730 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/evtloop.cpp
+// Name:        src/msw/evtloop.cpp

 // Purpose:     implements wxEventLoop for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     implements wxEventLoop for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

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


@@ -24,14 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/window.h"
     #endif
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/window.h"
     #endif
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"

 #include "wx/thread.h"
 #include "wx/except.h"
 #include "wx/msw/private.h"
 #include "wx/thread.h"
 #include "wx/except.h"
 #include "wx/msw/private.h"


@@ -77,8 +79,6 @@ bool wxMSWEventLoopBase::Pending() const
 
 bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
 {
 
 bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
 {

-    wxCHECK_MSG( IsRunning(), false, _T("can't get messages if not running") );
-

     const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
 
     if ( rc == 0 )
     const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
 
     if ( rc == 0 )


@@ -387,6 +387,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
     MSG msg;
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
     MSG msg;

+    int nPaintsReceived = 0;

     while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
             msg.message != WM_QUIT )
     {
     while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
             msg.message != WM_QUIT )
     {


@@ -396,15 +397,41 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
 
         if (msg.message == WM_PAINT)
         {
 
         if (msg.message == WM_PAINT)
         {

-            // WM_PAINT messages are the last ones of the queue...
-            break;
+            // NOTE: WM_PAINTs are categorized as wxEVT_CATEGORY_UI
+            if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
+            {
+                // this msg is not going to be dispatched...
+                // however WM_PAINT is special: until there are damaged
+                // windows, Windows will keep sending it forever!
+                if (nPaintsReceived > 10)
+                {
+                    // we got 10 WM_PAINT consecutive messages...
+                    // we must have reached the tail of the message queue:
+                    // we're now getting _only_ WM_PAINT events and this will
+                    // continue forever (since we don't dispatch them
+                    // because of the user-specified eventsToProcess mask)...
+                    // break out of this loop!
+                    break;
+                }
+                else
+                    nPaintsReceived++;
+            }
+            //else: we're going to dispatch it below,
+            //      so we don't need to take any special action
+        }
+        else
+        {
+            // reset the counter of consecutive WM_PAINT messages received:
+            nPaintsReceived = 0;

         }
 
         // choose a wxEventCategory for this Windows message
         }
 
         // choose a wxEventCategory for this Windows message

-        wxEventCategory cat;
+        bool processNow;

         switch (msg.message)
         {
         switch (msg.message)
         {

+#if !defined(__WXWINCE__)

             case WM_NCMOUSEMOVE:
             case WM_NCMOUSEMOVE:

+

             case WM_NCLBUTTONDOWN:
             case WM_NCLBUTTONUP:
             case WM_NCLBUTTONDBLCLK:
             case WM_NCLBUTTONDOWN:
             case WM_NCLBUTTONUP:
             case WM_NCLBUTTONDBLCLK:


@@ -414,6 +441,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
             case WM_NCMBUTTONDOWN:
             case WM_NCMBUTTONUP:
             case WM_NCMBUTTONDBLCLK:
             case WM_NCMBUTTONDOWN:
             case WM_NCMBUTTONUP:
             case WM_NCMBUTTONDBLCLK:

+#endif

 
             case WM_KEYDOWN:
             case WM_KEYUP:
 
             case WM_KEYDOWN:
             case WM_KEYUP:


@@ -442,11 +470,13 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
             case WM_IME_KEYDOWN:
             case WM_IME_KEYUP:
 
             case WM_IME_KEYDOWN:
             case WM_IME_KEYUP:
 

+#if !defined(__WXWINCE__)

             case WM_MOUSEHOVER:
             case WM_MOUSEHOVER:

+            case WM_MOUSELEAVE:
+#endif

 #ifdef WM_NCMOUSELEAVE
             case WM_NCMOUSELEAVE:
 #endif
 #ifdef WM_NCMOUSELEAVE
             case WM_NCMOUSELEAVE:
 #endif

-            case WM_MOUSELEAVE:

 
             case WM_CUT:
             case WM_COPY:
 
             case WM_CUT:
             case WM_COPY:


@@ -465,11 +495,11 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
             case WM_MBUTTONUP:
             case WM_MBUTTONDBLCLK:
             case WM_MOUSEWHEEL:
             case WM_MBUTTONUP:
             case WM_MBUTTONDBLCLK:
             case WM_MOUSEWHEEL:

-                cat = wxEVT_CATEGORY_USER_INPUT;
+                processNow = (eventsToProcess & wxEVT_CATEGORY_USER_INPUT) != 0;

                 break;
 
             case WM_TIMER:
                 break;
 
             case WM_TIMER:

-                cat = wxEVT_CATEGORY_TIMER;
+                processNow = (eventsToProcess & wxEVT_CATEGORY_TIMER) != 0;

                 break;
 
             default:
                 break;
 
             default:


@@ -477,17 +507,24 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
                 {
                     // 0;WM_USER-1 is the range of message IDs reserved for use
                     // by the system.
                 {
                     // 0;WM_USER-1 is the range of message IDs reserved for use
                     // by the system.

-

                     // there are too many of these types of messages to handle
                     // them in this switch
                     // there are too many of these types of messages to handle
                     // them in this switch

-                    cat = wxEVT_CATEGORY_UI;
+                    processNow = (eventsToProcess & wxEVT_CATEGORY_UI) != 0;

                 }
                 else
                 }
                 else

-                    cat = wxEVT_CATEGORY_UNKNOWN;
+                {
+                    // Process all the unknown messages. We must do it because
+                    // failure to process some of them can be fatal, e.g. if we
+                    // don't dispatch WM_APP+2 then embedded IE ActiveX
+                    // controls don't work any more, see #14027. And there may
+                    // be more examples like this, so dispatch all unknown
+                    // messages immediately to be safe.
+                    processNow = true;
+                }

         }
 
         // should we process this event now?
         }
 
         // should we process this event now?

-        if (cat & eventsToProcess)
+        if ( processNow )

         {
             if ( !wxTheApp->Dispatch() )
                 break;
         {
             if ( !wxTheApp->Dispatch() )
                 break;


@@ -501,7 +538,8 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
     }
 
     // if there are pending events, we must process them.
     }
 
     // if there are pending events, we must process them.

-    ProcessPendingEvents();
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();

 
     // put back unprocessed events in the queue
     DWORD id = GetCurrentThreadId();
 
     // put back unprocessed events in the queue
     DWORD id = GetCurrentThreadId();


@@ -535,16 +573,7 @@ void wxConsoleEventLoop::WakeUp()
 
 void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
 {
 
 void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
 {

-    if ( msg->message == WM_TIMER )
-    {
-        TIMERPROC proc = (TIMERPROC)msg->lParam;
-        if ( proc )
-            (*proc)(NULL, 0, msg->wParam, 0);
-    }
-    else
-    {
-        ::DispatchMessage(msg);
-    }
+    ::DispatchMessage(msg);

 }
 
 bool wxConsoleEventLoop::Dispatch()
 }
 
 bool wxConsoleEventLoop::Dispatch()