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

Don't react to Enter/Space/F2 with modifiers in generic wxDataViewCtrl.

Browse Source 
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
This commit is contained in:
Václav Slavík
2012-01-11 13:42:53 +00:00
parent 8ba1d512d3
commit 49f89f4d4b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/datavgen.cpp
View File

@@ -3527,6 +3527,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
switch ( event.GetKeyCode() ) switch ( event.GetKeyCode() )
{ {
case WXK_RETURN: case WXK_RETURN:
if ( !event.HasModifiers() )
{ {
// 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
@@ -3546,6 +3547,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
} }
case WXK_SPACE: case WXK_SPACE:
if ( !event.HasModifiers() )
{ {
// 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
@@ -3575,6 +3577,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
} }
case WXK_F2: case WXK_F2:
if ( !event.HasModifiers() )
{ {
if( !m_selection.empty() ) if( !m_selection.empty() )
{ {