X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46cbb21ecbe0b016592a2166e4c9e3cec8f49d88..b7540dc1ecf6de3a9f771c3cd24c688a0122c248:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 99090322c0..a8378fb171 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Name:        generic/grid.cpp
+// Name:        src/generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin
@@ -9,19 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilatixon, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
@@ -158,7 +148,7 @@ public:
 private:
     wxGrid   *m_owner;
 
-    void OnPaint( wxPaintEvent &event );
+    void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
@@ -198,9 +188,9 @@ class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
 public:
     wxGridWindow()
     {
-        m_owner = (wxGrid *)NULL;
-        m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
-        m_colLabelWin = (wxGridColLabelWindow *)NULL;
+        m_owner = NULL;
+        m_rowLabelWin = NULL;
+        m_colLabelWin = NULL;
     }
 
     wxGridWindow( wxGrid *parent,
@@ -250,8 +240,8 @@ public:
     void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; }
 
 private:
-    wxGrid*             m_grid;
-    wxGridCellEditor*   m_editor;
+    wxGrid             *m_grid;
+    wxGridCellEditor   *m_editor;
 
     // Work around the fact that a focus kill event can be sent to
     // a combobox within a set focus event.
@@ -272,7 +262,6 @@ BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
 END_EVENT_TABLE()
 
 
-
 // ----------------------------------------------------------------------------
 // the internal data representation used by wxGridCellAttrProvider
 // ----------------------------------------------------------------------------
@@ -298,7 +287,7 @@ class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
 {
 public:
     // empty ctor to suppress warnings
-    wxGridRowOrColAttrData() { }
+    wxGridRowOrColAttrData() {}
     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);
@@ -331,7 +320,7 @@ struct wxGridDataTypeInfo
                        wxGridCellRenderer* renderer,
                        wxGridCellEditor* editor)
         : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
-        { }
+        {}
 
     ~wxGridDataTypeInfo()
     {
@@ -380,6 +369,7 @@ private:
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
+
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
@@ -396,14 +386,14 @@ private:
 #ifdef DEBUG_ATTR_CACHE
     static size_t gs_nAttrCacheHits = 0;
     static size_t gs_nAttrCacheMisses = 0;
-#endif // DEBUG_ATTR_CACHE
+#endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 wxGridCellCoords wxGridNoCellCoords( -1, -1 );
-wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
+wxRect wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size
 // TODO: this doesn't work at all, grid cells have different sizes and approx
@@ -454,7 +444,6 @@ wxGridCellEditor::wxGridCellEditor()
     m_attr = NULL;
 }
 
-
 wxGridCellEditor::~wxGridCellEditor()
 {
     Destroy();
@@ -489,7 +478,7 @@ void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {
-        m_control->PopEventHandler(true /* delete it*/);
+        m_control->PopEventHandler( true /* delete it*/ );
 
         m_control->Destroy();
         m_control = NULL;
@@ -498,8 +487,8 @@ void wxGridCellEditor::Destroy()
 
 void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+
     m_control->Show(show);
 
     if ( show )
@@ -518,6 +507,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());
 #endif
+
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }
@@ -536,6 +526,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
+
 // Workaround for GTK+1 font setting problem on some platforms
 #if !defined(__WXGTK__) || defined(__WXGTK20__)
         if ( m_fontOld.Ok() )
@@ -549,8 +540,8 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
 
 void wxGridCellEditor::SetSize(const wxRect& rect)
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+
     m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 
@@ -563,6 +554,7 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     bool ctrl = event.ControlDown();
     bool alt  = event.AltDown();
+
 #ifdef __WXMAC__
     // On the Mac the Alt key is more like shift and is used for entry of
     // valid characters, so check for Ctrl and Meta instead.
@@ -575,26 +567,32 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
     if ((ctrl || alt) && !(ctrl && alt))
         return false;
 
-#if wxUSE_UNICODE
-    int key = event.GetUnicodeKey();
+    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
-    // small value in this case) then fallback to the ascii key code but
+    // small value in this case) then fallback to the ASCII key code but
     // don't do anything for function keys or etc.
+    key = event.GetUnicodeKey();
     if (key <= 127)
     {
         key = event.GetKeyCode();
         keyOk = (key <= 127);
     }
+#else
+    key = event.GetKeyCode();
+    keyOk = (key <= 255);
+#endif
+
     return keyOk;
-#else // !wxUSE_UNICODE
-    int key = event.GetKeyCode();
-    if (key <= 255)
-        return true;
-    return false;
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
 }
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
@@ -640,19 +638,17 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
 void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
                                            wxGridCellAttr * WXUNUSED(attr))
 {
-    // as we fill the entire client area, don't do anything here to minimize
-    // flicker
+    // as we fill the entire client area,
+    // don't do anything here to minimize flicker
 }
 
 void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
 {
     wxRect rect(rectOrig);
 
-    // Make the edit control large enough to allow for internal
-    // margins
+    // Make the edit control large enough to allow for internal margins
     //
-    // TODO: remove this if the text ctrl sizing is improved esp. for
-    // unix
+    // TODO: remove this if the text ctrl sizing is improved esp. for unix
     //
 #if defined(__WXGTK__)
     if (rect.x != 0)
@@ -663,24 +659,25 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
         rect.height -= 1;
     }
 #else // !GTK
-    int extra_x = ( rect.x > 2 )? 2 : 1;
+    int extra_x = ( rect.x > 2 ) ? 2 : 1;
 
 // MB: treat MSW separately here otherwise the caret doesn't show
 // when the editor is in the first row.
 #if defined(__WXMSW__)
     int extra_y = 2;
 #else
-    int extra_y = ( rect.y > 2 )? 2 : 1;
-#endif // MSW
+    int extra_y = ( rect.y > 2 ) ? 2 : 1;
+#endif
 
 #if defined(__WXMOTIF__)
     extra_x *= 2;
     extra_y *= 2;
 #endif
+
     rect.SetLeft( wxMax(0, rect.x - extra_x) );
     rect.SetTop( wxMax(0, rect.y - extra_y) );
-    rect.SetRight( rect.GetRight() + 2*extra_x );
-    rect.SetBottom( rect.GetBottom() + 2*extra_y );
+    rect.SetRight( rect.GetRight() + 2 * extra_x );
+    rect.SetBottom( rect.GetBottom() + 2 * extra_y );
 #endif // GTK/!GTK
 
     wxGridCellEditor::SetSize(rect);
@@ -688,8 +685,7 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
 
@@ -700,15 +696,13 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
-    Text()->SetSelection(-1,-1);
+    Text()->SetSelection(-1, -1);
     Text()->SetFocus();
 }
 
-bool wxGridCellTextEditor::EndEdit(int row, int col,
-                                   wxGrid* grid)
+bool wxGridCellTextEditor::EndEdit(int row, int col, wxGrid* grid)
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
 
     bool changed = false;
     wxString value = Text()->GetValue();
@@ -719,17 +713,16 @@ bool wxGridCellTextEditor::EndEdit(int row, int col,
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
+
     // No point in setting the text of the hidden control
     //Text()->SetValue(m_startValue);
 
     return changed;
 }
 
-
 void wxGridCellTextEditor::Reset()
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
 
     DoReset(m_startValue);
 }
@@ -763,20 +756,21 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 #else
     ch = (wxChar)event.GetKeyCode();
 #endif
+
     switch (ch)
     {
         case WXK_DELETE:
             // delete the character at the cursor
             pos = tc->GetInsertionPoint();
             if (pos < tc->GetLastPosition())
-                tc->Remove(pos, pos+1);
+                tc->Remove(pos, pos + 1);
             break;
 
         case WXK_BACK:
             // delete the character before the cursor
             pos = tc->GetInsertionPoint();
             if (pos > 0)
-                tc->Remove(pos-1, pos);
+                tc->Remove(pos - 1, pos);
             break;
 
         default:
@@ -812,13 +806,13 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
     else
     {
         long tmp;
-        if ( !params.ToLong(&tmp) )
+        if ( params.ToLong(&tmp) )
         {
-            wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str());
+            m_maxChars = (size_t)tmp;
         }
         else
         {
-            m_maxChars = (size_t)tmp;
+            wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
         }
     }
 }
@@ -826,7 +820,7 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
 // return the value in the text control
 wxString wxGridCellTextEditor::GetValue() const
 {
-  return Text()->GetValue();
+    return Text()->GetValue();
 }
 
 // ----------------------------------------------------------------------------
@@ -862,7 +856,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent,
 
 #if wxUSE_VALIDATORS
         Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+#endif
     }
 }
 
@@ -985,6 +979,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
         }
     }
 #endif
+
     event.Skip();
 }
 
@@ -1054,7 +1049,7 @@ void wxGridCellFloatEditor::Create(wxWindow* parent,
 
 #if wxUSE_VALIDATORS
     Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+#endif
 }
 
 void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
@@ -1095,6 +1090,7 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col,
 
         return true;
     }
+
     return false;
 }
 
@@ -1110,12 +1106,14 @@ 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 )
     {
@@ -1159,20 +1157,25 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params)
 wxString wxGridCellFloatEditor::GetString() const
 {
     wxString fmt;
-    if ( m_width == -1 )
-    {
-        // default width/precision
-        fmt = _T("%f");
-    }
-    else if ( m_precision == -1 )
+    if ( m_precision == -1 && m_width != -1)
     {
         // default precision
         fmt.Printf(_T("%%%d.f"), m_width);
     }
-    else
+    else if ( m_precision != -1 && m_width == -1)
+    {
+        // default width
+        fmt.Printf(_T("%%.%df"), m_precision);
+    }
+    else if ( m_precision != -1 && m_width != -1 )
     {
         fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
     }
+    else
+    {
+        // default width/precision
+        fmt = _T("%f");
+    }
 
     return wxString::Format(fmt, m_valueOld);
 }
@@ -1188,6 +1191,7 @@ 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,
@@ -1195,10 +1199,13 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
 #else
         bool is_decimal_point = ( strbuf == _T(".") );
 #endif
+
         if ( (keycode < 128) &&
              (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
               is_decimal_point || keycode == '+' || keycode == '-') )
+        {
             return true;
+        }
     }
 
     return false;
@@ -1273,20 +1280,22 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
     if (hAlign == wxALIGN_LEFT)
     {
         x = r.x + 2;
+
 #ifdef __WXMSW__
         x += 2;
 #endif
-        y = r.y + r.height/2 - size.y/2;
+
+        y = r.y + r.height / 2 - size.y / 2;
     }
     else if (hAlign == wxALIGN_RIGHT)
     {
         x = r.x + r.width - size.x - 2;
-        y = r.y + r.height/2 - size.y/2;
+        y = r.y + r.height / 2 - size.y / 2;
     }
     else if (hAlign == wxALIGN_CENTRE)
     {
-        x = r.x + r.width/2 - size.x/2;
-        y = r.y + r.height/2 - size.y/2;
+        x = r.x + r.width / 2 - size.x / 2;
+        y = r.y + r.height / 2 - size.y / 2;
     }
 
     m_control->Move(x, y);
@@ -1306,15 +1315,18 @@ void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+                 wxT("The wxGridCellEditor must be created first!"));
 
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+    {
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+    }
     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );
         m_startValue = !( !cellval || (cellval == wxT("0")) );
     }
+
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
@@ -1323,7 +1335,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+                 wxT("The wxGridCellEditor must be created first!"));
 
     bool changed = false;
     bool value = CBox()->GetValue();
@@ -1344,7 +1356,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
 void wxGridCellBoolEditor::Reset()
 {
     wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+                 wxT("The wxGridCellEditor must be created first!"));
 
     CBox()->SetValue(m_startValue);
 }
@@ -1454,15 +1466,15 @@ void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
     // flicker
 
     // TODO: It doesn't actually fill the client area since the height of a
-    // combo always defaults to the standard...  Until someone has time to
-    // figure out the right rectangle to paint, just do it the normal way...
+    // combo always defaults to the standard.  Until someone has time to
+    // figure out the right rectangle to paint, just do it the normal way.
     wxGridCellEditor::PaintBackground(rectCell, attr);
 }
 
 void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+                 wxT("The wxGridCellEditor must be created first!"));
 
     wxGridCellEditorEvtHandler* evtHandler = NULL;
     if (m_control)
@@ -1475,7 +1487,9 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
     m_startValue = grid->GetTable()->GetValue(row, col);
 
     if (m_allowOthers)
+    {
         Combo()->SetValue(m_startValue);
+    }
     else
     {
         // find the right position, or default to the first if not found
@@ -1484,6 +1498,7 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
             pos = 0;
         Combo()->SetSelection(pos);
     }
+
     Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 
@@ -1577,11 +1592,21 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 
         default:
             event.Skip();
+            break;
     }
 }
 
 void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {
+    int row = m_grid->GetGridCursorRow();
+    int col = m_grid->GetGridCursorCol();
+    wxRect rect = m_grid->CellToRect( row, col );
+    int cw, ch;
+    m_grid->GetGridWindow()->GetClientSize( &cw, &ch );
+
+    // if cell width is smaller than grid client area, cell is wholly visible
+    bool wholeCellVisible = (rect.GetWidth() < cw);
+
     switch ( event.GetKeyCode() )
     {
         case WXK_ESCAPE:
@@ -1590,8 +1615,92 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
         case WXK_NUMPAD_ENTER:
             break;
 
+        case WXK_HOME:
+        {
+            if ( wholeCellVisible )
+            {
+                // no special processing needed...
+                event.Skip();
+                break;
+            }
+
+            // do special processing for partly visible cell...
+
+            // get the widths of all cells previous to this one
+            int colXPos = 0;
+            for ( int i = 0; i < col; i++ )
+            {
+                colXPos += m_grid->GetColSize(i);
+            }
+
+            int xUnit = 1, yUnit = 1;
+            m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+            if (col != 0)
+            {
+                m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+            }
+            else
+            {
+                m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL));
+            }
+            event.Skip();
+            break;
+        }
+
+        case WXK_END:
+        {
+            if ( wholeCellVisible )
+            {
+                // no special processing needed...
+                event.Skip();
+                break;
+            }
+
+            // do special processing for partly visible cell...
+
+            int textWidth = 0;
+            wxString value = m_grid->GetCellValue(row, col);
+            if ( wxEmptyString != value )
+            {
+                // get width of cell CONTENTS (text)
+                int y;
+                wxFont font = m_grid->GetCellFont(row, col);
+                m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font);
+
+                // try to RIGHT align the text by scrolling
+                int client_right = m_grid->GetGridWindow()->GetClientSize().GetWidth();
+
+                // (m_grid->GetScrollLineX()*2) is a factor for not scrolling to far,
+                // otherwise the last part of the cell content might be hidden below the scroll bar
+                // FIXME: maybe there is a more suitable correction?
+                textWidth -= (client_right - (m_grid->GetScrollLineX() * 2));
+                if ( textWidth < 0 )
+                {
+                    textWidth = 0;
+                }
+            }
+
+            // get the widths of all cells previous to this one
+            int colXPos = 0;
+            for ( int i = 0; i < col; i++ )
+            {
+                colXPos += m_grid->GetColSize(i);
+            }
+
+            // and add the (modified) text width of the cell contents
+            // as we'd like to see the last part of the cell contents
+            colXPos += textWidth;
+
+            int xUnit = 1, yUnit = 1;
+            m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+            m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+            event.Skip();
+            break;
+        }
+
         default:
             event.Skip();
+            break;
     }
 }
 
@@ -1663,21 +1772,21 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
     // different coloured text when the grid is disabled
     if ( grid.IsEnabled() )
     {
-      if ( isSelected )
-      {
-          dc.SetTextBackground( grid.GetSelectionBackground() );
-          dc.SetTextForeground( grid.GetSelectionForeground() );
-      }
-      else
-      {
-          dc.SetTextBackground( attr.GetBackgroundColour() );
-          dc.SetTextForeground( attr.GetTextColour() );
-      }
+        if ( isSelected )
+        {
+            dc.SetTextBackground( grid.GetSelectionBackground() );
+            dc.SetTextForeground( grid.GetSelectionForeground() );
+        }
+        else
+        {
+            dc.SetTextBackground( attr.GetBackgroundColour() );
+            dc.SetTextForeground( attr.GetTextColour() );
+        }
     }
     else
     {
-      dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
-      dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
+        dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
     }
 
     dc.SetFont( attr.GetFont() );
@@ -1732,34 +1841,40 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
         int cols = grid.GetNumberCols();
         int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
         int cell_rows, cell_cols;
-        attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0
+        attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <= 0
         if ((best_width > rectCell.width) && (col < cols) && grid.GetTable())
         {
             int i, c_cols, c_rows;
             for (i = col+cell_cols; i < cols; i++)
             {
                 bool is_empty = true;
-                for (int j=row; j<row+cell_rows; j++)
+                for (int j=row; j < row + cell_rows; j++)
                 {
                     // check w/ anchor cell for multicell block
                     grid.GetCellSize(j, i, &c_rows, &c_cols);
-                    if (c_rows > 0) c_rows = 0;
-                    if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
+                    if (c_rows > 0)
+                        c_rows = 0;
+                    if (!grid.GetTable()->IsEmptyCell(j + c_rows, i))
                     {
                         is_empty = false;
                         break;
                     }
                 }
+
                 if (is_empty)
+                {
                     rect.width += grid.GetColSize(i);
+                }
                 else
                 {
                     i--;
                     break;
                 }
+
                 if (rect.width >= best_width)
                     break;
             }
+
             overflowCols = i - col - cell_cols + 1;
             if (overflowCols >= cols)
                 overflowCols = cols - 1;
@@ -1771,10 +1886,10 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
             wxRect clip = rect;
             clip.x += rectCell.width;
             // draw each overflow cell individually
-            int col_end = col+cell_cols+overflowCols;
+            int col_end = col + cell_cols + overflowCols;
             if (col_end >= grid.GetNumberCols())
                 col_end = grid.GetNumberCols() - 1;
-            for (int i = col+cell_cols; i <= col_end; i++)
+            for (int i = col + cell_cols; i <= col_end; i++)
             {
                 clip.width = grid.GetColSize(i) - 1;
                 dc.DestroyClippingRegion();
@@ -1978,6 +2093,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
             }
         }
+
         tmp = params.AfterFirst(_T(','));
         if ( !tmp.empty() )
         {
@@ -1994,7 +2110,6 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
     }
 }
 
-
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
@@ -2018,7 +2133,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
         // get checkbox size
         wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);
         wxSize size = checkbox->GetBestSize();
-        wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+        wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
@@ -2055,34 +2170,36 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 
     // draw a border around checkmark
     int vAlign, hAlign;
-    attr.GetAlignment(& hAlign, &vAlign);
+    attr.GetAlignment(&hAlign, &vAlign);
 
     wxRect rectBorder;
     if (hAlign == wxALIGN_CENTRE)
     {
-        rectBorder.x = rect.x + rect.width/2 - size.x/2;
-        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.x = rect.x + rect.width / 2 - size.x / 2;
+        rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
         rectBorder.width = size.x;
         rectBorder.height = size.y;
     }
     else if (hAlign == wxALIGN_LEFT)
     {
         rectBorder.x = rect.x + 2;
-        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
         rectBorder.width = size.x;
         rectBorder.height = size.y;
     }
     else if (hAlign == wxALIGN_RIGHT)
     {
         rectBorder.x = rect.x + rect.width - size.x - 2;
-        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
         rectBorder.width = size.x;
         rectBorder.height = size.y;
     }
 
     bool value;
     if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+    {
         value = grid.GetTable()->GetValueAsBool(row, col);
+    }
     else
     {
         wxString cellval( grid.GetTable()->GetValue(row, col) );
@@ -2092,14 +2209,15 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     if ( value )
     {
         wxRect rectMark = rectBorder;
+
 #ifdef __WXMSW__
         // MSW DrawCheckMark() is weird (and should probably be changed...)
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN / 2);
         rectMark.x++;
         rectMark.y++;
-#else // !MSW
+#else
         rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif // MSW/!MSW
+#endif
 
         dc.SetTextForeground(attr.GetTextColour());
         dc.DrawCheckMark(rectMark);
@@ -2196,10 +2314,10 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
         m_editor =  mergefrom->m_editor;
         m_editor->IncRef();
     }
-    if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
+    if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
         SetReadOnly(mergefrom->IsReadOnly());
 
-    if (!HasOverflowMode()  && mergefrom->HasOverflowMode() )
+    if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
         SetOverflow(mergefrom->GetOverflow());
 
     SetDefAttr(mergefrom->m_defGridAttr);
@@ -2217,9 +2335,9 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols)
 
     // Size of 0,0 is NOT valid, neither is <=0 and any positive value
 
-    wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) ||
-                  !((num_rows<=0)&&(num_cols>0)) ||
-                  !((num_rows==0)&&(num_cols==0))),
+    wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) ||
+                  !((num_rows <= 0) && (num_cols > 0)) ||
+                  !((num_rows == 0) && (num_cols == 0))),
                   wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
 
     m_sizeRows = num_rows;
@@ -2243,13 +2361,16 @@ const wxColour& wxGridCellAttr::GetTextColour() const
     }
 }
 
-
 const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
     if (HasBackgroundColour())
+    {
         return m_colBack;
+    }
     else if (m_defGridAttr && m_defGridAttr != this)
+    {
         return m_defGridAttr->GetBackgroundColour();
+    }
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
@@ -2257,13 +2378,16 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const
     }
 }
 
-
 const wxFont& wxGridCellAttr::GetFont() const
 {
     if (HasFont())
+    {
         return m_font;
+    }
     else if (m_defGridAttr && m_defGridAttr != this)
+    {
         return m_defGridAttr->GetFont();
+    }
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
@@ -2271,7 +2395,6 @@ const wxFont& wxGridCellAttr::GetFont() const
     }
 }
 
-
 void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 {
     if (HasAlignment())
@@ -2282,7 +2405,9 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
             *vAlign = m_vAlign;
     }
     else if (m_defGridAttr && m_defGridAttr != this)
+    {
         m_defGridAttr->GetAlignment(hAlign, vAlign);
+    }
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
@@ -2302,11 +2427,11 @@ void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 // used, otherwise the default editor or renderer is fetched from the grid and
 // used.  It should be the default for the data type of the cell.  If it is
 // NULL (because the table has a type that the grid does not have in its
-// registry,) then the grid's default editor or renderer is used.
+// registry), then the grid's default editor or renderer is used.
 
 wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {
-    wxGridCellRenderer *renderer;
+    wxGridCellRenderer *renderer = NULL;
 
     if ( m_renderer && this != m_defGridAttr )
     {
@@ -2314,7 +2439,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
         renderer = m_renderer;
         renderer->IncRef();
     }
-    else // no non default cell renderer
+    else // no non-default cell renderer
     {
         // get default renderer for the data type
         if ( grid )
@@ -2322,14 +2447,10 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
             // GetDefaultRendererForCell() will do IncRef() for us
             renderer = grid->GetDefaultRendererForCell(row, col);
         }
-        else
-        {
-            renderer = NULL;
-        }
 
-        if ( !renderer )
+        if ( renderer == NULL )
         {
-            if (m_defGridAttr &&  this != m_defGridAttr )
+            if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
             {
                 // if we still don't have one then use the grid default
                 // (no need for IncRef() here neither)
@@ -2354,7 +2475,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
 // same as above, except for s/renderer/editor/g
 wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
 {
-    wxGridCellEditor *editor;
+    wxGridCellEditor *editor = NULL;
 
     if ( m_editor && this != m_defGridAttr )
     {
@@ -2370,14 +2491,10 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons
             // GetDefaultEditorForCell() will do IncRef() for us
             editor = grid->GetDefaultEditorForCell(row, col);
         }
-        else
-        {
-            editor = NULL;
-        }
 
-        if ( !editor )
+        if ( editor == NULL )
         {
-            if ( m_defGridAttr && this != m_defGridAttr )
+            if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
             {
                 // if we still don't have one then use the grid default
                 // (no need for IncRef() here neither)
@@ -2507,7 +2624,8 @@ void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
                     // No need to DecRef the attribute itself since this is
                     // done be wxGridCellWithAttr's destructor!
                     m_attrs.RemoveAt(n);
-                    n--; count--;
+                    n--;
+                    count--;
                 }
             }
         }
@@ -2640,16 +2758,16 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
     if ( m_data )
     {
-        switch(kind)
+        switch (kind)
         {
             case (wxGridCellAttr::Any):
-                //Get cached merge attributes.
-                // Currenlty not used as no cache implemented as not mutiable
+                // Get cached merge attributes.
+                // Currently not used as no cache implemented as not mutable
                 // attr = m_data->m_mergeAttr.GetAttr(row, col);
                 if (!attr)
                 {
-                    //Basically implement old version.
-                    //Also check merge cache, so we don't have to re-merge every time..
+                    // Basically implement old version.
+                    // Also check merge cache, so we don't have to re-merge every time..
                     wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
                     wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
                     wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
@@ -2660,7 +2778,7 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                         attr = new wxGridCellAttr;
                         attr->SetKind(wxGridCellAttr::Merged);
 
-                        //Order important..
+                        // Order is important..
                         if (attrcell)
                         {
                             attr->MergeWith(attrcell);
@@ -2676,7 +2794,8 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                             attr->MergeWith(attrrow);
                             attrrow->DecRef();
                         }
-                        //store merge attr if cache implemented
+
+                        // store merge attr if cache implemented
                         //attr->IncRef();
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
@@ -2687,7 +2806,7 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                             attr = attrrow;
                         if (attrcol)
                         {
-                            if(attr)
+                            if (attr)
                                 attr->DecRef();
                             attr = attrcol;
                         }
@@ -2699,27 +2818,28 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                         }
                     }
                 }
-            break;
+                break;
 
             case (wxGridCellAttr::Cell):
                 attr = m_data->m_cellAttrs.GetAttr(row, col);
-            break;
+                break;
 
             case (wxGridCellAttr::Col):
                 attr = m_data->m_colAttrs.GetAttr(col);
-            break;
+                break;
 
             case (wxGridCellAttr::Row):
                 attr = m_data->m_rowAttrs.GetAttr(row);
-            break;
+                break;
 
             default:
                 // unused as yet...
                 // (wxGridCellAttr::Default):
                 // (wxGridCellAttr::Merged):
-            break;
+                break;
         }
     }
+
     return attr;
 }
 
@@ -2779,7 +2899,6 @@ wxGridTypeRegistry::~wxGridTypeRegistry()
         delete m_typeinfo[i];
 }
 
-
 void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
                                           wxGridCellRenderer* renderer,
                                           wxGridCellEditor* editor)
@@ -2917,6 +3036,7 @@ wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
     if (renderer)
         renderer->IncRef();
+
     return renderer;
 }
 
@@ -2925,6 +3045,7 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
     if (editor)
         editor->IncRef();
+
     return editor;
 }
 
@@ -2934,7 +3055,6 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 
 IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 
-
 wxGridTableBase::wxGridTableBase()
 {
     m_view = (wxGrid *) NULL;
@@ -2959,6 +3079,7 @@ bool wxGridTableBase::CanHaveAttributes()
         // use the default attr provider by default
         SetAttrProvider(new wxGridCellAttrProvider);
     }
+
     return true;
 }
 
@@ -2970,7 +3091,6 @@ wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAtt
         return (wxGridCellAttr *)NULL;
 }
 
-
 void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
 {
     if ( m_attrProvider )
@@ -3065,8 +3185,11 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
 wxString wxGridTableBase::GetRowLabelValue( int row )
 {
     wxString s;
-    s << row + 1; // RD: Starting the rows at zero confuses users, no matter
-                  //     how much it makes sense to us geeks.
+
+    // RD: Starting the rows at zero confuses users,
+    // no matter how much it makes sense to us geeks.
+    s << row + 1;
+
     return s;
 }
 
@@ -3081,17 +3204,17 @@ wxString wxGridTableBase::GetColLabelValue( int col )
     unsigned int i, n;
     for ( n = 1; ; n++ )
     {
-        s += (wxChar) (_T('A') + (wxChar)( col%26 ));
-        col = col/26 - 1;
+        s += (wxChar) (_T('A') + (wxChar)(col % 26));
+        col = col / 26 - 1;
         if ( col < 0 )
             break;
     }
 
     // reverse the string...
     wxString s2;
-    for ( i = 0;  i < n;  i++ )
+    for ( i = 0; i < n; i++ )
     {
-        s2 += s[n-i-1];
+        s2 += s[n - i - 1];
     }
 
     return s2;
@@ -3143,7 +3266,6 @@ void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
 {
 }
 
-
 void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
                                          const wxString& WXUNUSED(typeName) )
 {
@@ -3179,8 +3301,6 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
     m_comInt2 = commandInt2;
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 //
 // A basic grid table for string data. An object of this class will
@@ -3261,9 +3381,9 @@ void wxGridStringTable::Clear()
     {
         numCols = m_data[0].GetCount();
 
-        for ( row = 0;  row < numRows;  row++ )
+        for ( row = 0; row < numRows; row++ )
         {
-            for ( col = 0;  col < numCols;  col++ )
+            for ( col = 0; col < numCols; col++ )
             {
                 m_data[row][col] = wxEmptyString;
             }
@@ -3271,7 +3391,6 @@ void wxGridStringTable::Clear()
     }
 }
 
-
 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();
@@ -3287,6 +3406,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
     sa.Alloc( curNumCols );
     sa.Add( wxEmptyString, curNumCols );
     m_data.Insert( sa, pos, numRows );
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3386,9 +3506,9 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
         return AppendCols( numCols );
     }
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )
     {
-        for ( col = pos;  col < pos + numCols;  col++ )
+        for ( col = pos; col < pos + numCols; col++ )
         {
             m_data[row].Insert( wxEmptyString, col );
         }
@@ -3412,6 +3532,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     size_t row;
 
     size_t curNumRows = m_data.GetCount();
+
 #if 0
     if ( !curNumRows )
     {
@@ -3422,7 +3543,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     }
 #endif
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )
     {
         m_data[row].Add( wxEmptyString, numCols );
     }
@@ -3464,7 +3585,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         numCols = curNumCols - pos;
     }
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )
     {
         if ( numCols >= curNumCols )
         {
@@ -3499,7 +3620,7 @@ wxString wxGridStringTable::GetRowLabelValue( int row )
     }
     else
     {
-        return m_rowLabels[ row ];
+        return m_rowLabels[row];
     }
 }
 
@@ -3513,7 +3634,7 @@ wxString wxGridStringTable::GetColLabelValue( int col )
     }
     else
     {
-        return m_colLabels[ col ];
+        return m_colLabels[col];
     }
 }
 
@@ -3523,7 +3644,8 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
     {
         int n = m_rowLabels.GetCount();
         int i;
-        for ( i = n;  i <= row;  i++ )
+
+        for ( i = n; i <= row; i++ )
         {
             m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
         }
@@ -3538,7 +3660,8 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
     {
         int n = m_colLabels.GetCount();
         int i;
-        for ( i = n;  i <= col;  i++ )
+
+        for ( i = n; i <= col; i++ )
         {
             m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
         }
@@ -3555,17 +3678,17 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
-    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
     EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
-    EVT_CHAR ( wxGridRowLabelWindow::OnChar )
+    EVT_CHAR( wxGridRowLabelWindow::OnChar )
 END_EVENT_TABLE()
 
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
 {
     m_owner = parent;
 }
@@ -3585,7 +3708,7 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     dc.SetDeviceOrigin( 0, -y );
 
     wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawRowLabels( dc , rows );
+    m_owner->DrawRowLabels( dc, rows );
 }
 
 void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
@@ -3595,7 +3718,7 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
 {
-    m_owner->GetEventHandler()->ProcessEvent(event);
+    m_owner->GetEventHandler()->ProcessEvent( event );
 }
 
 // This seems to be required for wxMotif otherwise the mouse
@@ -3603,37 +3726,39 @@ void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
 void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
-    EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
     EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
-    EVT_CHAR ( wxGridColLabelWindow::OnChar )
+    EVT_CHAR( wxGridColLabelWindow::OnChar )
 END_EVENT_TABLE()
 
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
 {
     m_owner = parent;
 }
@@ -3653,7 +3778,7 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     dc.SetDeviceOrigin( -x, 0 );
 
     wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawColLabels( dc , cols );
+    m_owner->DrawColLabels( dc, cols );
 }
 
 void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
@@ -3663,7 +3788,7 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
 {
-    m_owner->GetEventHandler()->ProcessEvent(event);
+    m_owner->GetEventHandler()->ProcessEvent( event );
 }
 
 // This seems to be required for wxMotif otherwise the mouse
@@ -3687,24 +3812,23 @@ void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
         event.Skip();
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
-    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
-    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
     EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
     EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
-    EVT_CHAR ( wxGridCornerLabelWindow::OnChar )
+    EVT_CHAR( wxGridCornerLabelWindow::OnChar )
 END_EVENT_TABLE()
 
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
 {
     m_owner = parent;
 }
@@ -3727,16 +3851,16 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
 #else // !__WXGTK__
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
-    dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW), 1, wxSOLID) );
+    dc.DrawLine( client_width - 1, client_height - 1, client_width - 1, 0 );
+    dc.DrawLine( client_width - 1, client_height - 1, 0, client_height - 1 );
     dc.DrawLine( 0, 0, client_width, 0 );
     dc.DrawLine( 0, 0, 0, client_height );
 
     dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 1, 1, client_width-1, 1 );
-    dc.DrawLine( 1, 1, 1, client_height-1 );
-#endif // __WXGTK__/!__WXGTK__
+    dc.DrawLine( 1, 1, client_width - 1, 1 );
+    dc.DrawLine( 1, 1, 1, client_height - 1 );
+#endif
 }
 
 void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
@@ -3754,31 +3878,33 @@ void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
 void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
     EVT_PAINT( wxGridWindow::OnPaint )
-    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
     EVT_KEY_UP( wxGridWindow::OnKeyUp )
-    EVT_CHAR ( wxGridWindow::OnChar )
+    EVT_CHAR( wxGridWindow::OnChar )
     EVT_SET_FOCUS( wxGridWindow::OnFocus )
     EVT_KILL_FOCUS( wxGridWindow::OnFocus )
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
@@ -3790,8 +3916,10 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxWindowID id,
                             const wxPoint &pos,
                             const wxSize &size )
-            : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE,
-                        wxT("grid window") )
+            : wxWindow(
+                parent, id, pos, size,
+                wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN | wxFULL_REPAINT_ON_RESIZE,
+                wxT("grid window") )
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
@@ -3803,13 +3931,15 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();
-    wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
-    m_owner->DrawGridCellArea( dc , DirtyCells);
+    wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc, dirtyCells );
+
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
+
     m_owner->DrawGridSpace( dc );
-    m_owner->DrawHighlight( dc , DirtyCells );
+    m_owner->DrawHighlight( dc, dirtyCells );
 }
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
@@ -3829,7 +3959,7 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
 {
-    m_owner->GetEventHandler()->ProcessEvent(event);
+    m_owner->GetEventHandler()->ProcessEvent( event );
 }
 
 // This seems to be required for wxMotif/wxGTK otherwise the mouse
@@ -3882,6 +4012,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
                                           m_minAcceptableRowHeight, \
                                           m_rowBottoms, m_numRows, true)
+
 /////////////////////////////////////////////////////////////////////
 
 #if wxUSE_EXTENDED_RTTI
@@ -3911,7 +4042,7 @@ wxBEGIN_FLAGS( wxGridStyle )
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)
     wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB)
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)
 
@@ -3930,7 +4061,7 @@ wxEND_HANDLERS_TABLE()
 wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
 
 /*
- TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo)
+ TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo)
 */
 #else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
@@ -3949,10 +4080,10 @@ wxGrid::wxGrid()
 {
     // in order to make sure that a size event is not
     // trigerred in a unfinished state
-    m_cornerLabelWin = NULL ;
-    m_rowLabelWin = NULL ;
-    m_colLabelWin = NULL ;
-    m_gridWin = NULL ;
+    m_cornerLabelWin = NULL;
+    m_rowLabelWin = NULL;
+    m_colLabelWin = NULL;
+    m_gridWin = NULL;
 }
 
 wxGrid::wxGrid( wxWindow *parent,
@@ -3974,19 +4105,18 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
-                                  style | wxWANTS_CHARS , name))
+                                  style | wxWANTS_CHARS, name))
         return false;
 
-    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
-    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE);
+    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE);
 
-    Create() ;
+    Create();
     SetBestFittingSize(size);
 
     return true;
 }
 
-
 wxGrid::~wxGrid()
 {
     // Must do this or ~wxScrollHelper will pop the wrong event handler
@@ -4009,7 +4139,6 @@ wxGrid::~wxGrid()
     delete m_selection;
 }
 
-
 //
 // ----- internal init and update functions
 //
@@ -4024,10 +4153,15 @@ wxGrid::~wxGrid()
 
 void wxGrid::Create()
 {
-    m_created = false;    // set to true by CreateGrid
+    // set to true by CreateGrid
+    m_created = false;
+
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
+    m_selection = NULL;
 
-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = false;
+    m_table = (wxGridTableBase *) NULL;
+    m_ownTable = false;
 
     m_cellEditCtrlEnabled = false;
 
@@ -4062,16 +4196,7 @@ void wxGrid::Create()
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
-    // create the type registry
-    m_typeRegistry = new wxGridTypeRegistry;
-    m_selection = NULL;
-
     // subwindow components that make up the wxGrid
-    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-                                                    wxID_ANY,
-                                                    wxDefaultPosition,
-                                                    wxDefaultSize );
-
     m_rowLabelWin = new wxGridRowLabelWindow( this,
                                               wxID_ANY,
                                               wxDefaultPosition,
@@ -4082,6 +4207,11 @@ void wxGrid::Create()
                                               wxDefaultPosition,
                                               wxDefaultSize );
 
+    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+                                                    wxID_ANY,
+                                                    wxDefaultPosition,
+                                                    wxDefaultSize );
+
     m_gridWin = new wxGridWindow( this,
                                   m_rowLabelWin,
                                   m_colLabelWin,
@@ -4102,6 +4232,7 @@ void wxGrid::Create()
     wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
 #endif
+
     m_cornerLabelWin->SetOwnForegroundColour(lfg);
     m_cornerLabelWin->SetOwnBackgroundColour(lbg);
     m_rowLabelWin->SetOwnForegroundColour(lfg);
@@ -4115,7 +4246,6 @@ void wxGrid::Create()
     Init();
 }
 
-
 bool wxGrid::CreateGrid( int numRows, int numCols,
                          wxGrid::wxGridSelectionModes selmode )
 {
@@ -4164,17 +4294,19 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 
         if (m_ownTable)
         {
-            wxGridTableBase *t=m_table;
-            m_table=0;
+            wxGridTableBase *t = m_table;
+            m_table = NULL;
             delete t;
         }
+
         delete m_selection;
 
-        m_table=0;
-        m_selection=0;
-        m_numRows=0;
-        m_numCols=0;
+        m_table = NULL;
+        m_selection = NULL;
+        m_numRows = 0;
+        m_numCols = 0;
     }
+
     if (table)
     {
         m_numRows = table->GetNumberRows();
@@ -4182,8 +4314,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 
         m_table = table;
         m_table->SetView( this );
-        if (takeOwnership)
-            m_ownTable = true;
+        m_ownTable = takeOwnership;
         m_selection = new wxGridSelection( this, selmode );
 
         CalcDimensions();
@@ -4194,7 +4325,6 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
     return m_created;
 }
 
-
 void wxGrid::Init()
 {
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
@@ -4206,10 +4336,10 @@ void wxGrid::Init()
     }
     else
     {
-        m_labelBackgroundColour = wxColour( _T("WHITE") );
+        m_labelBackgroundColour = *wxWHITE;
     }
 
-    m_labelTextColour = wxColour( _T("BLACK") );
+    m_labelTextColour = *wxBLACK;
 
     // init attr cache
     m_attrCache.row = -1;
@@ -4303,7 +4433,7 @@ void wxGrid::InitRowHeights()
 
     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 
-    for ( int i = 0;  i < m_numRows;  i++ )
+    for ( int i = 0; i < m_numRows; i++ )
     {
         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );
@@ -4321,7 +4451,7 @@ void wxGrid::InitColWidths()
 
     m_colWidths.Add( m_defaultColWidth, m_numCols );
 
-    for ( int i = 0;  i < m_numCols;  i++ )
+    for ( int i = 0; i < m_numCols; i++ )
     {
         colRight += m_defaultColWidth;
         m_colRights.Add( colRight );
@@ -4379,24 +4509,24 @@ void wxGrid::CalcDimensions()
     // take into account editor if shown
     if ( IsCellEditControlShown() )
     {
-      int w2, h2;
-      int r = m_currentCellCoords.GetRow();
-      int c = m_currentCellCoords.GetCol();
-      int x = GetColLeft(c);
-      int y = GetRowTop(r);
-
-      // how big is the editor
-      wxGridCellAttr* attr = GetCellAttr(r, c);
-      wxGridCellEditor* editor = attr->GetEditor(this, r, c);
-      editor->GetControl()->GetSize(&w2, &h2);
-      w2 += x;
-      h2 += y;
-      if ( w2 > w )
-          w = w2;
-      if ( h2 > h )
-          h = h2;
-      editor->DecRef();
-      attr->DecRef();
+        int w2, h2;
+        int r = m_currentCellCoords.GetRow();
+        int c = m_currentCellCoords.GetCol();
+        int x = GetColLeft(c);
+        int y = GetRowTop(r);
+
+        // how big is the editor
+        wxGridCellAttr* attr = GetCellAttr(r, c);
+        wxGridCellEditor* editor = attr->GetEditor(this, r, c);
+        editor->GetControl()->GetSize(&w2, &h2);
+        w2 += x;
+        h2 += y;
+        if ( w2 > w )
+            w = w2;
+        if ( h2 > h )
+            h = h2;
+        editor->DecRef();
+        attr->DecRef();
     }
 
     // preserve (more or less) the previous position
@@ -4419,13 +4549,12 @@ void wxGrid::CalcDimensions()
     CalcWindowSizes();
 }
 
-
 void wxGrid::CalcWindowSizes()
 {
     // escape if the window is has not been fully created yet
 
     if ( m_cornerLabelWin == NULL )
-        return ;
+        return;
 
     int cw, ch;
     GetClientSize( &cw, &ch );
@@ -4433,19 +4562,18 @@ void wxGrid::CalcWindowSizes()
     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
-    if (  m_colLabelWin && m_colLabelWin->IsShown() )
-        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+    if ( m_colLabelWin && m_colLabelWin->IsShown() )
+        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight );
 
     if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
-        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight );
 
     if ( m_gridWin && m_gridWin->IsShown() )
-        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight );
 }
 
-
-// this is called when the grid table sends a message to say that it
-// has been redimensioned
+// this is called when the grid table sends a message
+// to indicate that it has been redimensioned
 //
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
@@ -4455,12 +4583,14 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
     // Clear the attribute cache as the attribute might refer to a different
     // cell than stored in the cache after adding/removing rows/columns.
     ClearAttrCache();
+
     // By the same reasoning, the editor should be dismissed if columns are
     // added or removed. And for consistency, it should IMHO always be
     // removed, not only if the cell "underneath" it actually changes.
     // For now, I intentionally do not save the editor's content as the
     // cell it might want to save that stuff to might no longer exist.
     HideCellEditControl();
+
 #if 0
     // if we were using the default widths/heights so far, we must change them
     // now
@@ -4490,14 +4620,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Insert( 0, pos, numRows );
 
                 int bottom = 0;
-                if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+                if ( pos > 0 )
+                    bottom = m_rowBottoms[pos - 1];
 
-                for ( i = pos;  i < m_numRows;  i++ )
+                for ( i = pos; i < m_numRows; i++ )
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4533,14 +4665,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Add( 0, numRows );
 
                 int bottom = 0;
-                if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+                if ( oldNumRows > 0 )
+                    bottom = m_rowBottoms[oldNumRows - 1];
 
-                for ( i = oldNumRows;  i < m_numRows;  i++ )
+                for ( i = oldNumRows; i < m_numRows; i++ )
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4548,6 +4682,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 //
                 SetCurrentCell( 0, 0 );
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
@@ -4569,12 +4704,13 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.RemoveAt( pos, numRows );
 
                 int h = 0;
-                for ( i = 0;  i < m_numRows;  i++ )
+                for ( i = 0; i < m_numRows; i++ )
                 {
                     h += m_rowHeights[i];
                     m_rowBottoms[i] = h;
                 }
             }
+
             if ( !m_numRows )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
@@ -4591,6 +4727,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if (attrProvider)
             {
                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch column attributes, unless we
@@ -4602,6 +4739,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
 #endif
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
@@ -4623,14 +4761,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_colRights.Insert( 0, pos, numCols );
 
                 int right = 0;
-                if ( pos > 0 ) right = m_colRights[pos-1];
+                if ( pos > 0 )
+                    right = m_colRights[pos - 1];
 
-                for ( i = pos;  i < m_numCols;  i++ )
+                for ( i = pos; i < m_numCols; i++ )
                 {
                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4649,7 +4789,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 CalcDimensions();
                 m_colLabelWin->Refresh();
             }
-
         }
         result = true;
         break;
@@ -4665,14 +4804,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_colRights.Add( 0, numCols );
 
                 int right = 0;
-                if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+                if ( oldNumCols > 0 )
+                    right = m_colRights[oldNumCols - 1];
 
-                for ( i = oldNumCols;  i < m_numCols;  i++ )
+                for ( i = oldNumCols; i < m_numCols; i++ )
                 {
                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4701,12 +4842,13 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_colRights.RemoveAt( pos, numCols );
 
                 int w = 0;
-                for ( i = 0;  i < m_numCols;  i++ )
+                for ( i = 0; i < m_numCols; i++ )
                 {
                     w += m_colWidths[i];
                     m_colRights[i] = w;
                 }
             }
+
             if ( !m_numCols )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
@@ -4723,6 +4865,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if (attrProvider)
             {
                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch row attributes, unless we
@@ -4734,6 +4877,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
 #endif
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
@@ -4746,10 +4890,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
 
     if (result && !GetBatchCount() )
         m_gridWin->Refresh();
+
     return result;
 }
 
-
 wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
@@ -4770,7 +4914,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetTop() > ch ) r.SetTop( 0 );
+        if ( r.GetTop() > ch )
+            r.SetTop( 0 );
         r.SetBottom( wxMin( r.GetBottom(), ch ) );
 #endif
 
@@ -4783,7 +4928,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
         // find the row labels within these bounds
         //
         int row;
-        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top); row < m_numRows; row++ )
         {
             if ( GetRowBottom(row) < top )
                 continue;
@@ -4800,7 +4945,6 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
     return rowlabels;
 }
 
-
 wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
@@ -4821,7 +4965,8 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+        if ( r.GetLeft() > cw )
+            r.SetLeft( 0 );
         r.SetRight( wxMin( r.GetRight(), cw ) );
 #endif
 
@@ -4834,7 +4979,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
         // find the cells within these bounds
         //
         int col;
-        for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+        for ( col = internalXToCol(left); col < m_numCols; col++ )
         {
             if ( GetColRight(col) < left )
                 continue;
@@ -4847,10 +4992,10 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 
         ++iter;
     }
+
     return colLabels;
 }
 
-
 wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
@@ -4885,7 +5030,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
         // find the cells within these bounds
         //
         int row, col;
-        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top); row < m_numRows; row++ )
         {
             if ( GetRowBottom(row) <= top )
                 continue;
@@ -4893,7 +5038,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
             if ( GetRowTop(row) > bottom )
                 break;
 
-            for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+            for ( col = internalXToCol(left); col < m_numCols; col++ )
             {
                 if ( GetColRight(col) <= left )
                     continue;
@@ -4928,7 +5073,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
         if ( event.LeftIsDown() )
         {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
             {
                 case WXGRID_CURSOR_RESIZE_ROW:
                 {
@@ -4981,7 +5126,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
-        if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
+        if (m_rowLabelWin->HasCapture())
+            m_rowLabelWin->ReleaseMouse();
         m_isDragging = false;
     }
 
@@ -4992,7 +5138,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
     }
 
-
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
@@ -5004,10 +5149,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         if ( YToEdgeOfRow(y) < 0 )
         {
             row = YToRow(y);
-            if ( row >= 0  &&
+            if ( row >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )
                     ClearSelection();
                 if ( m_selection )
                 {
@@ -5038,13 +5183,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         else
         {
             // starting to drag-resize a row
-            //
             if ( CanDragRowSize() )
                 ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
         }
     }
 
-
     // ------------ Left double click
     //
     else if (event.LeftDClick() )
@@ -5065,11 +5208,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             AutoSizeRowLabelSize( row );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
-            m_dragLastPos  = -1;
+            m_dragLastPos = -1;
         }
     }
 
-
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
@@ -5088,7 +5230,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         m_dragLastPos = -1;
     }
 
-
     // ------------ Right button down
     //
     else if ( event.RightDown() )
@@ -5101,7 +5242,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ Right double click
     //
     else if ( event.RightDClick() )
@@ -5114,7 +5254,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
@@ -5136,7 +5275,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
-
 void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 {
     int x, y, col;
@@ -5153,7 +5291,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
         if ( event.LeftIsDown() )
         {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
             {
                 case WXGRID_CURSOR_RESIZE_COL:
                 {
@@ -5169,9 +5307,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {
-                        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+                        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
                     }
-                    dc.DrawLine( x, top, x, top+ch );
+                    dc.DrawLine( x, top, x, top + ch );
                     m_dragLastPos = x;
                 }
                 break;
@@ -5206,7 +5344,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
-        if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
+        if (m_colLabelWin->HasCapture())
+            m_colLabelWin->ReleaseMouse();
         m_isDragging = false;
     }
 
@@ -5217,7 +5356,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
     }
 
-
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
@@ -5229,10 +5367,10 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         if ( XToEdgeOfCol(x) < 0 )
         {
             col = XToCol(x);
-            if ( col >= 0  &&
+            if ( col >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )
                     ClearSelection();
                 if ( m_selection )
                 {
@@ -5268,7 +5406,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ Left double click
     //
     if ( event.LeftDClick() )
@@ -5289,11 +5426,10 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             AutoSizeColLabelSize( col );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
-            m_dragLastPos  = -1;
+            m_dragLastPos = -1;
         }
     }
 
-
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
@@ -5309,10 +5445,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
-        m_dragLastPos  = -1;
+        m_dragLastPos = -1;
     }
 
-
     // ------------ Right button down
     //
     else if ( event.RightDown() )
@@ -5325,7 +5460,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ Right double click
     //
     else if ( event.RightDClick() )
@@ -5338,7 +5472,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
@@ -5360,7 +5493,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
-
 void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
 {
     if ( event.LeftDown() )
@@ -5373,12 +5505,10 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             SelectAll();
         }
     }
-
     else if ( event.LeftDClick() )
     {
         SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
     }
-
     else if ( event.RightDown() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
@@ -5386,7 +5516,6 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             // no default action at the moment
         }
     }
-
     else if ( event.RightDClick() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
@@ -5416,7 +5545,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                                     : win ? _T("rowLabelWin")
                                           : _T("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);
-#endif // __WXDEBUG__
+#endif
 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&
@@ -5431,7 +5560,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
 
     if ( m_winCapture )
     {
-        if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+        if (m_winCapture->HasCapture())
+            m_winCapture->ReleaseMouse();
         m_winCapture = (wxWindow *)NULL;
     }
 
@@ -5449,6 +5579,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
 
         default:
             win->SetCursor( *wxSTANDARD_CURSOR );
+            break;
     }
 
     // we need to capture mouse when resizing
@@ -5484,7 +5615,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     {
         //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
 
-        // Don't start doing anything until the mouse has been drug at
+        // Don't start doing anything until the mouse has been dragged at
         // least 3 pixels in any direction...
         if (! m_isDragging)
         {
@@ -5517,11 +5648,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             if ( coords != wxGridNoCellCoords )
             {
-                if ( event.ControlDown() )
+                if ( event.CmdDown() )
                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;
-                    HighlightBlock ( m_selectingKeyboard, coords );
+                    HighlightBlock( m_selectingKeyboard, coords );
                 }
                 else if ( CanDragCell() )
                 {
@@ -5587,9 +5718,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {
-                dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+                dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
             }
-            dc.DrawLine( x, top, x, top+ch );
+            dc.DrawLine( x, top, x, top + ch );
             m_dragLastPos = x;
         }
 
@@ -5620,7 +5751,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                        coords.GetCol(),
                        event ) )
         {
-            if ( !event.ControlDown() )
+            if ( !event.CmdDown() )
                 ClearSelection();
             if ( event.ShiftDown() )
             {
@@ -5636,13 +5767,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                                               event.MetaDown() );
                 }
             }
-            else if ( XToEdgeOfCol(x) < 0  &&
+            else if ( XToEdgeOfCol(x) < 0 &&
                       YToEdgeOfRow(y) < 0 )
             {
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 
-                if ( event.ControlDown() )
+                if ( event.CmdDown() )
                 {
                     if ( m_selection )
                     {
@@ -5674,14 +5805,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ Left double click
     //
     else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
     {
         DisableCellEditControl();
 
-        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
+        if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
         {
             if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
                              coords.GetRow(),
@@ -5693,10 +5823,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 m_waitForSlowClick = true;
             }
         }
-
     }
 
-
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
@@ -5705,16 +5833,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         {
             if (m_winCapture)
             {
-                if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                if (m_winCapture->HasCapture())
+                    m_winCapture->ReleaseMouse();
                 m_winCapture = NULL;
             }
 
-            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
             {
                 ClearSelection();
                 EnableCellEditControl();
 
-                wxGridCellAttr* attr = GetCellAttr(coords);
+                wxGridCellAttr *attr = GetCellAttr(coords);
                 wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
                 editor->StartingClick();
                 editor->DecRef();
@@ -5769,7 +5898,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         m_dragLastPos = -1;
     }
 
-
     // ------------ Right button down
     //
     else if ( event.RightDown() && coords != wxGridNoCellCoords )
@@ -5784,7 +5912,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         }
     }
 
-
     // ------------ Right double click
     //
     else if ( event.RightDClick() && coords != wxGridNoCellCoords )
@@ -5816,7 +5943,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         // Dragging on the corner of a cell to resize in both
         // directions is not implemented yet...
         //
-        if ( dragRow >= 0  &&  dragCol >= 0 )
+        if ( dragRow >= 0 && dragCol >= 0 )
         {
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
             return;
@@ -5831,16 +5958,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 if ( CanDragRowSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
             }
-
-            if ( dragCol >= 0 )
-            {
-                m_dragRowOrCol = dragCol;
-            }
-
-            return;
         }
-
-        if ( dragCol >= 0 )
+        else if ( dragCol >= 0 )
         {
             m_dragRowOrCol = dragCol;
 
@@ -5849,20 +5968,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 if ( CanDragColSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
             }
-
-            return;
         }
-
-        // Neither on a row or col edge
-        //
-        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        else // Neither on a row or col edge
         {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+            {
+                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            }
         }
     }
 }
 
-
 void wxGrid::DoEndDragResizeRow()
 {
     if ( m_dragLastPos >= 0 )
@@ -5876,7 +5992,7 @@ void wxGrid::DoEndDragResizeRow()
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );
         dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+        dc.DrawLine( left, m_dragLastPos, left + cw, m_dragLastPos );
         HideCellEditControl();
         SaveEditControlValue();
 
@@ -5894,12 +6010,13 @@ void wxGrid::DoEndDragResizeRow()
             rect.height = ch - rect.y;
             m_rowLabelWin->Refresh( true, &rect );
             rect.width = cw;
+
             // if there is a multicell block, paint all of it
             if (m_table)
             {
                 int i, cell_rows, cell_cols, subtract_rows = 0;
                 int leftCol = XToCol(left);
-                int rightCol = internalXToCol(left+cw);
+                int rightCol = internalXToCol(left + cw);
                 if (leftCol >= 0)
                 {
                     for (i=leftCol; i<rightCol; i++)
@@ -5934,7 +6051,7 @@ void wxGrid::DoEndDragResizeCol()
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );
         dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
         HideCellEditControl();
         SaveEditControlValue();
 
@@ -5953,12 +6070,13 @@ void wxGrid::DoEndDragResizeCol()
             rect.height = m_colLabelHeight;
             m_colLabelWin->Refresh( true, &rect );
             rect.height = ch;
+
             // if there is a multicell block, paint all of it
             if (m_table)
             {
                 int i, cell_rows, cell_cols, subtract_cols = 0;
                 int topRow = YToRow(top);
-                int bottomRow = internalYToRow(top+cw);
+                int bottomRow = internalYToRow(top + cw);
                 if (topRow >= 0)
                 {
                     for (i=topRow; i<bottomRow; i++)
@@ -5967,11 +6085,13 @@ void wxGrid::DoEndDragResizeCol()
                         if (cell_cols < subtract_cols)
                             subtract_cols = cell_cols;
                     }
+
                     rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
                     CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
                     rect.width = cw - rect.x;
                 }
             }
+
             m_gridWin->Refresh( false, &rect );
         }
 
@@ -5979,8 +6099,6 @@ void wxGrid::DoEndDragResizeCol()
     }
 }
 
-
-
 //
 // ------ interaction with data model
 //
@@ -6007,10 +6125,8 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
     }
 }
 
-
-
 // The behaviour of this function depends on the grid table class
-// Clear() function.  For the default wxGridStringTable class the
+// Clear() function. For the default wxGridStringTable class the
 // behavious is to replace all cell contents with wxEmptyString but
 // not to change the number of rows or cols.
 //
@@ -6022,11 +6138,11 @@ void wxGrid::ClearGrid()
             DisableCellEditControl();
 
         m_table->Clear();
-        if ( !GetBatchCount() ) m_gridWin->Refresh();
+        if (!GetBatchCount())
+            m_gridWin->Refresh();
     }
 }
 
-
 bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6048,10 +6164,10 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
 bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6066,13 +6182,14 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
     {
         bool done = m_table && m_table->AppendRows( numRows );
         return done;
+
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
 bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6093,10 +6210,10 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
 bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6117,10 +6234,10 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
 bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6138,10 +6255,10 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
 bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
@@ -6162,11 +6279,10 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message
     }
+
     return false;
 }
 
-
-
 //
 // ----- event handlers
 //
@@ -6178,8 +6294,7 @@ int wxGrid::SendEvent( const wxEventType type,
                         int row, int col,
                         wxMouseEvent& mouseEv )
 {
-   bool claimed;
-   bool vetoed;
+   bool claimed, vetoed;
 
    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
    {
@@ -6240,34 +6355,26 @@ int wxGrid::SendEvent( const wxEventType type,
    return claimed ? 1 : 0;
 }
 
-
 // Generate a grid event of specified type and return the result
 // of ProcessEvent().
 //
 int wxGrid::SendEvent( const wxEventType type,
                         int row, int col )
 {
-   bool claimed;
-   bool vetoed;
+   bool claimed, vetoed;
 
     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
         int rowOrCol = (row == -1 ? col : row);
 
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol );
+        wxGridSizeEvent gridEvt( GetId(), type, this, rowOrCol );
 
         claimed = GetEventHandler()->ProcessEvent(gridEvt);
         vetoed  = !gridEvt.IsAllowed();
     }
     else
     {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col );
+        wxGridEvent gridEvt( GetId(), type, this, row, col );
 
         claimed = GetEventHandler()->ProcessEvent(gridEvt);
         vetoed  = !gridEvt.IsAllowed();
@@ -6282,7 +6389,8 @@ int wxGrid::SendEvent( const wxEventType type,
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
-    wxPaintDC dc(this);  // needed to prevent zillions of paint events on MSW
+    // needed to prevent zillions of paint events on MSW
+    wxPaintDC dc(this);
 }
 
 void wxGrid::Refresh(bool eraseb, const wxRect* rect)
@@ -6300,7 +6408,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
             int width_label, width_cell, height_label, height_cell;
             int x, y;
 
-            //Copy rectangle can get scroll offsets..
+            // Copy rectangle can get scroll offsets..
             rect_x = rect->GetX();
             rect_y = rect->GetY();
             rectWidth = rect->GetWidth();
@@ -6311,7 +6419,8 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
                 width_label = rectWidth;
 
             height_label = m_colLabelHeight - rect_y;
-            if (height_label > rectHeight) height_label = rectHeight;
+            if (height_label > rectHeight)
+                height_label = rectHeight;
 
             if (rect_x > m_rowLabelWidth)
             {
@@ -6383,7 +6492,6 @@ void wxGrid::OnSize( wxSizeEvent& event )
     event.Skip();
 }
 
-
 void wxGrid::OnKeyDown( wxKeyEvent& event )
 {
     if ( m_inOnKeyDown )
@@ -6396,60 +6504,41 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
     m_inOnKeyDown = true;
 
     // propagate the event up and see if it gets processed
-    //
     wxWindow *parent = GetParent();
     wxKeyEvent keyEvt( event );
     keyEvt.SetEventObject( parent );
 
     if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
     {
-
         // try local handlers
-        //
         switch ( event.GetKeyCode() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )
-                {
                     MoveCursorUpBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorUp( event.ShiftDown() );
-                }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
-                {
                     MoveCursorDownBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorDown( event.ShiftDown() );
-                }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
-                {
                     MoveCursorLeftBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorLeft( event.ShiftDown() );
-                }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
-                {
                     MoveCursorRightBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorRight( event.ShiftDown() );
-                }
                 break;
 
             case WXK_RETURN:
@@ -6491,7 +6580,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 else
                 {
-                    if ( GetGridCursorCol() < GetNumberCols()-1 )
+                    if ( GetGridCursorCol() < GetNumberCols() - 1 )
                     {
                         MoveCursorRight( false );
                     }
@@ -6518,8 +6607,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
             case WXK_END:
                 if ( event.ControlDown() )
                 {
-                    MakeCellVisible( m_numRows-1, m_numCols-1 );
-                    SetCurrentCell( m_numRows-1, m_numCols-1 );
+                    MakeCellVisible( m_numRows - 1, m_numCols - 1 );
+                    SetCurrentCell( m_numRows - 1, m_numCols - 1 );
                 }
                 else
                 {
@@ -6527,11 +6616,11 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 break;
 
-            case WXK_PRIOR:
+            case WXK_PAGEUP:
                 MovePageUp();
                 break;
 
-            case WXK_NEXT:
+            case WXK_PAGEDOWN:
                 MovePageDown();
                 break;
 
@@ -6540,21 +6629,22 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( m_selection )
                     {
-                        m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
-                                                          m_currentCellCoords.GetCol(),
-                                                          event.ControlDown(),
-                                                          event.ShiftDown(),
-                                                          event.AltDown(),
-                                                          event.MetaDown() );
+                        m_selection->ToggleCellSelection(
+                            m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol(),
+                            event.ControlDown(),
+                            event.ShiftDown(),
+                            event.AltDown(),
+                            event.MetaDown() );
                     }
                     break;
                 }
+
                 if ( !IsEditable() )
-                {
                     MoveCursorRight( false );
-                    break;
-                }
-                // Otherwise fall through to default
+                else
+                    event.Skip();
+                break;
 
             default:
                 event.Skip();
@@ -6576,14 +6666,15 @@ void wxGrid::OnKeyUp( wxKeyEvent& event )
         {
             if ( m_selection )
             {
-                m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
-                                          m_selectingTopLeft.GetCol(),
-                                          m_selectingBottomRight.GetRow(),
-                                          m_selectingBottomRight.GetCol(),
-                                          event.ControlDown(),
-                                          true,
-                                          event.AltDown(),
-                                          event.MetaDown() );
+                m_selection->SelectBlock(
+                    m_selectingTopLeft.GetRow(),
+                    m_selectingTopLeft.GetCol(),
+                    m_selectingBottomRight.GetRow(),
+                    m_selectingBottomRight.GetCol(),
+                    event.ControlDown(),
+                    true,
+                    event.AltDown(),
+                    event.MetaDown() );
             }
         }
 
@@ -6601,7 +6692,7 @@ void wxGrid::OnChar( wxKeyEvent& event )
         // yes, now check whether the cells editor accepts the key
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
-        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellAttr *attr = GetCellAttr(row, col);
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
 
         // <F2> is special and will always start editing, for
@@ -6634,7 +6725,6 @@ void wxGrid::OnChar( wxKeyEvent& event )
     }
 }
 
-
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
@@ -6647,8 +6737,8 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
-    wxClientDC dc(m_gridWin);
-    PrepareDC(dc);
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {
@@ -6657,7 +6747,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         if ( IsVisible( m_currentCellCoords, false ) )
         {
             wxRect r;
-            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );
             if ( !m_gridLinesEnabled )
             {
                 r.x--;
@@ -6671,19 +6761,18 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
-            DrawGridCellArea(dc,cells);
+            DrawGridCellArea( dc, cells );
             DrawAllGridLines( dc, r );
         }
     }
 
     m_currentCellCoords = coords;
 
-    wxGridCellAttr* attr = GetCellAttr(coords);
-    DrawCellHighlight(dc, attr);
+    wxGridCellAttr *attr = GetCellAttr( coords );
+    DrawCellHighlight( dc, attr );
     attr->DecRef();
 }
 
-
 void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 {
     int temp;
@@ -6729,6 +6818,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
                                   wxGridCellCoords ( bottomRow, rightCol ) );
         m_gridWin->Refresh( false, &rect );
     }
+
     // Now handle changing an existing selection area.
     else if ( m_selectingTopLeft != updateTopLeft ||
               m_selectingBottomRight != updateBottomRight )
@@ -6745,9 +6835,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         int     i;
 
         // Store intermediate values
-        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
-        wxCoord oldTop    = m_selectingTopLeft.GetRow();
-        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldLeft = m_selectingTopLeft.GetCol();
+        wxCoord oldTop = m_selectingTopLeft.GetRow();
+        wxCoord oldRight = m_selectingBottomRight.GetCol();
         wxCoord oldBottom = m_selectingBottomRight.GetRow();
 
         // Determine the outer/inner coordinates.
@@ -6785,21 +6875,19 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
             // Refresh the newly selected or deselected
             // area to the left of the old or new selection.
             need_refresh[0] = true;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
+            rect[0] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop,  oldLeft ),
+                wxGridCellCoords( oldBottom, leftCol - 1 ) );
         }
 
-        if ( oldTop  < topRow )
+        if ( oldTop < topRow )
         {
             // Refresh the newly selected or deselected
             // area above the old or new selection.
             need_refresh[1] = true;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
+            rect[1] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop, leftCol ),
+                wxGridCellCoords( topRow - 1, rightCol ) );
         }
 
         if ( oldRight > rightCol )
@@ -6807,10 +6895,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
             // Refresh the newly selected or deselected
             // area to the right of the old or new selection.
             need_refresh[2] = true;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
+            rect[2] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop, rightCol + 1 ),
+                wxGridCellCoords( oldBottom, oldRight ) );
         }
 
         if ( oldBottom > bottomRow )
@@ -6818,10 +6905,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
             // Refresh the newly selected or deselected
             // area below the old or new selection.
             need_refresh[3] = true;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
+            rect[3] = BlockToDeviceRect(
+                wxGridCellCoords( bottomRow + 1, leftCol ),
+                wxGridCellCoords( oldBottom, rightCol ) );
         }
 
         // various Refresh() calls
@@ -6829,7 +6915,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
                 m_gridWin->Refresh( false, &(rect[i]) );
     }
-    // Change Selection
+
+    // change selection
     m_selectingTopLeft = updateTopLeft;
     m_selectingBottomRight = updateBottomRight;
 }
@@ -6854,7 +6941,6 @@ bool wxGrid::GetModelValues()
     return false;
 }
 
-
 bool wxGrid::SetModelValues()
 {
     int row, col;
@@ -6866,9 +6952,9 @@ bool wxGrid::SetModelValues()
 
     if ( m_table )
     {
-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = 0; row < m_numRows; row++ )
         {
-            for ( col = 0;  col < m_numCols;  col++ )
+            for ( col = 0; col < m_numCols; col++ )
             {
                 m_table->SetValue( row, col, GetCellValue(row, col) );
             }
@@ -6880,8 +6966,6 @@ bool wxGrid::SetModelValues()
     return false;
 }
 
-
-
 // Note - this function only draws cells that are in the list of
 // exposed cells (usually set from the update region by
 // CalcExposedCells)
@@ -6895,7 +6979,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
     int row, col, cell_rows, cell_cols;
     wxGridCellCoordsArray redrawCells;
 
-    for ( i = numCells-1; i >= 0;  i-- )
+    for ( i = numCells - 1; i >= 0; i-- )
     {
         row = cells[i].GetRow();
         col = cells[i].GetCol();
@@ -6904,9 +6988,9 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         // If this cell is part of a multicell block, find owner for repaint
         if ( cell_rows <= 0 || cell_cols <= 0 )
         {
-            wxGridCellCoords cell(row+cell_rows, col+cell_cols);
+            wxGridCellCoords cell( row + cell_rows, col + cell_cols );
             bool marked = false;
-            for ( int j = 0;  j < numCells;  j++ )
+            for ( int j = 0; j < numCells; j++ )
             {
                 if ( cell == cells[j] )
                 {
@@ -6914,6 +6998,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                     break;
                 }
             }
+
             if (!marked)
             {
                 int count = redrawCells.GetCount();
@@ -6925,10 +7010,13 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                         break;
                     }
                 }
+
                 if (!marked)
                     redrawCells.Add( cell );
             }
-            continue; // don't bother drawing this cell
+
+            // don't bother drawing this cell
+            continue;
         }
 
         // If this cell is empty, find cell to left that might want to overflow
@@ -6936,23 +7024,25 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         {
             for ( int l = 0; l < cell_rows; l++ )
             {
-                // find a cell in this row to left alreay marked for repaint
+                // find a cell in this row to leave already marked for repaint
                 int left = col;
                 for (int k = 0; k < int(redrawCells.GetCount()); k++)
                     if ((redrawCells[k].GetCol() < left) &&
                         (redrawCells[k].GetRow() == row))
+                    {
                         left = redrawCells[k].GetCol();
+                    }
 
                 if (left == col)
                     left = 0; // oh well
 
-                for (int j = col-1; j >= left; j--)
+                for (int j = col - 1; j >= left; j--)
                 {
-                    if (!m_table->IsEmptyCell(row+l, j))
+                    if (!m_table->IsEmptyCell(row + l, j))
                     {
-                        if (GetCellOverflow(row+l, j))
+                        if (GetCellOverflow(row + l, j))
                         {
-                            wxGridCellCoords cell(row+l, j);
+                            wxGridCellCoords cell(row + l, j);
                             bool marked = false;
 
                             for (int k = 0; k < numCells; k++)
@@ -6990,13 +7080,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
 
     numCells = redrawCells.GetCount();
 
-    for ( i = numCells - 1; i >= 0;  i-- )
+    for ( i = numCells - 1; i >= 0; i-- )
     {
         DrawCell( dc, redrawCells[i] );
     }
 }
 
-
 void wxGrid::DrawGridSpace( wxDC& dc )
 {
   int cw, ch;
@@ -7006,7 +7095,7 @@ void wxGrid::DrawGridSpace( wxDC& dc )
   CalcUnscrolledPosition( cw, ch, &right, &bottom );
 
   int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
-  int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
+  int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;
 
   if ( right > rightCol || bottom > bottomRow )
   {
@@ -7018,17 +7107,16 @@ void wxGrid::DrawGridSpace( wxDC& dc )
 
       if ( right > rightCol )
       {
-          dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch );
       }
 
       if ( bottom > bottomRow )
       {
-          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow );
       }
   }
 }
 
-
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
@@ -7053,14 +7141,19 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
     // Note: However, only if it is really _shown_, i.e. not hidden!
     if ( isCurrent && IsCellEditControlShown() )
     {
+        // NB: this "#if..." is temporary and fixes a problem where the
+        // edit control is erased by this code after being rendered.
+        // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
+        // implicitly, causing this out-of order render.
+#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();
+#endif
     }
     else
     {
-        // but all the rest is drawn by the cell renderer and hence may be
-        // customized
+        // but all the rest is drawn by the cell renderer and hence may be customized
         wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
         renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
         renderer->DecRef();
@@ -7087,17 +7180,16 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 
     if (penWidth > 0)
     {
-        // The center of th drawn line is where the position/width/height of
-        // the rectangle is actually at, (on wxMSW atr least,) so we will
-        // reduce the size of the rectangle to compensate for the thickness of
-        // the line.  If this is too strange on non wxMSW platforms then
+        // The center of the drawn line is where the position/width/height of
+        // the rectangle is actually at (on wxMSW at least), so the
+        // size of the rectangle is reduced to compensate for the thickness of
+        // the line. If this is too strange on non-wxMSW platforms then
         // please #ifdef this appropriately.
         rect.x += penWidth / 2;
         rect.y += penWidth / 2;
         rect.width -= penWidth - 1;
         rect.height -= penWidth - 1;
 
-
         // Now draw the rectangle
         // use the cellHighlightColour if the cell is inside a selection, this
         // will ensure the cell is always visible.
@@ -7107,7 +7199,7 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
     }
 
 #if 0
-        // VZ: my experiments with 3d borders...
+        // VZ: my experiments with 3D borders...
 
         // how to properly set colours for arbitrary bg?
         wxCoord x1 = rect.x,
@@ -7120,15 +7212,14 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
         dc.DrawLine(x1, y1, x1, y2);
 
         dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
-        dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
+        dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2);
 
         dc.SetPen(*wxBLACK_PEN);
         dc.DrawLine(x1, y2, x2, y2);
-        dc.DrawLine(x2, y1, x2, y2+1);
-#endif // 0
+        dc.DrawLine(x2, y1, x2, y2 + 1);
+#endif
 }
 
-
 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
@@ -7141,22 +7232,20 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
     wxRect rect = CellToRect( row, col );
 
     // right hand border
-    //
     dc.DrawLine( rect.x + rect.width, rect.y,
                  rect.x + rect.width, rect.y + rect.height + 1 );
 
     // bottom border
-    //
-    dc.DrawLine( rect.x,              rect.y + rect.height,
+    dc.DrawLine( rect.x, rect.y + rect.height,
                  rect.x + rect.width, rect.y + rect.height);
 }
 
-void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)
+void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells)
 {
     // This if block was previously in wxGrid::OnPaint but that doesn't
     // seem to get called under wxGTK - MB
     //
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
+    if ( m_currentCellCoords == wxGridNoCellCoords &&
          m_numRows && m_numCols )
     {
         m_currentCellCoords.Set(0, 0);
@@ -7194,9 +7283,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     return;
 #endif
 
-    if ( !m_gridLinesEnabled ||
-         !m_numRows ||
-         !m_numCols )
+    if ( !m_gridLinesEnabled || !m_numRows || !m_numCols )
          return;
 
     int top, bottom, left, right;
@@ -7232,9 +7319,9 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out
-    int leftCol   = internalXToCol(left);
-    int topRow    = internalYToRow(top);
-    int rightCol  = internalXToCol(right);
+    int leftCol = internalXToCol(left);
+    int topRow = internalYToRow(top);
+    int rightCol = internalXToCol(right);
     int bottomRow = internalYToRow(bottom);
 
 #ifndef __WXMAC__
@@ -7257,14 +7344,14 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             }
             else if ((cell_rows < 0) || (cell_cols < 0))
             {
-                rect = CellToRect(j+cell_rows, i+cell_cols);
+                rect = CellToRect(j + cell_rows, i + cell_cols);
                 CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
                 clippedcells.Subtract(rect);
             }
         }
     }
 #else
-    wxRegion clippedcells( left , top, right - left, bottom - top);
+    wxRegion clippedcells( left, top, right - left, bottom - top );
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
@@ -7276,17 +7363,18 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))
             {
-                rect = CellToRect(j,i);
+                rect = CellToRect(j, i);
                 clippedcells.Subtract(rect);
             }
             else if ((cell_rows < 0) || (cell_cols < 0))
             {
-                rect = CellToRect(j+cell_rows, i+cell_cols);
+                rect = CellToRect(j + cell_rows, i + cell_cols);
                 clippedcells.Subtract(rect);
             }
         }
     }
 #endif
+
     dc.SetClippingRegion( clippedcells );
 
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
@@ -7324,10 +7412,11 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
+
     dc.DestroyClippingRegion();
 }
 
-void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
+void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
 {
     if ( !m_numRows )
         return;
@@ -7335,7 +7424,7 @@ void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
     size_t i;
     size_t numLabels = rows.GetCount();
 
-    for ( i = 0;  i < numLabels;  i++ )
+    for ( i = 0; i < numLabels; i++ )
     {
         DrawRowLabel( dc, rows[i] );
     }
@@ -7347,6 +7436,7 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
         return;
 
     wxRect rect;
+
 #ifdef __WXGTK20__
     rect.SetX( 1 );
     rect.SetY( GetRowTop(row) + 1 );
@@ -7362,18 +7452,16 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( m_rowLabelWidth-1, rowTop,
-                 m_rowLabelWidth-1, rowBottom );
-
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW), 1, wxSOLID) );
+    dc.DrawLine( m_rowLabelWidth - 1, rowTop, m_rowLabelWidth - 1, rowBottom );
     dc.DrawLine( 0, rowTop, 0, rowBottom );
-
     dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
 
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( 1, rowTop, 1, rowBottom );
-    dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
+    dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );
 #endif
+
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
@@ -7396,7 +7484,7 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
     size_t i;
     size_t numLabels = cols.GetCount();
 
-    for ( i = 0;  i < numLabels;  i++ )
+    for ( i = 0; i < numLabels; i++ )
     {
         DrawColLabel( dc, cols[i] );
     }
@@ -7410,6 +7498,7 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     int colLeft = GetColLeft(col);
 
     wxRect rect;
+
 #ifdef __WXGTK20__
     rect.SetX( colLeft + 1 );
     rect.SetY( 1 );
@@ -7422,19 +7511,17 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
 #else
     int colRight = GetColRight(col) - 1;
 
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( colRight, 0,
-                 colRight, m_colLabelHeight-1 );
-
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW), 1, wxSOLID) );
+    dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
     dc.DrawLine( colLeft, 0, colRight, 0 );
-
-    dc.DrawLine( colLeft, m_colLabelHeight-1,
-                 colRight+1, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, m_colLabelHeight - 1,
+                 colRight + 1, m_colLabelHeight - 1 );
 
     dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
     dc.DrawLine( colLeft, 1, colRight, 1 );
 #endif
+
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
@@ -7461,42 +7548,41 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
     StringToLines( value, lines );
 
-    //Forward to new API.
-    DrawTextRectangle(  dc,
+    // Forward to new API.
+    DrawTextRectangle( dc,
         lines,
         rect,
         horizAlign,
         vertAlign,
         textOrientation );
-
 }
 
-void wxGrid::DrawTextRectangle( wxDC& dc,
+// VZ: this should be replaced with wxDC::DrawLabel() to which we just have to
+//     add textOrientation support
+void wxGrid::DrawTextRectangle(wxDC& dc,
                                const wxArrayString& lines,
                                const wxRect& rect,
                                int horizAlign,
                                int vertAlign,
-                               int textOrientation )
+                               int textOrientation)
 {
-    long textWidth, textHeight;
-    long lineWidth, lineHeight;
-    int nLines;
+    if ( lines.empty() )
+        return;
 
-    dc.SetClippingRegion( rect );
+    wxDCClipper clip(dc, rect);
 
-    nLines = lines.GetCount();
-    if ( nLines > 0 )
-    {
-        int l;
-        float x = 0.0, y = 0.0;
+    long textWidth,
+         textHeight;
 
-        if ( textOrientation == wxHORIZONTAL )
-            GetTextBoxSize(dc, lines, &textWidth, &textHeight);
-        else
-            GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+    if ( textOrientation == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+    else
+        GetTextBoxSize( dc, lines, &textHeight, &textWidth );
 
-        switch( vertAlign )
-        {
+    int x = 0,
+        y = 0;
+    switch ( vertAlign )
+    {
         case wxALIGN_BOTTOM:
             if ( textOrientation == wxHORIZONTAL )
                 y = rect.y + (rect.height - textHeight - 1);
@@ -7506,9 +7592,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
         case wxALIGN_CENTRE:
             if ( textOrientation == wxHORIZONTAL )
-                y = rect.y + ((rect.height - textHeight)/2);
+                y = rect.y + ((rect.height - textHeight) / 2);
             else
-                x = rect.x + ((rect.width - textWidth)/2);
+                x = rect.x + ((rect.width - textWidth) / 2);
             break;
 
         case wxALIGN_TOP:
@@ -7518,15 +7604,26 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
             else
                 x = rect.x + 1;
             break;
-        }
+    }
+
+    // Align each line of a multi-line label
+    size_t nLines = lines.GetCount();
+    for ( size_t l = 0; l < nLines; l++ )
+    {
+        const wxString& line = lines[l];
 
-        // Align each line of a multi-line label
-        for ( l = 0; l < nLines; l++ )
+        if ( line.empty() )
         {
-            dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+            *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+            continue;
+        }
 
-            switch( horizAlign )
-            {
+        long lineWidth,
+             lineHeight;
+        dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+        switch ( horizAlign )
+        {
             case wxALIGN_RIGHT:
                 if ( textOrientation == wxHORIZONTAL )
                     x = rect.x + (rect.width - lineWidth - 1);
@@ -7536,9 +7633,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
             case wxALIGN_CENTRE:
                 if ( textOrientation == wxHORIZONTAL )
-                    x = rect.x + ((rect.width - lineWidth)/2);
+                    x = rect.x + ((rect.width - lineWidth) / 2);
                 else
-                    y = rect.y + rect.height - ((rect.height - lineWidth)/2);
+                    y = rect.y + rect.height - ((rect.height - lineWidth) / 2);
                 break;
 
             case wxALIGN_LEFT:
@@ -7548,27 +7645,23 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
                 else
                     y = rect.y + rect.height - 1;
                 break;
-            }
+        }
 
-            if ( textOrientation == wxHORIZONTAL )
-            {
-                dc.DrawText( lines[l], (int)x, (int)y );
-                y += lineHeight;
-            }
-            else
-            {
-                dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
-                x += lineHeight;
-            }
+        if ( textOrientation == wxHORIZONTAL )
+        {
+            dc.DrawText( line, x, y );
+            y += lineHeight;
+        }
+        else
+        {
+            dc.DrawRotatedText( line, x, y, 90.0 );
+            x += lineHeight;
         }
     }
-
-    dc.DestroyClippingRegion();
 }
 
-
-// Split multi line text up into an array of strings.  Any existing
-// contents of the string array are preserved.
+// Split multi-line text up into an array of strings.
+// Any existing contents of the string array are preserved.
 //
 void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
 {
@@ -7577,7 +7670,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
     wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
     wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
 
-    while ( startPos < (int)tVal.Length() )
+    while ( startPos < (int)tVal.length() )
     {
         pos = tVal.Mid(startPos).Find( eol );
         if ( pos < 0 )
@@ -7592,26 +7685,26 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
         {
             lines.Add( value.Mid(startPos, pos) );
         }
+
         startPos += pos + 1;
     }
 
-    if ( startPos < (int)value.Length() )
+    if ( startPos < (int)value.length() )
     {
         lines.Add( value.Mid( startPos ) );
     }
 }
 
-
 void wxGrid::GetTextBoxSize( const wxDC& dc,
                              const wxArrayString& lines,
                              long *width, long *height )
 {
     long w = 0;
     long h = 0;
-    long lineW, lineH;
+    long lineW = 0, lineH = 0;
 
     size_t i;
-    for ( i = 0;  i < lines.GetCount();  i++ )
+    for ( i = 0; i < lines.GetCount(); i++ )
     {
         dc.GetTextExtent( lines[i], &lineW, &lineH );
         w = wxMax( w, lineW );
@@ -7662,7 +7755,6 @@ bool wxGrid::Enable(bool enable)
     return true;
 }
 
-
 //
 // ------ Edit control functions
 //
@@ -7684,9 +7776,6 @@ void wxGrid::EnableCellEditControl( bool enable )
     if (! m_editable)
         return;
 
-    if ( m_currentCellCoords == wxGridNoCellCoords )
-        SetCurrentCell( 0, 0 );
-
     if ( enable != m_cellEditCtrlEnabled )
     {
         if ( enable )
@@ -7695,8 +7784,7 @@ void wxGrid::EnableCellEditControl( bool enable )
                 return;
 
             // this should be checked by the caller!
-            wxASSERT_MSG( CanEnableCellControl(),
-                          _T("can't enable editing for this cell!") );
+            wxASSERT_MSG( CanEnableCellControl(), _T("can't enable editing for this cell!") );
 
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
@@ -7706,7 +7794,7 @@ void wxGrid::EnableCellEditControl( bool enable )
         else
         {
             //FIXME:add veto support
-            SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
+            SendEvent( wxEVT_GRID_EDITOR_HIDDEN );
 
             HideCellEditControl();
             SaveEditControlValue();
@@ -7731,7 +7819,6 @@ bool wxGrid::CanEnableCellControl() const
 {
     return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
         !IsCurrentCellReadOnly();
-
 }
 
 bool wxGrid::IsCellEditControlEnabled() const
@@ -7771,7 +7858,7 @@ void wxGrid::ShowCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
-        if ( !IsVisible( m_currentCellCoords ) )
+        if ( !IsVisible( m_currentCellCoords, false ) )
         {
             m_cellEditCtrlEnabled = false;
             return;
@@ -7794,10 +7881,13 @@ void wxGrid::ShowCellEditControl()
             }
 
             // convert to scrolled coords
-            //
             CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
-            // done in PaintBackground()
+            int nXMove = 0;
+            if (rect.x < 0)
+                nXMove = rect.x;
+
+            // performed in PaintBackground()
 #if 0
             // erase the highlight and the cell contents because the editor
             // might not cover the entire cell
@@ -7806,7 +7896,7 @@ void wxGrid::ShowCellEditControl()
             dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
             dc.SetPen(*wxTRANSPARENT_PEN);
             dc.DrawRectangle(rect);
-#endif // 0
+#endif
 
             // cell is shifted by one pixel
             // However, don't allow x or y to become negative
@@ -7833,44 +7923,50 @@ void wxGrid::ShowCellEditControl()
                 GetEventHandler()->ProcessEvent(evt);
             }
 
-
             // resize editor to overflow into righthand cells if allowed
             int maxWidth = rect.width;
             wxString value = GetCellValue(row, col);
             if ( (value != wxEmptyString) && (attr->GetOverflow()) )
             {
                 int y;
-                GetTextExtent(value, &maxWidth, &y,
-                        NULL, NULL, &attr->GetFont());
-                if (maxWidth < rect.width) maxWidth = rect.width;
+                GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont());
+                if (maxWidth < rect.width)
+                    maxWidth = rect.width;
             }
 
             int client_right = m_gridWin->GetClientSize().GetWidth();
-            if (rect.x+maxWidth > client_right)
+            if (rect.x + maxWidth > client_right)
                 maxWidth = client_right - rect.x;
 
             if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
             {
                 GetCellSize( row, col, &cell_rows, &cell_cols );
                 // may have changed earlier
-                for (int i = col+cell_cols; i < m_numCols; i++)
+                for (int i = col + cell_cols; i < m_numCols; i++)
                 {
                     int c_rows, c_cols;
                     GetCellSize( row, i, &c_rows, &c_cols );
+
                     // looks weird going over a multicell
-                    if (m_table->IsEmptyCell(row,i) &&
+                    if (m_table->IsEmptyCell( row, i ) &&
                             (rect.width < maxWidth) && (c_rows == 1))
-                        rect.width += GetColWidth(i);
+                    {
+                        rect.width += GetColWidth( i );
+                    }
                     else
                         break;
                 }
 
                 if (rect.GetRight() > client_right)
-                    rect.SetRight(client_right - 1);
+                    rect.SetRight( client_right - 1 );
             }
 
-            editor->SetCellAttr(attr);
+            editor->SetCellAttr( attr );
             editor->SetSize( rect );
+            if (nXMove != 0)
+                editor->GetControl()->Move(
+                    editor->GetControl()->GetPosition().x + nXMove,
+                    editor->GetControl()->GetPosition().y );
             editor->Show( true, attr );
 
             // recalc dimensions in case we need to
@@ -7893,7 +7989,7 @@ void wxGrid::HideCellEditControl()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
-        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellAttr *attr = GetCellAttr(row, col);
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->Show( false );
         editor->DecRef();
@@ -7905,10 +8001,12 @@ void wxGrid::HideCellEditControl()
         wxRect rect( CellToRect(row, col) );
         CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
         rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
+
 #ifdef __WXMAC__
         // ensure that the pixels under the focus ring get refreshed as well
         rect.Inflate(10, 10);
 #endif
+
         m_gridWin->Refresh( false, &rect );
     }
 }
@@ -7942,7 +8040,6 @@ void wxGrid::SaveEditControlValue()
     }
 }
 
-
 //
 // ------ Grid location functions
 //  Note that all of these functions work with the logical coordinates of
@@ -7955,7 +8052,7 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
     int row = YToRow(y);
     int col = XToCol(x);
 
-    if ( row == -1  ||  col == -1 )
+    if ( row == -1 || col == -1 )
     {
         coords = wxGridNoCellCoords;
     }
@@ -7965,7 +8062,6 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
     }
 }
 
-
 // Internal Helper function for computing row or column from some
 // (unscrolled) coordinate value, using either
 // m_defaultRowHeight/m_defaultColWidth or binary search on array
@@ -7992,7 +8088,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
     }
 
     if ( i_max >= BorderArray.GetCount())
+    {
         i_max = BorderArray.GetCount() - 1;
+    }
     else
     {
         if ( coord >= BorderArray[i_max])
@@ -8074,7 +8172,7 @@ int wxGrid::XToEdgeOfCol( int x )
 
     if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
     {
-        // We know that we are in column i,  test whether we are
+        // We know that we are in column i; test whether we are
         // close enough to right or left border, respectively.
         if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
             return i;
@@ -8089,22 +8187,24 @@ wxRect wxGrid::CellToRect( int row, int col )
 {
     wxRect rect( -1, -1, -1, -1 );
 
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    if ( row >= 0 && row < m_numRows &&
+         col >= 0 && col < m_numCols )
     {
         int i, cell_rows, cell_cols;
         rect.width = rect.height = 0;
         GetCellSize( row, col, &cell_rows, &cell_cols );
         // if negative then find multicell owner
-        if (cell_rows < 0) row += cell_rows;
-        if (cell_cols < 0) col += cell_cols;
+        if (cell_rows < 0)
+            row += cell_rows;
+        if (cell_cols < 0)
+             col += cell_cols;
         GetCellSize( row, col, &cell_rows, &cell_cols );
 
         rect.x = GetColLeft(col);
         rect.y = GetRowTop(row);
-        for (i=col; i<col+cell_cols; i++)
-            rect.width  += GetColWidth(i);
-        for (i=row; i<row+cell_rows; i++)
+        for (i=col; i < col + cell_cols; i++)
+            rect.width += GetColWidth(i);
+        for (i=row; i < row + cell_rows; i++)
             rect.height += GetRowHeight(i);
     }
 
@@ -8131,23 +8231,21 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
     CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
 
     // check against the client area of the grid window
-    //
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
     if ( wholeCellVisible )
     {
         // is the cell wholly visible ?
-        //
-        return ( left >= 0  &&  right <= cw  &&
-                 top >= 0  &&  bottom <= ch );
+        return ( left >= 0 && right <= cw &&
+                 top >= 0 && bottom <= ch );
     }
     else
     {
         // is the cell partly visible ?
         //
-        return ( ((left >=0 && left < cw) || (right > 0 && right <= cw))  &&
-                 ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+        return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) &&
+                 ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) );
     }
 }
 
@@ -8159,15 +8257,13 @@ void wxGrid::MakeCellVisible( int row, int col )
     int i;
     int xpos = -1, ypos = -1;
 
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    if ( row >= 0 && row < m_numRows &&
+         col >= 0 && col < m_numCols )
     {
         // get the cell rectangle in logical coords
-        //
         wxRect r( CellToRect( row, col ) );
 
         // convert to device coords
-        //
         int left, top, right, bottom;
         CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
         CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
@@ -8183,7 +8279,7 @@ void wxGrid::MakeCellVisible( int row, int col )
         {
             int h = r.GetHeight();
             ypos = r.GetTop();
-            for ( i = row-1;  i >= 0;  i-- )
+            for ( i = row - 1; i >= 0; i-- )
             {
                 int rowHeight = GetRowHeight(i);
                 if ( h + rowHeight > ch )
@@ -8194,15 +8290,19 @@ void wxGrid::MakeCellVisible( int row, int col )
             }
 
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
-            // have rounding errors (this is important, because if we do, we
-            // might not scroll at all and some cells won't be redrawn)
+            // have rounding errors (this is important, because if we do,
+            // we might not scroll at all and some cells won't be redrawn)
             //
-            // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
-            // scroll unit...
+            // Sometimes GRID_SCROLL_LINE / 2 is not enough,
+            // so just add a full scroll unit...
             ypos += m_scrollLineY;
         }
 
-        if ( left < 0 )
+        // special handling for wide cells - show always left part of the cell!
+        // Otherwise, e.g. when stepping from row to row, it would jump between
+        // left and right part of the cell on every step!
+//      if ( left < 0 )
+        if ( left < 0 || (right - left) >= cw )
         {
             xpos = r.GetLeft();
         }
@@ -8217,7 +8317,7 @@ void wxGrid::MakeCellVisible( int row, int col )
             xpos += m_scrollLineX;
         }
 
-        if ( xpos != -1  ||  ypos != -1 )
+        if ( xpos != -1 || ypos != -1 )
         {
             if ( xpos != -1 )
                 xpos /= m_scrollLineX;
@@ -8229,17 +8329,16 @@ void wxGrid::MakeCellVisible( int row, int col )
     }
 }
 
-
 //
 // ------ Grid cursor movement functions
 //
 
 bool wxGrid::MoveCursorUp( bool expandSelection )
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetRow() >= 0 )
     {
-        if ( expandSelection)
+        if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
@@ -8253,11 +8352,11 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetRow() > 0 )
         {
+            int row = m_currentCellCoords.GetRow() - 1;
+            int col = m_currentCellCoords.GetCol();
             ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                            m_currentCellCoords.GetCol() );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );
         }
         else
             return false;
@@ -8268,17 +8367,16 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
     return false;
 }
 
-
 bool wxGrid::MoveCursorDown( bool expandSelection )
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetRow() < m_numRows )
     {
         if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
-            if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
+            if ( m_selectingKeyboard.GetRow() < m_numRows - 1 )
             {
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
@@ -8288,11 +8386,11 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
         {
+            int row = m_currentCellCoords.GetRow() + 1;
+            int col = m_currentCellCoords.GetCol();
             ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                            m_currentCellCoords.GetCol() );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );
         }
         else
             return false;
@@ -8305,7 +8403,7 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
 
 bool wxGrid::MoveCursorLeft( bool expandSelection )
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetCol() >= 0 )
     {
         if ( expandSelection )
@@ -8322,11 +8420,11 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetCol() > 0 )
         {
+            int row = m_currentCellCoords.GetRow();
+            int col = m_currentCellCoords.GetCol() - 1;
             ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() - 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() - 1 );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );
         }
         else
             return false;
@@ -8339,7 +8437,7 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
 
 bool wxGrid::MoveCursorRight( bool expandSelection )
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetCol() < m_numCols )
     {
         if ( expandSelection )
@@ -8356,11 +8454,11 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
         {
+            int row = m_currentCellCoords.GetRow();
+            int col = m_currentCellCoords.GetCol() + 1;
             ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() + 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() + 1 );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );
         }
         else
             return false;
@@ -8387,7 +8485,7 @@ bool wxGrid::MovePageUp()
 
         if ( newRow == row )
         {
-            //row > 0 , so newrow can never be less than 0 here.
+            // row > 0, so newRow can never be less than 0 here.
             newRow = row - 1;
         }
 
@@ -8406,7 +8504,7 @@ bool wxGrid::MovePageDown()
         return false;
 
     int row = m_currentCellCoords.GetRow();
-    if ( (row+1) < m_numRows )
+    if ( (row + 1) < m_numRows )
     {
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
@@ -8415,7 +8513,7 @@ bool wxGrid::MovePageDown()
         int newRow = internalYToRow( y + ch );
         if ( newRow == row )
         {
-            // row < m_numRows , so newrow can't overflow here.
+            // row < m_numRows, so newRow can't overflow here.
             newRow = row + 1;
         }
 
@@ -8431,7 +8529,7 @@ bool wxGrid::MovePageDown()
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 {
     if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetRow() > 0 )
     {
         int row = m_currentCellCoords.GetRow();
@@ -8444,19 +8542,19 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             //
             while ( row > 0 )
             {
-                row-- ;
+                row--;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
-        else if ( m_table->IsEmptyCell(row-1, col) )
+        else if ( m_table->IsEmptyCell(row - 1, col) )
         {
             // starting at the top of a block: find the next block
             //
             row--;
             while ( row > 0 )
             {
-                row-- ;
+                row--;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
@@ -8467,10 +8565,10 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             //
             while ( row > 0 )
             {
-                row-- ;
+                row--;
                 if ( m_table->IsEmptyCell(row, col) )
                 {
-                    row++ ;
+                    row++;
                     break;
                 }
             }
@@ -8497,8 +8595,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 {
     if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
+         m_currentCellCoords != wxGridNoCellCoords &&
+         m_currentCellCoords.GetRow() < m_numRows - 1 )
     {
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
@@ -8508,21 +8606,21 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
             // starting in an empty cell: find the next block of
             // non-empty cells
             //
-            while ( row < m_numRows-1 )
+            while ( row < m_numRows - 1 )
             {
-                row++ ;
+                row++;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
-        else if ( m_table->IsEmptyCell(row+1, col) )
+        else if ( m_table->IsEmptyCell(row + 1, col) )
         {
             // starting at the bottom of a block: find the next block
             //
             row++;
-            while ( row < m_numRows-1 )
+            while ( row < m_numRows - 1 )
             {
-                row++ ;
+                row++;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
@@ -8531,12 +8629,12 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
         {
             // starting within a block: find the bottom of the block
             //
-            while ( row < m_numRows-1 )
+            while ( row < m_numRows - 1 )
             {
-                row++ ;
+                row++;
                 if ( m_table->IsEmptyCell(row, col) )
                 {
-                    row-- ;
+                    row--;
                     break;
                 }
             }
@@ -8563,7 +8661,7 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 {
     if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords != wxGridNoCellCoords &&
          m_currentCellCoords.GetCol() > 0 )
     {
         int row = m_currentCellCoords.GetRow();
@@ -8576,19 +8674,19 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             //
             while ( col > 0 )
             {
-                col-- ;
+                col--;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
-        else if ( m_table->IsEmptyCell(row, col-1) )
+        else if ( m_table->IsEmptyCell(row, col - 1) )
         {
             // starting at the left of a block: find the next block
             //
             col--;
             while ( col > 0 )
             {
-                col-- ;
+                col--;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
@@ -8599,10 +8697,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             //
             while ( col > 0 )
             {
-                col-- ;
+                col--;
                 if ( m_table->IsEmptyCell(row, col) )
                 {
-                    col++ ;
+                    col++;
                     break;
                 }
             }
@@ -8629,8 +8727,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 {
     if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols-1 )
+         m_currentCellCoords != wxGridNoCellCoords &&
+         m_currentCellCoords.GetCol() < m_numCols - 1 )
     {
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
@@ -8640,21 +8738,21 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
             // starting in an empty cell: find the next block of
             // non-empty cells
             //
-            while ( col < m_numCols-1 )
+            while ( col < m_numCols - 1 )
             {
-                col++ ;
+                col++;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
-        else if ( m_table->IsEmptyCell(row, col+1) )
+        else if ( m_table->IsEmptyCell(row, col + 1) )
         {
             // starting at the right of a block: find the next block
             //
             col++;
-            while ( col < m_numCols-1 )
+            while ( col < m_numCols - 1 )
             {
-                col++ ;
+                col++;
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
@@ -8663,12 +8761,12 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
         {
             // starting within a block: find the right of the block
             //
-            while ( col < m_numCols-1 )
+            while ( col < m_numCols - 1 )
             {
-                col++ ;
+                col++;
                 if ( m_table->IsEmptyCell(row, col) )
                 {
-                    col-- ;
+                    col--;
                     break;
                 }
             }
@@ -8692,22 +8790,24 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
     return false;
 }
 
-
-
 //
 // ------ Label values and formatting
 //
 
 void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
 {
-    *horiz = m_rowLabelHorizAlign;
-    *vert  = m_rowLabelVertAlign;
+    if ( horiz )
+        *horiz = m_rowLabelHorizAlign;
+    if ( vert )
+        *vert  = m_rowLabelVertAlign;
 }
 
 void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
 {
-    *horiz = m_colLabelHorizAlign;
-    *vert  = m_colLabelVertAlign;
+    if ( horiz )
+        *horiz = m_colLabelHorizAlign;
+    if ( vert )
+        *vert  = m_colLabelVertAlign;
 }
 
 int wxGrid::GetColLabelTextOrientation()
@@ -8743,7 +8843,6 @@ wxString wxGrid::GetColLabelValue( int col )
     }
 }
 
-
 void wxGrid::SetRowLabelSize( int width )
 {
     width = wxMax( width, 0 );
@@ -8757,7 +8856,8 @@ void wxGrid::SetRowLabelSize( int width )
         else if ( m_rowLabelWidth == 0 )
         {
             m_rowLabelWin->Show( true );
-            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true );
+            if ( m_colLabelHeight > 0 )
+                m_cornerLabelWin->Show( true );
         }
 
         m_rowLabelWidth = width;
@@ -8766,7 +8866,6 @@ void wxGrid::SetRowLabelSize( int width )
     }
 }
 
-
 void wxGrid::SetColLabelSize( int height )
 {
     height = wxMax( height, 0 );
@@ -8780,7 +8879,8 @@ void wxGrid::SetColLabelSize( int height )
         else if ( m_colLabelHeight == 0 )
         {
             m_colLabelWin->Show( true );
-            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true );
+            if ( m_rowLabelWidth > 0 )
+                m_cornerLabelWin->Show( true );
         }
 
         m_colLabelHeight = height;
@@ -8789,7 +8889,6 @@ void wxGrid::SetColLabelSize( int height )
     }
 }
 
-
 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )
@@ -8907,14 +9006,10 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {
     if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
-    {
         m_colLabelTextOrientation = textOrientation;
-    }
 
     if ( !GetBatchCount() )
-    {
         m_colLabelWin->Refresh();
-    }
 }
 
 void wxGrid::SetRowLabelValue( int row, const wxString& s )
@@ -8924,7 +9019,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
         m_table->SetRowLabelValue( row, s );
         if ( !GetBatchCount() )
         {
-            wxRect rect = CellToRect( row, 0);
+            wxRect rect = CellToRect( row, 0 );
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
@@ -8967,7 +9062,6 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
     }
 }
 
-
 void wxGrid::SetCellHighlightColour( const wxColour& colour )
 {
     if ( m_cellHighlightColour != colour )
@@ -8994,6 +9088,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
+
         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }
@@ -9011,6 +9106,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
+
         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }
@@ -9038,7 +9134,6 @@ void wxGrid::EnableGridLines( bool enable )
     }
 }
 
-
 int wxGrid::GetDefaultRowSize()
 {
     return m_defaultRowHeight;
@@ -9100,7 +9195,6 @@ void wxGrid::SetDefaultCellFont( const wxFont& font )
     m_defaultCellAttr->SetFont(font);
 }
 
-
 // For editors and renderers the type registry takes precedence over the
 // default attr, so we need to register the new editor/renderer for the string
 // data type in order to make setting a default editor/renderer appear to
@@ -9168,6 +9262,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col)
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
     attr->DecRef();
+
     return colour;
 }
 
@@ -9176,6 +9271,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col )
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
     attr->DecRef();
+
     return colour;
 }
 
@@ -9184,6 +9280,7 @@ wxFont wxGrid::GetCellFont( int row, int col )
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
     attr->DecRef();
+
     return font;
 }
 
@@ -9307,7 +9404,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
     {
         if ( !LookupAttr(row, col, &attr) )
         {
-            attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any)
+            attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
                            : (wxGridCellAttr *)NULL;
             CacheAttr(row, col, attr);
         }
@@ -9501,9 +9598,9 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
         if ((cell_rows > 1) || (cell_rows > 1))
         {
             int i, j;
-            for (j=row; j<row+cell_rows; j++)
+            for (j=row; j < row + cell_rows; j++)
             {
-                for (i=col; i<col+cell_cols; i++)
+                for (i=col; i < col + cell_cols; i++)
                 {
                     if ((i != col) || (j != row))
                     {
@@ -9520,14 +9617,14 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
         if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1))
         {
             int i, j;
-            for (j=row; j<row+num_rows; j++)
+            for (j=row; j < row + num_rows; j++)
             {
-                for (i=col; i<col+num_cols; i++)
+                for (i=col; i < col + num_cols; i++)
                 {
                     if ((i != col) || (j != row))
                     {
                         wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
-                        attr_stub->SetSize( row-j, col-i );
+                        attr_stub->SetSize( row - j, col - i );
                         attr_stub->DecRef();
                     }
                 }
@@ -9578,25 +9675,24 @@ void wxGrid::RegisterDataType(const wxString& typeName,
 }
 
 
-wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const
 {
     wxString typeName = m_table->GetTypeName(row, col);
     return GetDefaultEditorForType(typeName);
 }
 
-wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const
 {
     wxString typeName = m_table->GetTypeName(row, col);
     return GetDefaultRendererForType(typeName);
 }
 
-wxGridCellEditor*
-wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const
 {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
-    wxString	errStr;
+        wxString errStr;
 
         errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
         wxFAIL_MSG(errStr.c_str());
@@ -9607,13 +9703,12 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const
     return m_typeRegistry->GetEditor(index);
 }
 
-wxGridCellRenderer*
-wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
-    wxString	errStr;
+        wxString errStr;
 
         errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
         wxFAIL_MSG(errStr.c_str());
@@ -9624,7 +9719,6 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const
     return m_typeRegistry->GetRenderer(index);
 }
 
-
 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------
@@ -9685,10 +9779,11 @@ void wxGrid::SetRowSize( int row, int height )
 
     m_rowHeights[row] = h;
     int i;
-    for ( i = row;  i < m_numRows;  i++ )
+    for ( i = row; i < m_numRows; i++ )
     {
         m_rowBottoms[i] += diff;
     }
+
     if ( !GetBatchCount() )
         CalcDimensions();
 }
@@ -9718,11 +9813,11 @@ void wxGrid::SetColSize( int col, int width )
     //                                                                 (VZ)
     // No, because it is reasonable to assume the library user know's
     // what he is doing. However whe should test against the weaker
-    // constariant of minimalAcceptableWidth, as this breaks rendering
+    // constraint of minimalAcceptableWidth, as this breaks rendering
     //
     // This test then fixes sf.net bug #645734
 
-    if ( width < GetColMinimalAcceptableWidth())
+    if ( width < GetColMinimalAcceptableWidth() )
         return;
 
     if ( m_colWidths.IsEmpty() )
@@ -9731,26 +9826,28 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
-    // if < 0 calc new width from label
+    // if < 0 then calculate new width from label
     if ( width < 0 )
     {
-      long w, h;
-      wxArrayString lines;
-      wxClientDC dc(m_colLabelWin);
-      dc.SetFont(GetLabelFont());
-      StringToLines(GetColLabelValue(col), lines);
-      GetTextBoxSize(dc, lines, &w, &h);
-      width = w + 6;
+        long w, h;
+        wxArrayString lines;
+        wxClientDC dc(m_colLabelWin);
+        dc.SetFont(GetLabelFont());
+        StringToLines(GetColLabelValue(col), lines);
+        GetTextBoxSize(dc, lines, &w, &h);
+        width = w + 6;
     }
+
     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 
     int i;
-    for ( i = col;  i < m_numCols;  i++ )
+    for ( i = col; i < m_numCols; i++ )
     {
         m_colRights[i] += diff;
     }
+
     if ( !GetBatchCount() )
         CalcDimensions();
 }
@@ -9777,6 +9874,7 @@ int wxGrid::GetColMinimalWidth(int col) const
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
+
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
@@ -9784,25 +9882,24 @@ int wxGrid::GetRowMinimalHeight(int row) const
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
+
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
 
 void wxGrid::SetColMinimalAcceptableWidth( int width )
 {
     // We do allow a width of 0 since this gives us
-    // an easy way to temporarily hidding columns.
-    if ( width < 0 )
-        return;
-    m_minAcceptableColWidth = width;
+    // an easy way to temporarily hiding columns.
+    if ( width >= 0 )
+        m_minAcceptableColWidth = width;
 }
 
 void wxGrid::SetRowMinimalAcceptableHeight( int height )
 {
     // We do allow a height of 0 since this gives us
-    // an easy way to temporarily hidding rows.
-    if ( height < 0 )
-        return;
-    m_minAcceptableRowHeight = height;
+    // an easy way to temporarily hiding rows.
+    if ( height >= 0 )
+        m_minAcceptableRowHeight = height;
 }
 
 int  wxGrid::GetColMinimalAcceptableWidth() const
@@ -9823,11 +9920,11 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 {
     wxClientDC dc(m_gridWin);
 
-    //Cancel editting of cell
+    // cancel editing of cell
     HideCellEditControl();
     SaveEditControlValue();
 
-    // init both of them to avoid compiler warnings, even if weo nly need one
+    // init both of them to avoid compiler warnings, even if we only need one
     int row = -1,
         col = -1;
     if ( column )
@@ -9844,16 +9941,14 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         else
             col = rowOrCol;
 
-        wxGridCellAttr* attr = GetCellAttr(row, col);
-        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        wxGridCellAttr *attr = GetCellAttr(row, col);
+        wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
         if ( renderer )
         {
             wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
             extent = column ? size.x : size.y;
             if ( extent > extentMax )
-            {
                 extentMax = extent;
-            }
 
             renderer->DecRef();
         }
@@ -9876,32 +9971,26 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 
     extent = column ? w : h;
     if ( extent > extentMax )
-    {
         extentMax = extent;
-    }
 
     if ( !extentMax )
     {
         // empty column - give default extent (notice that if extentMax is less
-        // than default extent but != 0, it's ok)
+        // than default extent but != 0, it's OK)
         extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
     }
     else
     {
         if ( column )
-        {
             // leave some space around text
             extentMax += 10;
-        }
         else
-        {
             extentMax += 6;
-        }
     }
 
     if ( column )
     {
-        SetColSize(col, extentMax);
+        SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {
             int cw, ch, dummy;
@@ -9921,7 +10010,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         {
             int cw, ch, dummy;
             m_gridWin->GetClientSize( &cw, &ch );
-            wxRect rect ( CellToRect( row, 0 ) );
+            wxRect rect( CellToRect( row, 0 ) );
             rect.x = 0;
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
@@ -9929,6 +10018,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
             m_rowLabelWin->Refresh( true, &rect );
         }
     }
+
     if ( setAsMin )
     {
         if ( column )
@@ -9948,9 +10038,7 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )
-        {
             AutoSizeColumn(col, setAsMin);
-        }
 
         width += GetColWidth(col);
     }
@@ -9971,9 +10059,7 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )
-        {
             AutoSizeRow(row, setAsMin);
-        }
 
         height += GetRowHeight(row);
     }
@@ -9994,8 +10080,9 @@ 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) * m_scrollLineX,
-                   GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY);
+    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
@@ -10071,7 +10158,7 @@ void wxGrid::AutoSizeRowLabelSize( int row )
     // autosize row height depending on label text
     StringToLines( GetRowLabelValue( row ), lines );
     wxClientDC dc( m_rowLabelWin );
-    GetTextBoxSize( dc, lines, &w, &h);
+    GetTextBoxSize( dc, lines, &w, &h );
     if ( h < m_defaultRowHeight )
         h = m_defaultRowHeight;
     SetRowSize(row, h);
@@ -10084,7 +10171,7 @@ void wxGrid::AutoSizeColLabelSize( int col )
     long w, h;
 
     // Hide the edit control, so it
-    // won't interfer with drag-shrinking.
+    // won't interfere with drag-shrinking.
     if ( IsCellEditControlShown() )
     {
         HideCellEditControl();
@@ -10095,9 +10182,9 @@ void wxGrid::AutoSizeColLabelSize( int col )
     StringToLines( GetColLabelValue( col ), lines );
     wxClientDC dc( m_colLabelWin );
     if ( GetColLabelTextOrientation() == wxHORIZONTAL )
-        GetTextBoxSize( dc, lines, &w, &h);
+        GetTextBoxSize( dc, lines, &w, &h );
     else
-        GetTextBoxSize( dc, lines, &h, &w);
+        GetTextBoxSize( dc, lines, &h, &w );
     if ( w < m_defaultColWidth )
         w = m_defaultColWidth;
     SetColSize(col, w);
@@ -10119,7 +10206,7 @@ wxSize wxGrid::DoGetBestSize() const
         height = 80;
 
     // Round up to a multiple the scroll rate
-    // NOTE: this still doesn't get rid  of the scrollbars;
+    // NOTE: this still doesn't get rid of the scrollbars;
     // is there any magic incantation for that?
     int xpu, ypu;
     GetScrollPixelsPerUnit(&xpu, &ypu);
@@ -10139,10 +10226,12 @@ wxSize wxGrid::DoGetBestSize() const
         height = maxheight;
 
     wxSize best(width, height);
+
     // NOTE: This size should be cached, but first we need to add calls to
     // InvalidateBestSize everywhere that could change the results of this
     // calculation.
     // CacheBestSize(size);
+
     return best;
 }
 
@@ -10188,10 +10277,9 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
     }
 }
 
-
-//
-// ------ Block, row and col selection
-//
+// ----------------------------------------------------------------------------
+// block, row and column selection
+// ----------------------------------------------------------------------------
 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
@@ -10227,13 +10315,13 @@ void wxGrid::SelectAll()
     if ( m_numRows > 0 && m_numCols > 0 )
     {
         if ( m_selection )
-            m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+            m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 );
     }
 }
 
-//
-// ------ Cell, row and col deselection
-//
+// ----------------------------------------------------------------------------
+// cell, row and col deselection
+// ----------------------------------------------------------------------------
 
 void wxGrid::DeselectRow( int row )
 {
@@ -10243,15 +10331,15 @@ void wxGrid::DeselectRow( int row )
     if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
     {
         if ( m_selection->IsInSelection(row, 0 ) )
-            m_selection->ToggleCellSelection( row, 0);
+            m_selection->ToggleCellSelection(row, 0);
     }
     else
     {
         int nCols = GetNumberCols();
-        for ( int i = 0; i < nCols ; i++ )
+        for ( int i = 0; i < nCols; i++ )
         {
             if ( m_selection->IsInSelection(row, i ) )
-                m_selection->ToggleCellSelection( row, i);
+                m_selection->ToggleCellSelection(row, i);
         }
     }
 }
@@ -10264,12 +10352,12 @@ void wxGrid::DeselectCol( int col )
     if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
     {
         if ( m_selection->IsInSelection(0, col ) )
-            m_selection->ToggleCellSelection( 0, col);
+            m_selection->ToggleCellSelection(0, col);
     }
     else
     {
         int nRows = GetNumberRows();
-        for ( int i = 0; i < nRows ; i++ )
+        for ( int i = 0; i < nRows; i++ )
         {
             if ( m_selection->IsInSelection(i, col ) )
                 m_selection->ToggleCellSelection(i, col);
@@ -10362,7 +10450,6 @@ void wxGrid::ClearSelection()
         m_selection->ClearSelection();
 }
 
-
 // This function returns the rectangle that encloses the given block
 // in device coords clipped to the client size of the grid window.
 //
@@ -10379,7 +10466,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     }
     else
     {
-        rect = wxRect(0,0,0,0);
+        rect = wxRect(0, 0, 0, 0);
     }
 
     cellRect = CellToRect( bottomRight );
@@ -10423,7 +10510,6 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
         bottomRow = i;
     }
 
-
     for ( j = topRow; j <= bottomRow; j++ )
     {
         for ( i = leftCol; i <= rightCol; i++ )
@@ -10467,9 +10553,9 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     return rect;
 }
 
-//
-// ------ Grid event classes
-//
+// ----------------------------------------------------------------------------
+// grid event classes
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
 
@@ -10520,13 +10606,13 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
                                                bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {
-    m_topLeft     = topLeft;
+    m_topLeft = topLeft;
     m_bottomRight = bottomRight;
-    m_selecting   = sel;
-    m_control     = control;
-    m_shift       = shift;
-    m_alt         = alt;
-    m_meta        = meta;
+    m_selecting = sel;
+    m_control = control;
+    m_shift = shift;
+    m_alt = alt;
+    m_meta = meta;
 
     SetEventObject(obj);
 }
@@ -10546,4 +10632,3 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
 }
 
 #endif // wxUSE_GRID
-