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

Fix r70318 to skip unhandled events.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2012-02-25 12:55:46 +00:00
parent 2fb1532a89
commit a739b8b2df
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/datavgen.cpp
View File

@@ -3558,7 +3558,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
switch ( event.GetKeyCode() ) switch ( event.GetKeyCode() )
{ {
case WXK_RETURN: case WXK_RETURN:
if ( !event.HasModifiers() ) if ( event.HasModifiers() )
{
event.Skip();
break;
}
else
{ {
// Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to
// it. Only if that event is not handled do we activate column renderer (which // it. Only if that event is not handled do we activate column renderer (which
@@ -3578,7 +3583,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
} }
case WXK_SPACE: case WXK_SPACE:
if ( !event.HasModifiers() ) if ( event.HasModifiers() )
{
event.Skip();
break;
}
else
{ {
// Space toggles activatable items or -- if not activatable -- // Space toggles activatable items or -- if not activatable --
// starts inline editing (this is normally done using F2 on // starts inline editing (this is normally done using F2 on
@@ -3608,7 +3618,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
} }
case WXK_F2: case WXK_F2:
if ( !event.HasModifiers() ) if ( event.HasModifiers() )
{
event.Skip();
break;
}
else
{ {
if( !m_selection.empty() ) if( !m_selection.empty() )
{ {