AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Interpret arrow keys correctly in wxMSW wxComboCtrl::IsKeyPopupToggle() (fixes #12114)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2010-06-01 15:31:05 +00:00
parent db3d75435a
commit 87b3708781
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -554,6 +554,8 @@ MSW:
- Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl. - Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl.
- Allow putting the UAC symbol on buttons (Chris Spencer). - Allow putting the UAC symbol on buttons (Chris Spencer).
- Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt). - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
- Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
displayed when arrow key is pressed (without Alt).
- Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7. - Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
i18n: i18n:

14
src/msw/combo.cpp
View File

@ -833,18 +833,10 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
case WXK_UP: case WXK_UP:
case WXK_NUMPAD_DOWN: case WXK_NUMPAD_DOWN:
case WXK_NUMPAD_UP: case WXK_NUMPAD_UP:
// On XP or with writable combo in Classic, arrows don't open the // Arrow keys (and mouse wheel) toggle the popup in the native
// popup but Alt-arrow does // combo boxes
if ( event.AltDown() || if ( event.AltDown() )
( !isPopupShown &&
HasFlag(wxCB_READONLY)
#if wxUSE_UXTHEME
&& !wxUxThemeEngine::GetIfActive()
#endif
) )
{
return true; return true;
}
break; break;
} }