Interpret arrow keys correctly in wxMSW wxComboCtrl::IsKeyPopupToggle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@64459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,6 +100,8 @@ wxMSW:
|
||||
|
||||
- wxOwnerDrawnComboBox and wxComboCtrl with wxCB_READONLY window style now
|
||||
have more native-like focus indicator rendering.
|
||||
- Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
|
||||
displayed when arrow key is pressed (without Alt).
|
||||
|
||||
2.8.11:
|
||||
-------
|
||||
|
@@ -900,19 +900,11 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
|
||||
|
||||
case WXK_DOWN:
|
||||
case WXK_UP:
|
||||
// On XP or with writable combo in Classic, arrows don't open the
|
||||
// popup but Alt-arrow does
|
||||
if ( event.AltDown() ||
|
||||
( !isPopupShown &&
|
||||
HasFlag(wxCB_READONLY)
|
||||
#if wxUSE_UXTHEME
|
||||
&&
|
||||
!wxUxThemeEngine::GetIfActive()
|
||||
#endif
|
||||
) )
|
||||
{
|
||||
case WXK_NUMPAD_DOWN:
|
||||
case WXK_NUMPAD_UP:
|
||||
// Alt plus arrow key toggles the popup in the native combo box
|
||||
if ( event.AltDown() )
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user