Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dispatch unknown messages immediately in wxMSW YieldFor().

Browse Source 
Failure to do this can have catastrophic consequences, e.g. embedded ActiveX
IE controls may stop working -- even after resuming the normal message
dispatching.

Closes #14027.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-02-25 23:49:45 +00:00
parent fe9b56985f
commit 4934653e18
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/evtloop.cpp
View File

@@ -426,7 +426,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
}
// choose a wxEventCategory for this Windows message
wxEventCategory cat;
bool processNow;
switch (msg.message)
{
#if !defined(__WXWINCE__)
@@ -495,11 +495,11 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
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:
cat = wxEVT_CATEGORY_TIMER;
processNow = (eventsToProcess & wxEVT_CATEGORY_TIMER) != 0;
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
cat = wxEVT_CATEGORY_UI;
processNow = (eventsToProcess & wxEVT_CATEGORY_UI) != 0;
}
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?
if (cat & eventsToProcess)
if ( processNow )
{
if ( !wxTheApp->Dispatch() )
break;