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

Do not skip key events so eagerly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-18 16:09:48 +00:00
parent b4afc5ec37
commit 4d11369db6
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/propgrid/propgrid.cpp
View File

@@ -5013,11 +5013,14 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
return; return;
} }
event.Skip();
// Except for TAB and ESC, handle child control events in child control // Except for TAB and ESC, handle child control events in child control
if ( fromChild ) if ( fromChild )
{
event.Skip();
return; return;
}
bool wasHandled = false;
if ( m_selected ) if ( m_selected )
{ {
@@ -5037,16 +5040,16 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY ) if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY )
{ {
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) ) if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) )
keycode = 0; wasHandled = true;
} }
else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY ) else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY )
{ {
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) ) if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) )
keycode = 0; wasHandled = true;
} }
} }
if ( keycode ) if ( !wasHandled )
{ {
if ( action == wxPG_ACTION_PREV_PROPERTY || secondAction == wxPG_ACTION_PREV_PROPERTY ) if ( action == wxPG_ACTION_PREV_PROPERTY || secondAction == wxPG_ACTION_PREV_PROPERTY )
{ {
@@ -5063,6 +5066,7 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir ); p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir );
if ( p ) if ( p )
DoSelectProperty(p); DoSelectProperty(p);
wasHandled = true;
} }
} }
else else
@@ -5073,8 +5077,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
{ {
wxPGProperty* p = wxPropertyGridInterface::GetFirst(); wxPGProperty* p = wxPropertyGridInterface::GetFirst();
if ( p ) DoSelectProperty(p); if ( p ) DoSelectProperty(p);
wasHandled = true;
} }
} }
if ( !wasHandled )
event.Skip();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------