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

Don't eat TAB presses for wxComboBox with wxTE_PROCESS_ENTER in wxMSW.

Browse Source 
Still allow to use TAB for navigation even when a wxComboBox has
wxTE_PROCESS_ENTER style.

Use the same hack for wxTextCtrl, i.e. implement the navigation ourselves as
we can't let IsDialogMessage() handle it but still get VK_ENTER key presses.

Closes #12808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-16 23:41:16 +00:00
parent 12c6d5061a
commit 9a49e0c42f
1 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/msw/combobox.cpp
View File

@@ -228,36 +228,55 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
case WM_CHAR: case WM_CHAR:
// for compatibility with wxTextCtrl, generate a special message // for compatibility with wxTextCtrl, generate a special message
// when Enter is pressed // when Enter is pressed
if ( wParam == VK_RETURN ) switch ( wParam )
{ {
if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0)) case VK_RETURN:
return false; {
if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
return false;
wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId); wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
const int sel = GetSelection(); const int sel = GetSelection();
event.SetInt(sel); event.SetInt(sel);
event.SetString(GetValue()); event.SetString(GetValue());
InitCommandEventWithItems(event, sel); InitCommandEventWithItems(event, sel);
if ( ProcessCommand(event) ) if ( ProcessCommand(event) )
{ {
// don't let the event through to the native control // don't let the event through to the native control
// because it doesn't need it and may generate an annoying // because it doesn't need it and may generate an annoying
// beep if it gets it // beep if it gets it
return true; return true;
} }
}
break;
case VK_TAB:
// If we have wxTE_PROCESS_ENTER style, we get all char
// events, including those for TAB which are usually used
// for keyboard navigation, but we should not process them
// unless we also have wxTE_PROCESS_TAB style.
if ( !HasFlag(wxTE_PROCESS_TAB) )
{
int flags = 0;
if ( !wxIsShiftDown() )
flags |= wxNavigationKeyEvent::IsForward;
if ( wxIsCtrlDown() )
flags |= wxNavigationKeyEvent::WinChange;
if ( Navigate(flags) )
return true;
}
break;
} }
// fall through, WM_CHAR is one of the message we should forward. }
default: if ( ShouldForwardFromEditToCombo(msg) )
if ( ShouldForwardFromEditToCombo(msg) ) {
{ // For all the messages forward from the edit control the
// For all the messages forward from the edit control the // result is not used.
// result is not used. WXLRESULT result;
WXLRESULT result; return MSWHandleMessage(&result, msg, wParam, lParam);
return MSWHandleMessage(&result, msg, wParam, lParam);
}
} }
return false; return false;