Fail for assert(0,...).

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6293c3cd9958981491067b60b5c44f9e5796965f..a8378fb171976a55b47ccefaa74779585bae4a83 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -570,6 +570,12 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
     int key = 0;
     bool keyOk = true;
 
     int key = 0;
     bool keyOk = true;
 

+#ifdef __WXGTK20__
+    // If it's a F-Key or other special key then it shouldn't start the
+    // editor.
+    if (event.GetKeyCode() >= WXK_START)
+        return false;
+#endif

 #if wxUSE_UNICODE
     // if the unicode key code is not really a unicode character (it may
     // be a function key or etc., the platforms appear to always give us a
 #if wxUSE_UNICODE
     // if the unicode key code is not really a unicode character (it may
     // be a function key or etc., the platforms appear to always give us a


@@ -7963,19 +7969,6 @@ void wxGrid::ShowCellEditControl()
                     editor->GetControl()->GetPosition().y );
             editor->Show( true, attr );
 
                     editor->GetControl()->GetPosition().y );
             editor->Show( true, attr );
 

-            int colXPos = GetColLeft(col);
-//            for (int i = 0; i < m_currentCellCoords.GetCol(); i++)
-//            {
-//                colXPos += GetColSize( i );
-//            }
-
-//             int xUnit = 1, yUnit = 1;
-//             GetScrollPixelsPerUnit( &xUnit, &yUnit );
-//             if (col != 0)
-//                 Scroll( colXPos / xUnit - 1, GetScrollPos( wxVERTICAL ) );
-//             else
-//                 Scroll( colXPos / xUnit, GetScrollPos( wxVERTICAL ) );
-

             // recalc dimensions in case we need to
             // expand the scrolled window to account for editor
             CalcDimensions();
             // recalc dimensions in case we need to
             // expand the scrolled window to account for editor
             CalcDimensions();