Doc updates

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 427cd40fc9e4b4a9dd2722eec641ffa7e628f78b..0f624d2e6d55350b1abf6f2846376c4700af2e58 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -753,9 +753,9 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 #if wxUSE_UNICODE
     ch = event.GetUnicodeKey();
     if (ch <= 127)
-        ch = event.GetKeyCode();
+        ch = (wxChar)event.GetKeyCode();
 #else
-    ch = event.GetKeyCode();
+    ch = (wxChar)event.GetKeyCode();
 #endif
     switch (ch)
     {
@@ -1092,8 +1092,12 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
     tmpbuf[0] = (char) keycode;
     tmpbuf[1] = '\0';
     wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL        
     bool is_decimal_point = ( strbuf ==
        wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
+#else
+    bool is_decimal_point = ( strbuf == _T(".") );
+#endif
     if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
          || is_decimal_point )
     {
@@ -1166,9 +1170,13 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
         tmpbuf[0] = (char) keycode;
         tmpbuf[1] = '\0';
         wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL        
         bool is_decimal_point =
             ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
                                           wxLOCALE_CAT_NUMBER) );
+#else
+        bool is_decimal_point = ( strbuf == _T(".") );
+#endif
         if ( (keycode < 128) && 
              (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
               is_decimal_point || keycode == '+' || keycode == '-') )
@@ -4331,7 +4339,7 @@ void wxGrid::CalcDimensions()
         y = wxMax( h - 1, 0 );
 
     // do set scrollbar parameters
-    SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
+    SetScrollbars( m_scrollLineX, m_scrollLineY,
                    GetScrollX(w), GetScrollY(h), x, y,
                    GetBatchCount() != 0);
 
@@ -6526,7 +6534,7 @@ void wxGrid::OnChar( wxKeyEvent& event )
             // 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
@@ -8075,7 +8083,7 @@ void wxGrid::MakeCellVisible( int row, int col )
             //
             // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
             // scroll unit...
-            ypos += GRID_SCROLL_LINE_Y;
+            ypos += m_scrollLineY;
         }
 
         if ( left < 0 )
@@ -8090,15 +8098,15 @@ void wxGrid::MakeCellVisible( int row, int col )
             xpos = x0 + (right - cw);
 
             // see comment for ypos above
-            xpos += GRID_SCROLL_LINE_X;
+            xpos += m_scrollLineX;
         }
 
         if ( xpos != -1  ||  ypos != -1 )
         {
             if ( xpos != -1 )
-                xpos /= GRID_SCROLL_LINE_X;
+                xpos /= m_scrollLineX;
             if ( ypos != -1 )
-                ypos /= GRID_SCROLL_LINE_Y;
+                ypos /= m_scrollLineY;
             Scroll( xpos, ypos );
             AdjustScrollbars();
         }
@@ -9844,8 +9852,8 @@ void wxGrid::AutoSize()
     // won't get the scrollbars if we're sized exactly to this width
     // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
     // scrollbar steps
-    wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
-                   GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
+    wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * m_scrollLineX,
+                   GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY);
 
     // distribute the extra space between the columns/rows to avoid having
     // extra white space