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

fixed kbd handling in wxFindReplaceDialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-08-05 14:13:28 +00:00
parent fe6b43a36e
commit 2a3caeb594
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/app.cpp
View File

@@ -1047,15 +1047,23 @@ void wxApp::Dispatch()
bool wxApp::ProcessMessage(WXMSG *wxmsg) bool wxApp::ProcessMessage(WXMSG *wxmsg)
{ {
MSG *msg = (MSG *)wxmsg; MSG *msg = (MSG *)wxmsg;
HWND hWnd = msg->hwnd; HWND hwnd = msg->hwnd;
wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd); wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
// this may happen if the event occured in a standard modeless dialog (the // this may happen if the event occured in a standard modeless dialog (the
// only example of which I know of is the find/replace dialog) - then call // only example of which I know of is the find/replace dialog) - then call
// IsDialogMessage() to make TAB navigation in it work // IsDialogMessage() to make TAB navigation in it work
if ( !wndThis ) if ( !wndThis )
{ {
return ::IsDialogMessage(hWnd, msg) != 0; // we need to find the dialog containing this control as
// IsDialogMessage() just eats all the messages (i.e. returns TRUE for
// them) if we call it for the control itself
while ( ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
{
hwnd = ::GetParent(hwnd);
}
return ::IsDialogMessage(hwnd, msg) != 0;
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
@@ -1071,23 +1079,26 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
} }
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
// Try translations first; find the youngest window with // try translations first: the accelerators override everything
// a translation table.
wxWindow *wnd; wxWindow *wnd;
bool pastTopLevelWindow = FALSE;
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{ {
if ( !pastTopLevelWindow && wnd->MSWTranslateMessage(wxmsg)) if ( wnd->MSWTranslateMessage(wxmsg))
return TRUE;
if ( wnd->MSWProcessMessage(wxmsg) )
return TRUE; return TRUE;
// stop at first top level window, i.e. don't try to process the key // stop at first top level window, i.e. don't try to process the key
// strokes originating in a dialog using the accelerators of the parent // strokes originating in a dialog using the accelerators of the parent
// frame - this doesn't make much sense // frame - this doesn't make much sense
if ( wnd->IsTopLevel() ) if ( wnd->IsTopLevel() )
pastTopLevelWindow = TRUE; break;
}
// now try the other hooks (kbd navigation is handled here)
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
if ( wnd->MSWProcessMessage(wxmsg) )
return TRUE;
} }
return FALSE; return FALSE;