solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

wxMFCApp::PreTranslateMessage: Give msg to MFC before wxWidgets

Browse source 
because wxWidgets wxGUIEventLoop::PreProcessMessage() seems to
always report that it has consumed msg.

fix #23574
This commit is contained in:
Bill Su 2023-06-11 01:50:01 -04:00
parent 6ab144f9bf
commit 7420ab1b26
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/wx/msw/mfc.h
View file

@ -94,6 +94,12 @@ public:
// Override this to provide messages pre-processing for wxWidgets windows.
BOOL PreTranslateMessage(MSG *msg) override
{
// As reported in issue #23574, wxGUIEventLoop::PreProcessMessage()
// is always returning true, so try BaseApp::PreTranslateMessage()
// and hope it doesn't always report true
if (BaseApp::PreTranslateMessage(msg))
return TRUE;
// Use the current event loop if there is one, or just fall back to the
// standard one otherwise, but make sure we pre-process messages in any
// case as otherwise many things would break (e.g. keyboard
@ -103,10 +109,7 @@ public:
wxGUIEventLoop evtLoopStd;
if ( !evtLoop )
evtLoop = &evtLoopStd;
if ( evtLoop->PreProcessMessage(msg) )
return TRUE;
return BaseApp::PreTranslateMessage(msg);
return evtLoop->PreProcessMessage(msg);
}
BOOL OnIdle(LONG lCount) override