cw6 makefiles (makemac6.mcp)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c51c40cd96f7a19b3cdee5a71d9c95941be37900..0dae989bc83365c81efc067c6868f0869b8e8453 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -474,7 +474,7 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     // accept the simple key presses, not anything with Ctrl/Alt/Meta
-    return !event.HasModifiers();
+    return !(event.ControlDown() || event.AltDown());
 }
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
@@ -1393,6 +1393,7 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             event.Skip( m_grid->ProcessEvent( event ) );
             break;
 
+        case WXK_NUMPAD_ENTER:
         case WXK_RETURN:
             if (!m_grid->ProcessEvent(event))
                 m_editor->HandleReturn(event);
@@ -1411,6 +1412,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
         case WXK_ESCAPE:
         case WXK_TAB:
         case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
             break;
 
         default:
@@ -5422,6 +5424,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
                 if ( event.ControlDown() )
                 {
                     event.Skip();  // to let the edit control have the return
@@ -8103,7 +8106,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     if ( column )
         dc.GetTextExtent( GetColLabelValue(col), &w, &h );
     else
-        dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
+        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
 
     extent = column ? w : h;
     if ( extent > extentMax )