From 49f89f4d4bf889afd1b38997f05b7f0a4b910310 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 11 Jan 2012 13:42:53 +0000 Subject: [PATCH] Don't react to Enter/Space/F2 with modifiers in generic wxDataViewCtrl. Doing so was in conflict with system shortcuts; Alt+Space in particular is used by Windows. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/datavgen.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 536bb64f9c..e8d83fed0a 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3527,6 +3527,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { case WXK_RETURN: + if ( !event.HasModifiers() ) { // 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 @@ -3546,6 +3547,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } case WXK_SPACE: + if ( !event.HasModifiers() ) { // Space toggles activatable items or -- if not activatable -- // starts inline editing (this is normally done using F2 on @@ -3575,6 +3577,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } case WXK_F2: + if ( !event.HasModifiers() ) { if( !m_selection.empty() ) { -- 2.50.0