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 2b8874377eb70f754eb6228da50f6fa671efc92d..97342164839fcc70cabb00512d871cd1c3b99730 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implements wxEventLoop for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements wxEventLoop for MSW
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -426,7 +426,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
         }
 
         // choose a wxEventCategory for this Windows message
         }
 
         // choose a wxEventCategory for this Windows message

-        wxEventCategory cat;
+        bool processNow;

         switch (msg.message)
         {
 #if !defined(__WXWINCE__)
         switch (msg.message)
         {
 #if !defined(__WXWINCE__)


@@ -495,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:


@@ -509,14 +509,22 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
                     // by the system.
                     // there are too many of these types of messages to handle
                     // them in this switch
                     // by the system.
                     // 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;