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

reenabled WS_EX_CONTROLPARENT style together with a check that the focus window is not disabled or hidden

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-08 21:32:36 +00:00
parent 224b1f5cf1
commit 70a5eef8f1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/window.cpp
View File

@@ -1165,15 +1165,11 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
} }
// to make the dialog navigation work with the nested panels we must // to make the dialog navigation work with the nested panels we must
// use this style but, unfortunately, it hangs NT4 in some situations // use this style
// so we shouldn't use it -- even though it means that keyboard accels
// in, e.g. wxWizard, don't work
#if 0
if ( flags & wxTAB_TRAVERSAL ) if ( flags & wxTAB_TRAVERSAL )
{ {
*exstyle |= WS_EX_CONTROLPARENT; *exstyle |= WS_EX_CONTROLPARENT;
} }
#endif // 0
} }
return style; return style;
@@ -2084,10 +2080,18 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
// place edit control from being closed with Escape in a dialog // place edit control from being closed with Escape in a dialog
if ( msg->message != WM_KEYDOWN || msg->wParam != VK_ESCAPE ) if ( msg->message != WM_KEYDOWN || msg->wParam != VK_ESCAPE )
{ {
if ( ::IsDialogMessage(GetHwnd(), msg) ) // ::IsDialogMessage() can enter in an infinite loop when
// WS_EX_CONTROLPARENT is specified and the currently focused
// window is disabled or hidden, so don't call it in this case
HWND hwndFocus = ::GetFocus();
if ( !hwndFocus ||
::IsWindowEnabled(hwndFocus) && ::IsWindowVisible(hwndFocus) )
{ {
// IsDialogMessage() did something... if ( ::IsDialogMessage(GetHwnd(), msg) )
return TRUE; {
// IsDialogMessage() did something...
return TRUE;
}
} }
} }
} }