correction to the changes of r49805 to make the code work as expected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2261,9 +2261,13 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
|
|||||||
wxWindow *win = this;
|
wxWindow *win = this;
|
||||||
if ( !bCtrlDown )
|
if ( !bCtrlDown )
|
||||||
{
|
{
|
||||||
|
// this will contain the dialog code of this
|
||||||
|
// window and all of its parent windows
|
||||||
|
LONG lDlgCode2 = lDlgCode;
|
||||||
|
|
||||||
while ( win && !win->IsTopLevel() )
|
while ( win && !win->IsTopLevel() )
|
||||||
{
|
{
|
||||||
if ( lDlgCode & DLGC_WANTMESSAGE )
|
if ( lDlgCode2 & DLGC_WANTMESSAGE )
|
||||||
{
|
{
|
||||||
// as it wants to process Enter itself,
|
// as it wants to process Enter itself,
|
||||||
// don't call IsDialogMessage() which
|
// don't call IsDialogMessage() which
|
||||||
@@ -2271,6 +2275,14 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lDlgCode2 = ::SendMessage
|
||||||
|
(
|
||||||
|
GetHwndOf(win),
|
||||||
|
WM_GETDLGCODE,
|
||||||
|
0,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
win = win->GetParent();
|
win = win->GetParent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user