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

don't set focus to the window when it is clicked if the event has been processed by the user code (this is consistent with how the standard controls already behave)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-19 18:09:13 +00:00
parent 6bb0970672
commit 9f01184787
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/window.cpp
View File

@@ -2498,19 +2498,23 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
// this should never happen // this should never happen
wxCHECK_MSG( win, 0, wxCHECK_MSG( win, 0,
_T("FindWindowForMouseEvent() returned NULL") ); _T("FindWindowForMouseEvent() returned NULL") );
}
processed = win->HandleMouseEvent(message, x, y, wParam);
// if the app didn't eat the event, handle it in the default
// way, that is by giving this window the focus
if ( !processed )
{
// for the standard classes their WndProc sets the focus to // for the standard classes their WndProc sets the focus to
// them anyhow and doing it from here results in some weird // them anyhow and doing it from here results in some weird
// problems, but for our windows we want them to acquire // problems, so don't do it for them (unnecessary anyhow)
// focus when clicked
if ( !win->IsOfStandardClass() ) if ( !win->IsOfStandardClass() )
{ {
if ( message == WM_LBUTTONDOWN && win->AcceptsFocus() ) if ( message == WM_LBUTTONDOWN && win->AcceptsFocus() )
win->SetFocus(); win->SetFocus();
} }
} }
processed = win->HandleMouseEvent(message, x, y, wParam);
} }
break; break;