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

When checking whether the parent control has wxTAB_TRAVERSAL, take into account that the wxComboCtrl can be part of a composite control, such as generic wxDatePickerCtrl (fixes #11630).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@63158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-01-15 16:06:46 +00:00
parent 2044a5f9cc
commit 5b08af5c2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/combocmn.cpp
View File

@@ -1621,13 +1621,13 @@ void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
{ {
int keycode = event.GetKeyCode(); int keycode = event.GetKeyCode();
if ( GetParent()->HasFlag(wxTAB_TRAVERSAL) && wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) &&
keycode == WXK_TAB ) keycode == WXK_TAB )
{ {
wxNavigationKeyEvent evt; wxNavigationKeyEvent evt;
wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
evt.SetFlags(wxNavigationKeyEvent::FromTab| evt.SetFlags(wxNavigationKeyEvent::FromTab|
(!event.ShiftDown() ? wxNavigationKeyEvent::IsForward (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
: wxNavigationKeyEvent::IsBackward)); : wxNavigationKeyEvent::IsBackward));