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

Keyboard handling was blocked by label editor. Also try to maintain label editor focus state when navigating between properties.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2010-06-12 09:47:25 +00:00
parent 8d2c70414c
commit 372d0bdd67
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/propgrid/propgrid.cpp
View File

@ -1022,14 +1022,13 @@ void wxPropertyGrid::OnLabelEditorKeyPress( wxKeyEvent& event )
{
int keycode = event.GetKeyCode();
// If key code was registered as action trigger, then trigger that action
if ( keycode == WXK_ESCAPE )
{
DoEndLabelEdit(false);
}
else
{
event.Skip();
HandleKeyEvent(event, true);
}
}
@ -5612,11 +5611,26 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir );
if ( p )
{
// If editor was focused, then make the next editor focused as well
int selFlags = 0;
int reopenLabelEditorCol = -1;
if ( editorFocused )
{
// If editor was focused, then make the next editor
// focused as well
selFlags |= wxPG_SEL_FOCUS;
}
else
{
// Also maintain the same label editor focus state
if ( m_labelEditor )
reopenLabelEditorCol = m_selColumn;
}
DoSelectProperty(p, selFlags);
if ( reopenLabelEditorCol >= 0 )
DoBeginLabelEdit(reopenLabelEditorCol);
}
wasHandled = true;
}