Don't call StartingKey if the key was F2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 439b9bbb1221de153b147902c2b0d147eb8cb42d..889365a4f48aef209acdecae0991b8ef97569452 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -6526,7 +6526,7 @@ void wxGrid::OnChar( wxKeyEvent& event )
             // visible (even after calling MakeCellVisible the
             // control is not created and calling StartingKey will
             // crash the app
             // visible (even after calling MakeCellVisible the
             // control is not created and calling StartingKey will
             // crash the app

-            if ( editor->IsCreated() && m_cellEditCtrlEnabled )
+            if ( event.GetKeyCode() != WXK_F2 && editor->IsCreated() && m_cellEditCtrlEnabled )

                 editor->StartingKey(event);
         }
         else
                 editor->StartingKey(event);
         }
         else