The Great wxRegion Refactoring:

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 3a3ba4e0ba02f9ffef28eaec1284a2dee279f32a..c216e7291bc3858f0d8575445255d68fc4cd5089 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,27 +1,17 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////

-// 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)
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)

-// Modified by: Robin Dunn, Vadim Zeitlin
+// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios

 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // 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/wxprec.h"
 

-#include "wx/defs.h"
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif


@@ -39,6 +29,7 @@
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/math.h"
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/math.h"

+    #include "wx/listbox.h"

 #endif
 
 #include "wx/textfile.h"
 #endif
 
 #include "wx/textfile.h"


@@ -114,6 +105,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
 DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
 DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)

+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_MOVE)

 DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
 DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
 DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
 DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)


@@ -158,7 +150,7 @@ public:
 private:
     wxGrid   *m_owner;
 
 private:
     wxGrid   *m_owner;
 

-    void OnPaint( wxPaintEvent &event );
+    void OnPaint( wxPaintEvent& event );

     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );


@@ -198,16 +190,16 @@ class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
 public:
     wxGridWindow()
     {
 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,
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );
     }
 
     wxGridWindow( wxGrid *parent,
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );

-    ~wxGridWindow() {}
+    virtual ~wxGridWindow() {}

 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 


@@ -250,8 +242,8 @@ public:
     void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; }
 
 private:
     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.
 
     // Work around the fact that a focus kill event can be sent to
     // a combobox within a set focus event.


@@ -272,7 +264,6 @@ BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-

 // ----------------------------------------------------------------------------
 // the internal data representation used by wxGridCellAttrProvider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // the internal data representation used by wxGridCellAttrProvider
 // ----------------------------------------------------------------------------


@@ -298,7 +289,7 @@ class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
 {
 public:
     // empty ctor to suppress warnings
 {
 public:
     // empty ctor to suppress warnings

-    wxGridRowOrColAttrData() { }
+    wxGridRowOrColAttrData() {}

     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);
     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);


@@ -331,7 +322,7 @@ struct wxGridDataTypeInfo
                        wxGridCellRenderer* renderer,
                        wxGridCellEditor* editor)
         : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
                        wxGridCellRenderer* renderer,
                        wxGridCellEditor* editor)
         : m_typeName(typeName), m_renderer(renderer), m_editor(editor)

-        { }
+        {}

 
     ~wxGridDataTypeInfo()
     {
 
     ~wxGridDataTypeInfo()
     {


@@ -380,6 +371,7 @@ private:
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
     wxGridDataTypeInfoArray m_typeinfo;
 };
 

+

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -396,14 +388,14 @@ private:
 #ifdef DEBUG_ATTR_CACHE
     static size_t gs_nAttrCacheHits = 0;
     static size_t gs_nAttrCacheMisses = 0;
 #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 );
 
 // ----------------------------------------------------------------------------
 // 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
 
 // scroll line size
 // TODO: this doesn't work at all, grid cells have different sizes and approx


@@ -454,7 +446,6 @@ wxGridCellEditor::wxGridCellEditor()
     m_attr = NULL;
 }
 
     m_attr = NULL;
 }
 

-

 wxGridCellEditor::~wxGridCellEditor()
 {
     Destroy();
 wxGridCellEditor::~wxGridCellEditor()
 {
     Destroy();


@@ -489,7 +480,7 @@ void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {
 {
     if (m_control)
     {

-        m_control->PopEventHandler(true /* delete it*/);
+        m_control->PopEventHandler( true /* delete it*/ );

 
         m_control->Destroy();
         m_control = NULL;
 
         m_control->Destroy();
         m_control = NULL;


@@ -498,8 +489,8 @@ void wxGridCellEditor::Destroy()
 
 void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
 {
 
 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 )
     m_control->Show(show);
 
     if ( show )


@@ -518,6 +509,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());
 #endif
             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
         }
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }


@@ -536,6 +528,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
             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() )
 // Workaround for GTK+1 font setting problem on some platforms
 #if !defined(__WXGTK__) || defined(__WXGTK20__)
         if ( m_fontOld.Ok() )


@@ -549,8 +542,8 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
 
 void wxGridCellEditor::SetSize(const wxRect& rect)
 {
 
 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);
 }
 
     m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 


@@ -563,6 +556,7 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     bool ctrl = event.ControlDown();
     bool alt  = event.AltDown();
 {
     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.
 #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 +569,32 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
     if ((ctrl || alt) && !(ctrl && alt))
         return false;
 
     if ((ctrl || alt) && !(ctrl && alt))
         return false;
 

-#if wxUSE_UNICODE
-    int key = event.GetUnicodeKey();
+    int key = 0;

     bool keyOk = true;
 
     bool keyOk = true;
 

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

     // if the unicode key code is not really a unicode character (it may
     // be a function key or etc., the platforms appear to always give us a
     // if 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.
     // don't do anything for function keys or etc.

+    key = event.GetUnicodeKey();

     if (key <= 127)
     {
         key = event.GetKeyCode();
         keyOk = (key <= 127);
     }
     if (key <= 127)
     {
         key = event.GetKeyCode();
         keyOk = (key <= 127);
     }

+#else
+    key = event.GetKeyCode();
+    keyOk = (key <= 255);
+#endif
+

     return keyOk;
     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)
 }
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)


@@ -624,7 +624,7 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)

-                               , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL
+                               , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL | wxNO_BORDER

 #endif
                               );
 
 #endif
                               );
 


@@ -640,19 +640,17 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
 void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
                                            wxGridCellAttr * WXUNUSED(attr))
 {
 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);
 
 }
 
 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)
     //
 #if defined(__WXGTK__)
     if (rect.x != 0)


@@ -662,34 +660,40 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
         rect.width -= 1;
         rect.height -= 1;
     }
         rect.width -= 1;
         rect.height -= 1;
     }

-#else // !GTK
-    int extra_x = ( rect.x > 2 )? 2 : 1;
+#elif defined(__WXMSW__)
+    if ( rect.x == 0 )
+        rect.x += 2;
+    else
+        rect.x += 3;

 
 

-// 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;
+    if ( rect.y == 0 )
+        rect.y += 2;
+    else
+        rect.y += 3;
+
+    rect.width -= 2;
+    rect.height -= 2;

 #else
 #else

-    int extra_y = ( rect.y > 2 )? 2 : 1;
-#endif // MSW
+    int extra_x = ( rect.x > 2 ) ? 2 : 1;
+    int extra_y = ( rect.y > 2 ) ? 2 : 1;
+
+    #if defined(__WXMOTIF__)
+        extra_x *= 2;
+        extra_y *= 2;
+    #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.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 );
-#endif // GTK/!GTK
+    rect.SetRight( rect.GetRight() + 2 * extra_x );
+    rect.SetBottom( rect.GetBottom() + 2 * extra_y );
+#endif

 
     wxGridCellEditor::SetSize(rect);
 }
 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 
     wxGridCellEditor::SetSize(rect);
 }
 
 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);
 
 
     m_startValue = grid->GetTable()->GetValue(row, col);
 


@@ -700,15 +704,13 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();

-    Text()->SetSelection(-1,-1);
+    Text()->SetSelection(-1, -1);

     Text()->SetFocus();
 }
 
     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();
 
     bool changed = false;
     wxString value = Text()->GetValue();


@@ -719,17 +721,16 @@ bool wxGridCellTextEditor::EndEdit(int row, int col,
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
         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;
 }
 
     // No point in setting the text of the hidden control
     //Text()->SetValue(m_startValue);
 
     return changed;
 }
 

-

 void wxGridCellTextEditor::Reset()
 {
 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);
 }
 
     DoReset(m_startValue);
 }


@@ -763,20 +764,21 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 #else
     ch = (wxChar)event.GetKeyCode();
 #endif
 #else
     ch = (wxChar)event.GetKeyCode();
 #endif

+

     switch (ch)
     {
         case WXK_DELETE:
             // delete the character at the cursor
             pos = tc->GetInsertionPoint();
             if (pos < tc->GetLastPosition())
     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)
             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:
             break;
 
         default:


@@ -812,13 +814,13 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
     else
     {
         long tmp;
     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
         {
         }
         else
         {

-            m_maxChars = (size_t)tmp;
+            wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );

         }
     }
 }
         }
     }
 }


@@ -826,7 +828,7 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
 // return the value in the text control
 wxString wxGridCellTextEditor::GetValue() const
 {
 // return the value in the text control
 wxString wxGridCellTextEditor::GetValue() const
 {

-  return Text()->GetValue();
+    return Text()->GetValue();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -862,7 +864,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent,
 
 #if wxUSE_VALIDATORS
         Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
 
 #if wxUSE_VALIDATORS
         Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));

-#endif // wxUSE_VALIDATORS
+#endif

     }
 }
 
     }
 }
 


@@ -985,6 +987,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
         }
     }
 #endif
         }
     }
 #endif

+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -1054,7 +1057,7 @@ void wxGridCellFloatEditor::Create(wxWindow* parent,
 
 #if wxUSE_VALIDATORS
     Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
 
 #if wxUSE_VALIDATORS
     Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));

-#endif // wxUSE_VALIDATORS
+#endif

 }
 
 void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
 }
 
 void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)


@@ -1095,6 +1098,7 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col,
 
         return true;
     }
 
         return true;
     }

+

     return false;
 }
 
     return false;
 }
 


@@ -1110,12 +1114,14 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
     tmpbuf[0] = (char) keycode;
     tmpbuf[1] = '\0';
     wxString strbuf(tmpbuf, *wxConvCurrent);
     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 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 )
     {
     if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
          || is_decimal_point )
     {


@@ -1186,24 +1192,31 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     if ( wxGridCellEditor::IsAcceptedKey(event) )
     {
 {
     if ( wxGridCellEditor::IsAcceptedKey(event) )
     {

-        int keycode = event.GetKeyCode();
-        printf("%d\n", keycode);
-        // accept digits, 'e' as in '1e+6', also '-', '+', and '.'
-        char tmpbuf[2];
-        tmpbuf[0] = (char) keycode;
-        tmpbuf[1] = '\0';
-        wxString strbuf(tmpbuf, *wxConvCurrent);
+        const int keycode = event.GetKeyCode();
+        if ( isascii(keycode) )
+        {
+            char tmpbuf[2];
+            tmpbuf[0] = (char) keycode;
+            tmpbuf[1] = '\0';
+            wxString strbuf(tmpbuf, *wxConvCurrent);
+

 #if wxUSE_INTL
 #if wxUSE_INTL

-        bool is_decimal_point =
-            ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
-                                          wxLOCALE_CAT_NUMBER) );
+            const wxString decimalPoint =
+                wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);

 #else
 #else

-        bool is_decimal_point = ( strbuf == _T(".") );
+            const wxString decimalPoint(_T('.'));

 #endif
 #endif

-        if ( (keycode < 128) &&
-             (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
-              is_decimal_point || keycode == '+' || keycode == '-') )
-            return true;
+
+            // accept digits, 'e' as in '1e+6', also '-', '+', and '.'
+            if ( wxIsdigit(keycode) ||
+                    tolower(keycode) == 'e' ||
+                        keycode == decimalPoint ||
+                            keycode == '+' ||
+                                keycode == '-' )
+            {
+                return true;
+            }
+        }

     }
 
     return false;
     }
 
     return false;


@@ -1278,20 +1291,22 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
     if (hAlign == wxALIGN_LEFT)
     {
         x = r.x + 2;
     if (hAlign == wxALIGN_LEFT)
     {
         x = r.x + 2;

+

 #ifdef __WXMSW__
         x += 2;
 #endif
 #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;
     }
     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)
     {
     }
     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);
     }
 
     m_control->Move(x, y);


@@ -1311,15 +1326,18 @@ void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
 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))
 
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))

+    {

         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);

+    }

     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );
         m_startValue = !( !cellval || (cellval == wxT("0")) );
     }
     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );
         m_startValue = !( !cellval || (cellval == wxT("0")) );
     }

+

     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }


@@ -1328,7 +1346,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                                    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();
 
     bool changed = false;
     bool value = CBox()->GetValue();


@@ -1349,7 +1367,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
 void wxGridCellBoolEditor::Reset()
 {
     wxASSERT_MSG(m_control,
 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);
 }
 
     CBox()->SetValue(m_startValue);
 }


@@ -1459,15 +1477,15 @@ void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
     // flicker
 
     // TODO: It doesn't actually fill the client area since the height of a
     // 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,
     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)
 
     wxGridCellEditorEvtHandler* evtHandler = NULL;
     if (m_control)


@@ -1480,7 +1498,9 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
     m_startValue = grid->GetTable()->GetValue(row, col);
 
     if (m_allowOthers)
     m_startValue = grid->GetTable()->GetValue(row, col);
 
     if (m_allowOthers)

+    {

         Combo()->SetValue(m_startValue);
         Combo()->SetValue(m_startValue);

+    }

     else
     {
         // find the right position, or default to the first if not found
     else
     {
         // find the right position, or default to the first if not found


@@ -1489,6 +1509,7 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
             pos = 0;
         Combo()->SetSelection(pos);
     }
             pos = 0;
         Combo()->SetSelection(pos);
     }

+

     Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 
     Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 


@@ -1582,6 +1603,7 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 
         default:
             event.Skip();
 
         default:
             event.Skip();

+            break;

     }
 }
 
     }
 }
 


@@ -1592,6 +1614,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
     wxRect rect = m_grid->CellToRect( row, col );
     int cw, ch;
     m_grid->GetGridWindow()->GetClientSize( &cw, &ch );
     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);
 
     // if cell width is smaller than grid client area, cell is wholly visible
     bool wholeCellVisible = (rect.GetWidth() < cw);
 


@@ -1605,7 +1628,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 
         case WXK_HOME:
         {
 
         case WXK_HOME:
         {

-            if( wholeCellVisible )
+            if ( wholeCellVisible )

             {
                 // no special processing needed...
                 event.Skip();
             {
                 // no special processing needed...
                 event.Skip();


@@ -1616,7 +1639,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 
             // get the widths of all cells previous to this one
             int colXPos = 0;
 
             // get the widths of all cells previous to this one
             int colXPos = 0;

-            for ( int i = 0; i < col; i++ ) 
+            for ( int i = 0; i < col; i++ )

             {
                 colXPos += m_grid->GetColSize(i);
             }
             {
                 colXPos += m_grid->GetColSize(i);
             }


@@ -1625,18 +1648,19 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
             m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
             if (col != 0)
             {
             m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
             if (col != 0)
             {

-                m_grid->Scroll(colXPos/xUnit-1, m_grid->GetScrollPos(wxVERTICAL));
+                m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));

             }
             else
             {
             }
             else
             {

-                m_grid->Scroll(colXPos/xUnit, m_grid->GetScrollPos(wxVERTICAL));
+                m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL));

             }
             event.Skip();
             break;
         }
             }
             event.Skip();
             break;
         }

+

         case WXK_END:
         {
         case WXK_END:
         {

-            if( wholeCellVisible )
+            if ( wholeCellVisible )

             {
                 // no special processing needed...
                 event.Skip();
             {
                 // no special processing needed...
                 event.Skip();


@@ -1653,12 +1677,14 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
                 int y;
                 wxFont font = m_grid->GetCellFont(row, col);
                 m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font);
                 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();
                 // 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?
                 // (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));
+                textWidth -= (client_right - (m_grid->GetScrollLineX() * 2));

                 if ( textWidth < 0 )
                 {
                     textWidth = 0;
                 if ( textWidth < 0 )
                 {
                     textWidth = 0;


@@ -1667,23 +1693,25 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 
             // get the widths of all cells previous to this one
             int colXPos = 0;
 
             // get the widths of all cells previous to this one
             int colXPos = 0;

-            for ( int i = 0; i < col; i++ ) 
+            for ( int i = 0; i < col; i++ )

             {
                 colXPos += m_grid->GetColSize(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);
             // 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));
+            m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));

             event.Skip();
             break;
         }
 
         default:
             event.Skip();
             event.Skip();
             break;
         }
 
         default:
             event.Skip();

+            break;

     }
 }
 
     }
 }
 


@@ -1755,21 +1783,21 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
     // different coloured text when the grid is disabled
     if ( grid.IsEnabled() )
     {
     // 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
     {
     }
     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() );
     }
 
     dc.SetFont( attr.GetFont() );


@@ -1824,34 +1852,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;
         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;
         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);
                 {
                     // 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;
                     }
                 }
                     {
                         is_empty = false;
                         break;
                     }
                 }

+

                 if (is_empty)
                 if (is_empty)

+                {

                     rect.width += grid.GetColSize(i);
                     rect.width += grid.GetColSize(i);

+                }

                 else
                 {
                     i--;
                     break;
                 }
                 else
                 {
                     i--;
                     break;
                 }

+

                 if (rect.width >= best_width)
                     break;
             }
                 if (rect.width >= best_width)
                     break;
             }

+

             overflowCols = i - col - cell_cols + 1;
             if (overflowCols >= cols)
                 overflowCols = cols - 1;
             overflowCols = i - col - cell_cols + 1;
             if (overflowCols >= cols)
                 overflowCols = cols - 1;


@@ -1863,10 +1897,10 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
             wxRect clip = rect;
             clip.x += rectCell.width;
             // draw each overflow cell individually
             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;
             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();
             {
                 clip.width = grid.GetColSize(i) - 1;
                 dc.DestroyClippingRegion();


@@ -2070,6 +2104,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
             }
         }
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
             }
         }

+

         tmp = params.AfterFirst(_T(','));
         if ( !tmp.empty() )
         {
         tmp = params.AfterFirst(_T(','));
         if ( !tmp.empty() )
         {


@@ -2086,7 +2121,6 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

-

 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------


@@ -2110,7 +2144,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
         // get checkbox size
         wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);
         wxSize size = checkbox->GetBestSize();
         // 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__)
 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
 #if defined(__WXGTK__) || defined(__WXMOTIF__)


@@ -2147,34 +2181,36 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 
     // draw a border around checkmark
     int vAlign, hAlign;
 
     // draw a border around checkmark
     int vAlign, hAlign;

-    attr.GetAlignment(& hAlign, &vAlign);
+    attr.GetAlignment(&hAlign, &vAlign);

 
     wxRect rectBorder;
     if (hAlign == wxALIGN_CENTRE)
     {
 
     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.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.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) )
         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);
         value = grid.GetTable()->GetValueAsBool(row, col);

+    }

     else
     {
         wxString cellval( grid.GetTable()->GetValue(row, col) );
     else
     {
         wxString cellval( grid.GetTable()->GetValue(row, col) );


@@ -2184,14 +2220,15 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     if ( value )
     {
         wxRect rectMark = rectBorder;
     if ( value )
     {
         wxRect rectMark = rectBorder;

+

 #ifdef __WXMSW__
         // MSW DrawCheckMark() is weird (and should probably be changed...)
 #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++;
         rectMark.x++;
         rectMark.y++;

-#else // !MSW
+#else

         rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
         rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);

-#endif // MSW/!MSW
+#endif

 
         dc.SetTextForeground(attr.GetTextColour());
         dc.DrawCheckMark(rectMark);
 
         dc.SetTextForeground(attr.GetTextColour());
         dc.DrawCheckMark(rectMark);


@@ -2288,10 +2325,10 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
         m_editor =  mergefrom->m_editor;
         m_editor->IncRef();
     }
         m_editor =  mergefrom->m_editor;
         m_editor->IncRef();
     }

-    if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
+    if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )

         SetReadOnly(mergefrom->IsReadOnly());
 
         SetReadOnly(mergefrom->IsReadOnly());
 

-    if (!HasOverflowMode()  && mergefrom->HasOverflowMode() )
+    if (!HasOverflowMode() && mergefrom->HasOverflowMode() )

         SetOverflow(mergefrom->GetOverflow());
 
     SetDefAttr(mergefrom->m_defGridAttr);
         SetOverflow(mergefrom->GetOverflow());
 
     SetDefAttr(mergefrom->m_defGridAttr);


@@ -2309,9 +2346,9 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols)
 
     // Size of 0,0 is NOT valid, neither is <=0 and any positive value
 
 
     // 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;
                   wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
 
     m_sizeRows = num_rows;


@@ -2335,13 +2372,16 @@ const wxColour& wxGridCellAttr::GetTextColour() const
     }
 }
 
     }
 }
 

-

 const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
     if (HasBackgroundColour())
 const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
     if (HasBackgroundColour())

+    {

         return m_colBack;
         return m_colBack;

+    }

     else if (m_defGridAttr && m_defGridAttr != this)
     else if (m_defGridAttr && m_defGridAttr != this)

+    {

         return m_defGridAttr->GetBackgroundColour();
         return m_defGridAttr->GetBackgroundColour();

+    }

     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));


@@ -2349,13 +2389,16 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const
     }
 }
 
     }
 }
 

-

 const wxFont& wxGridCellAttr::GetFont() const
 {
     if (HasFont())
 const wxFont& wxGridCellAttr::GetFont() const
 {
     if (HasFont())

+    {

         return m_font;
         return m_font;

+    }

     else if (m_defGridAttr && m_defGridAttr != this)
     else if (m_defGridAttr && m_defGridAttr != this)

+    {

         return m_defGridAttr->GetFont();
         return m_defGridAttr->GetFont();

+    }

     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));


@@ -2363,7 +2406,6 @@ const wxFont& wxGridCellAttr::GetFont() const
     }
 }
 
     }
 }
 

-

 void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 {
     if (HasAlignment())
 void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 {
     if (HasAlignment())


@@ -2374,7 +2416,9 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
             *vAlign = m_vAlign;
     }
     else if (m_defGridAttr && m_defGridAttr != this)
             *vAlign = m_vAlign;
     }
     else if (m_defGridAttr && m_defGridAttr != this)

+    {

         m_defGridAttr->GetAlignment(hAlign, vAlign);
         m_defGridAttr->GetAlignment(hAlign, vAlign);

+    }

     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     else
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));


@@ -2394,11 +2438,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
 // 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* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {

-    wxGridCellRenderer *renderer;
+    wxGridCellRenderer *renderer = NULL;

 
     if ( m_renderer && this != m_defGridAttr )
     {
 
     if ( m_renderer && this != m_defGridAttr )
     {


@@ -2406,7 +2450,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
         renderer = m_renderer;
         renderer->IncRef();
     }
         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 )
     {
         // get default renderer for the data type
         if ( grid )


@@ -2414,14 +2458,10 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
             // GetDefaultRendererForCell() will do IncRef() for us
             renderer = grid->GetDefaultRendererForCell(row, 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)
             {
                 // if we still don't have one then use the grid default
                 // (no need for IncRef() here neither)


@@ -2446,7 +2486,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
 {
 // 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 )
     {
 
     if ( m_editor && this != m_defGridAttr )
     {


@@ -2462,14 +2502,10 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons
             // GetDefaultEditorForCell() will do IncRef() for us
             editor = grid->GetDefaultEditorForCell(row, col);
         }
             // 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)
             {
                 // if we still don't have one then use the grid default
                 // (no need for IncRef() here neither)


@@ -2599,7 +2635,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);
                     // No need to DecRef the attribute itself since this is
                     // done be wxGridCellWithAttr's destructor!
                     m_attrs.RemoveAt(n);

-                    n--; count--;
+                    n--;
+                    count--;

                 }
             }
         }
                 }
             }
         }


@@ -2792,27 +2829,28 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                         }
                     }
                 }
                         }
                     }
                 }

-            break;
+                break;

 
             case (wxGridCellAttr::Cell):
                 attr = m_data->m_cellAttrs.GetAttr(row, col);
 
             case (wxGridCellAttr::Cell):
                 attr = m_data->m_cellAttrs.GetAttr(row, col);

-            break;
+                break;

 
             case (wxGridCellAttr::Col):
                 attr = m_data->m_colAttrs.GetAttr(col);
 
             case (wxGridCellAttr::Col):
                 attr = m_data->m_colAttrs.GetAttr(col);

-            break;
+                break;

 
             case (wxGridCellAttr::Row):
                 attr = m_data->m_rowAttrs.GetAttr(row);
 
             case (wxGridCellAttr::Row):
                 attr = m_data->m_rowAttrs.GetAttr(row);

-            break;
+                break;

 
             default:
                 // unused as yet...
                 // (wxGridCellAttr::Default):
                 // (wxGridCellAttr::Merged):
 
             default:
                 // unused as yet...
                 // (wxGridCellAttr::Default):
                 // (wxGridCellAttr::Merged):

-            break;
+                break;

         }
     }
         }
     }

+

     return attr;
 }
 
     return attr;
 }
 


@@ -2872,7 +2910,6 @@ wxGridTypeRegistry::~wxGridTypeRegistry()
         delete m_typeinfo[i];
 }
 
         delete m_typeinfo[i];
 }
 

-

 void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
                                           wxGridCellRenderer* renderer,
                                           wxGridCellEditor* editor)
 void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
                                           wxGridCellRenderer* renderer,
                                           wxGridCellEditor* editor)


@@ -3010,6 +3047,7 @@ wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
     if (renderer)
         renderer->IncRef();
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
     if (renderer)
         renderer->IncRef();

+

     return renderer;
 }
 
     return renderer;
 }
 


@@ -3018,6 +3056,7 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
     if (editor)
         editor->IncRef();
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
     if (editor)
         editor->IncRef();

+

     return editor;
 }
 
     return editor;
 }
 


@@ -3027,7 +3066,6 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 
 IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 
 
 IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 

-

 wxGridTableBase::wxGridTableBase()
 {
     m_view = (wxGrid *) NULL;
 wxGridTableBase::wxGridTableBase()
 {
     m_view = (wxGrid *) NULL;


@@ -3052,6 +3090,7 @@ bool wxGridTableBase::CanHaveAttributes()
         // use the default attr provider by default
         SetAttrProvider(new wxGridCellAttrProvider);
     }
         // use the default attr provider by default
         SetAttrProvider(new wxGridCellAttrProvider);
     }

+

     return true;
 }
 
     return true;
 }
 


@@ -3063,7 +3102,6 @@ wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAtt
         return (wxGridCellAttr *)NULL;
 }
 
         return (wxGridCellAttr *)NULL;
 }
 

-

 void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
 {
     if ( m_attrProvider )
 void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
 {
     if ( m_attrProvider )


@@ -3158,8 +3196,11 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
 wxString wxGridTableBase::GetRowLabelValue( int row )
 {
     wxString s;
 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;
 }
 
     return s;
 }
 


@@ -3174,17 +3215,17 @@ wxString wxGridTableBase::GetColLabelValue( int col )
     unsigned int i, n;
     for ( n = 1; ; n++ )
     {
     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;
         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;
     }
 
     return s2;


@@ -3236,7 +3277,6 @@ void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
 {
 }
 
 {
 }
 

-

 void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
                                          const wxString& WXUNUSED(typeName) )
 {
 void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
                                          const wxString& WXUNUSED(typeName) )
 {


@@ -3272,8 +3312,6 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
     m_comInt2 = commandInt2;
 }
 
     m_comInt2 = commandInt2;
 }
 

-
-

 //////////////////////////////////////////////////////////////////////
 //
 // A basic grid table for string data. An object of this class will
 //////////////////////////////////////////////////////////////////////
 //
 // A basic grid table for string data. An object of this class will


@@ -3354,9 +3392,9 @@ void wxGridStringTable::Clear()
     {
         numCols = m_data[0].GetCount();
 
     {
         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;
             }
             {
                 m_data[row][col] = wxEmptyString;
             }


@@ -3364,7 +3402,6 @@ void wxGridStringTable::Clear()
     }
 }
 
     }
 }
 

-

 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();
 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();


@@ -3380,6 +3417,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
     sa.Alloc( curNumCols );
     sa.Add( wxEmptyString, curNumCols );
     m_data.Insert( sa, pos, numRows );
     sa.Alloc( curNumCols );
     sa.Add( wxEmptyString, curNumCols );
     m_data.Insert( sa, pos, numRows );

+

     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,


@@ -3479,9 +3517,18 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
         return AppendCols( numCols );
     }
 
         return AppendCols( numCols );
     }
 

-    for ( row = 0;  row < curNumRows;  row++ )
+    if ( !m_colLabels.IsEmpty() )
+    {
+        m_colLabels.Insert( wxEmptyString, pos, numCols );
+
+        size_t i;
+        for ( i = pos; i < pos + numCols; i++ )
+            m_colLabels[i] = wxGridTableBase::GetColLabelValue( i );
+    }
+
+    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 );
         }
         {
             m_data[row].Insert( wxEmptyString, col );
         }


@@ -3505,6 +3552,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     size_t row;
 
     size_t curNumRows = m_data.GetCount();
     size_t row;
 
     size_t curNumRows = m_data.GetCount();

+

 #if 0
     if ( !curNumRows )
     {
 #if 0
     if ( !curNumRows )
     {


@@ -3515,7 +3563,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     }
 #endif
 
     }
 #endif
 

-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )

     {
         m_data[row].Add( wxEmptyString, numCols );
     }
     {
         m_data[row].Add( wxEmptyString, numCols );
     }


@@ -3552,12 +3600,23 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         return false;
     }
 
         return false;
     }
 

-    if ( numCols > curNumCols - pos )
+    int colID;
+    if ( GetView() )
+        colID = GetView()->GetColAt( pos );
+    else
+        colID = pos;
+
+    if ( numCols > curNumCols - colID )
+    {
+        numCols = curNumCols - colID;
+    }
+
+    if ( !m_colLabels.IsEmpty() )

     {
     {

-        numCols = curNumCols - pos;
+        m_colLabels.RemoveAt( colID, numCols );

     }
 
     }
 

-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )

     {
         if ( numCols >= curNumCols )
         {
     {
         if ( numCols >= curNumCols )
         {


@@ -3565,7 +3624,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         }
         else
         {
         }
         else
         {

-            m_data[row].RemoveAt( pos, numCols );
+            m_data[row].RemoveAt( colID, numCols );

         }
     }
 
         }
     }
 


@@ -3592,7 +3651,7 @@ wxString wxGridStringTable::GetRowLabelValue( int row )
     }
     else
     {
     }
     else
     {

-        return m_rowLabels[ row ];
+        return m_rowLabels[row];

     }
 }
 
     }
 }
 


@@ -3606,7 +3665,7 @@ wxString wxGridStringTable::GetColLabelValue( int col )
     }
     else
     {
     }
     else
     {

-        return m_colLabels[ col ];
+        return m_colLabels[col];

     }
 }
 
     }
 }
 


@@ -3616,7 +3675,8 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
     {
         int n = m_rowLabels.GetCount();
         int i;
     {
         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) );
         }
         {
             m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
         }


@@ -3631,7 +3691,8 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
     {
         int n = m_colLabels.GetCount();
         int i;
     {
         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) );
         }
         {
             m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
         }


@@ -3648,17 +3709,17 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
 
 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_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 )
 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;
 }
 {
     m_owner = parent;
 }


@@ -3675,10 +3736,11 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
 
     int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );

-    dc.SetDeviceOrigin( 0, -y );
+    wxPoint pt = dc.GetDeviceOrigin();
+    dc.SetDeviceOrigin( pt.x, pt.y-y );

 
     wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
 
     wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );

-    m_owner->DrawRowLabels( dc , rows );
+    m_owner->DrawRowLabels( dc, rows );

 }
 
 void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 }
 
 void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )


@@ -3688,7 +3750,7 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridRowLabelWindow::OnMouseWheel( 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
 }
 
 // This seems to be required for wxMotif otherwise the mouse


@@ -3696,37 +3758,39 @@ void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& 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 )
 {
 }
 
 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 )
 {
 }
 
 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 )
 //////////////////////////////////////////////////////////////////////
 
 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_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 )
 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;
 }
 {
     m_owner = parent;
 }


@@ -3743,10 +3807,14 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
 
     int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );

-    dc.SetDeviceOrigin( -x, 0 );
+    wxPoint pt = dc.GetDeviceOrigin();
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+        dc.SetDeviceOrigin( pt.x+x, pt.y );
+    else
+        dc.SetDeviceOrigin( pt.x-x, pt.y );

 
     wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
 
     wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );

-    m_owner->DrawColLabels( dc , cols );
+    m_owner->DrawColLabels( dc, cols );

 }
 
 void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 }
 
 void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )


@@ -3756,7 +3824,7 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridColLabelWindow::OnMouseWheel( 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
 }
 
 // This seems to be required for wxMotif otherwise the mouse


@@ -3780,24 +3848,23 @@ void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
         event.Skip();
 }
 
         event.Skip();
 }
 

-

 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )

-    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )

     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )

-    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint )

     EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
     EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
     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 )
 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;
 }
 {
     m_owner = parent;
 }


@@ -3820,16 +3887,16 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
 #else // !__WXGTK__
 
     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_3DSHADOW), 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( 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 )
 }
 
 void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )


@@ -3847,31 +3914,33 @@ void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& 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 )
 {
 }
 
 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 )
 {
 }
 
 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 )
 //////////////////////////////////////////////////////////////////////
 
 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_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 )
     EVT_SET_FOCUS( wxGridWindow::OnFocus )
     EVT_KILL_FOCUS( wxGridWindow::OnFocus )
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )


@@ -3883,8 +3952,10 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxWindowID id,
                             const wxPoint &pos,
                             const wxSize &size )
                             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;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;


@@ -3896,13 +3967,15 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();
     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
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif

+

     m_owner->DrawGridSpace( dc );
     m_owner->DrawGridSpace( dc );

-    m_owner->DrawHighlight( dc , DirtyCells );
+    m_owner->DrawHighlight( dc, dirtyCells );

 }
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 }
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )


@@ -3922,7 +3995,7 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridWindow::OnMouseWheel( 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
 }
 
 // This seems to be required for wxMotif/wxGTK otherwise the mouse


@@ -3969,12 +4042,11 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
                            bool clipToMinMax);
 
                            const wxArrayInt& BorderArray, int nMax,
                            bool clipToMinMax);
 

-#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
-                                          m_minAcceptableColWidth, \
-                                          m_colRights, m_numCols, true)
+#define internalXToCol(x) XToCol(x, true)

 #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
                                           m_minAcceptableRowHeight, \
                                           m_rowBottoms, m_numRows, true)
 #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
                                           m_minAcceptableRowHeight, \
                                           m_rowBottoms, m_numRows, true)

+

 /////////////////////////////////////////////////////////////////////
 
 #if wxUSE_EXTENDED_RTTI
 /////////////////////////////////////////////////////////////////////
 
 #if wxUSE_EXTENDED_RTTI


@@ -4004,7 +4076,7 @@ wxBEGIN_FLAGS( wxGridStyle )
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)
     wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
     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)
 
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)
 


@@ -4023,7 +4095,7 @@ wxEND_HANDLERS_TABLE()
 wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
 
 /*
 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 (\81à la NotebookPageInfo)
+ TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo)

 */
 #else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
 */
 #else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )


@@ -4042,10 +4114,10 @@ wxGrid::wxGrid()
 {
     // in order to make sure that a size event is not
     // trigerred in a unfinished state
 {
     // 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,
 }
 
 wxGrid::wxGrid( wxWindow *parent,


@@ -4067,19 +4139,18 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                           long style, const wxString& name)
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,

-                                  style | wxWANTS_CHARS , name))
+                                  style | wxWANTS_CHARS, name))

         return false;
 
         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;
 }
 
     SetBestFittingSize(size);
 
     return true;
 }
 

-

 wxGrid::~wxGrid()
 {
     // Must do this or ~wxScrollHelper will pop the wrong event handler
 wxGrid::~wxGrid()
 {
     // Must do this or ~wxScrollHelper will pop the wrong event handler


@@ -4102,7 +4173,6 @@ wxGrid::~wxGrid()
     delete m_selection;
 }
 
     delete m_selection;
 }
 

-

 //
 // ----- internal init and update functions
 //
 //
 // ----- internal init and update functions
 //


@@ -4111,16 +4181,17 @@ wxGrid::~wxGrid()
 // be removed as well as the #else cases below.
 #define _USE_VISATTR 0
 
 // be removed as well as the #else cases below.
 #define _USE_VISATTR 0
 

-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-

 void wxGrid::Create()
 {
 void wxGrid::Create()
 {

-    m_created = false;    // set to true by CreateGrid
+    // set to true by CreateGrid
+    m_created = false;

 
 

-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = false;
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
+    m_selection = NULL;
+
+    m_table = (wxGridTableBase *) NULL;
+    m_ownTable = false;

 
     m_cellEditCtrlEnabled = false;
 
 
     m_cellEditCtrlEnabled = false;
 


@@ -4155,16 +4226,7 @@ void wxGrid::Create()
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
     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
     // subwindow components that make up the wxGrid

-    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-                                                    wxID_ANY,
-                                                    wxDefaultPosition,
-                                                    wxDefaultSize );
-

     m_rowLabelWin = new wxGridRowLabelWindow( this,
                                               wxID_ANY,
                                               wxDefaultPosition,
     m_rowLabelWin = new wxGridRowLabelWindow( this,
                                               wxID_ANY,
                                               wxDefaultPosition,


@@ -4175,6 +4237,11 @@ void wxGrid::Create()
                                               wxDefaultPosition,
                                               wxDefaultSize );
 
                                               wxDefaultPosition,
                                               wxDefaultSize );
 

+    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+                                                    wxID_ANY,
+                                                    wxDefaultPosition,
+                                                    wxDefaultSize );
+

     m_gridWin = new wxGridWindow( this,
                                   m_rowLabelWin,
                                   m_colLabelWin,
     m_gridWin = new wxGridWindow( this,
                                   m_rowLabelWin,
                                   m_colLabelWin,


@@ -4195,6 +4262,7 @@ void wxGrid::Create()
     wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
 #endif
     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);
     m_cornerLabelWin->SetOwnForegroundColour(lfg);
     m_cornerLabelWin->SetOwnBackgroundColour(lbg);
     m_rowLabelWin->SetOwnForegroundColour(lfg);


@@ -4208,7 +4276,6 @@ void wxGrid::Create()
     Init();
 }
 
     Init();
 }
 

-

 bool wxGrid::CreateGrid( int numRows, int numCols,
                          wxGrid::wxGridSelectionModes selmode )
 {
 bool wxGrid::CreateGrid( int numRows, int numCols,
                          wxGrid::wxGridSelectionModes selmode )
 {


@@ -4257,17 +4324,19 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 
         if (m_ownTable)
         {
 
         if (m_ownTable)
         {

-            wxGridTableBase *t=m_table;
-            m_table=0;
+            wxGridTableBase *t = m_table;
+            m_table = NULL;

             delete t;
         }
             delete t;
         }

+

         delete m_selection;
 
         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();
     if (table)
     {
         m_numRows = table->GetNumberRows();


@@ -4286,7 +4355,6 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
     return m_created;
 }
 
     return m_created;
 }
 

-

 void wxGrid::Init()
 {
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
 void wxGrid::Init()
 {
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;


@@ -4298,10 +4366,10 @@ void wxGrid::Init()
     }
     else
     {
     }
     else
     {

-        m_labelBackgroundColour = wxColour( _T("WHITE") );
+        m_labelBackgroundColour = *wxWHITE;

     }
 
     }
 

-    m_labelTextColour = wxColour( _T("BLACK") );
+    m_labelTextColour = *wxBLACK;

 
     // init attr cache
     m_attrCache.row = -1;
 
     // init attr cache
     m_attrCache.row = -1;


@@ -4338,6 +4406,8 @@ void wxGrid::Init()
     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 
     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 

+    m_canDragColMove = false;
+

     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     m_canDragRowSize = true;
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     m_canDragRowSize = true;


@@ -4356,8 +4426,8 @@ void wxGrid::Init()
 
     m_currentCellCoords = wxGridNoCellCoords;
 
 
     m_currentCellCoords = wxGridNoCellCoords;
 

-    m_selectingTopLeft = wxGridNoCellCoords;
-    m_selectingBottomRight = wxGridNoCellCoords;
+    ClearSelection();
+

     m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 
     m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 


@@ -4395,7 +4465,7 @@ void wxGrid::InitRowHeights()
 
     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 
 
     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 );
     {
         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );


@@ -4413,9 +4483,9 @@ void wxGrid::InitColWidths()
 
     m_colWidths.Add( m_defaultColWidth, m_numCols );
 
 
     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;
+        colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;

         m_colRights.Add( colRight );
     }
 }
         m_colRights.Add( colRight );
     }
 }


@@ -4427,13 +4497,13 @@ int wxGrid::GetColWidth(int col) const
 
 int wxGrid::GetColLeft(int col) const
 {
 
 int wxGrid::GetColLeft(int col) const
 {

-    return m_colRights.IsEmpty() ? col * m_defaultColWidth
+    return m_colRights.IsEmpty() ? GetColPos( col ) * m_defaultColWidth

                                  : m_colRights[col] - m_colWidths[col];
 }
 
 int wxGrid::GetColRight(int col) const
 {
                                  : m_colRights[col] - m_colWidths[col];
 }
 
 int wxGrid::GetColRight(int col) const
 {

-    return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+    return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth

                                  : m_colRights[col];
 }
 
                                  : m_colRights[col];
 }
 


@@ -4465,30 +4535,30 @@ void wxGrid::CalcDimensions()
         ch -= m_colLabelHeight;
 
     // grid total size
         ch -= m_colLabelHeight;
 
     // grid total size

-    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+    int w = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) + m_extraWidth + 1 : 0;

     int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
 
     // take into account editor if shown
     if ( IsCellEditControlShown() )
     {
     int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
 
     // 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
     }
 
     // preserve (more or less) the previous position


@@ -4511,13 +4581,12 @@ void wxGrid::CalcDimensions()
     CalcWindowSizes();
 }
 
     CalcWindowSizes();
 }
 

-

 void wxGrid::CalcWindowSizes()
 {
     // escape if the window is has not been fully created yet
 
     if ( m_cornerLabelWin == NULL )
 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 );
 
     int cw, ch;
     GetClientSize( &cw, &ch );


@@ -4525,19 +4594,18 @@ void wxGrid::CalcWindowSizes()
     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
     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() )
 
     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() )
 
     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 )
 {
 //
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {


@@ -4547,12 +4615,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();
     // 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();
     // 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
 #if 0
     // if we were using the default widths/heights so far, we must change them
     // now


@@ -4582,14 +4652,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Insert( 0, pos, numRows );
 
                 int bottom = 0;
                 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;
                 }
             }
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }

+

             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current


@@ -4625,14 +4697,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Add( 0, numRows );
 
                 int bottom = 0;
                 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;
                 }
             }
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }

+

             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current


@@ -4640,6 +4714,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 //
                 SetCurrentCell( 0, 0 );
             }
                 //
                 SetCurrentCell( 0, 0 );
             }

+

             if ( !GetBatchCount() )
             {
                 CalcDimensions();
             if ( !GetBatchCount() )
             {
                 CalcDimensions();


@@ -4661,12 +4736,13 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.RemoveAt( pos, numRows );
 
                 int h = 0;
                 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;
                 }
             }
                 {
                     h += m_rowHeights[i];
                     m_rowBottoms[i] = h;
                 }
             }

+

             if ( !m_numRows )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
             if ( !m_numRows )
             {
                 m_currentCellCoords = wxGridNoCellCoords;


@@ -4683,6 +4759,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if (attrProvider)
             {
                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
             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
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch column attributes, unless we


@@ -4694,6 +4771,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
 #endif
             }
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
 #endif
             }

+

             if ( !GetBatchCount() )
             {
                 CalcDimensions();
             if ( !GetBatchCount() )
             {
                 CalcDimensions();


@@ -4709,20 +4787,44 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt2();
             m_numCols += numCols;
 
             int numCols = msg.GetCommandInt2();
             m_numCols += numCols;
 

+            if ( !m_colAt.IsEmpty() )
+            {
+                //Shift the column IDs
+                int i;
+                for ( i = 0; i < m_numCols - numCols; i++ )
+                {
+                    if ( m_colAt[i] >= (int)pos )
+                        m_colAt[i] += numCols;
+                }
+
+                m_colAt.Insert( pos, pos, numCols );
+
+                //Set the new columns' positions
+                for ( i = pos + 1; i < (int)pos + numCols; i++ )
+                {
+                    m_colAt[i] = i;
+                }
+            }
+

             if ( !m_colWidths.IsEmpty() )
             {
                 m_colWidths.Insert( m_defaultColWidth, pos, numCols );
                 m_colRights.Insert( 0, pos, numCols );
 
                 int right = 0;
             if ( !m_colWidths.IsEmpty() )
             {
                 m_colWidths.Insert( m_defaultColWidth, pos, numCols );
                 m_colRights.Insert( 0, pos, numCols );
 
                 int right = 0;

-                if ( pos > 0 ) right = m_colRights[pos-1];
+                if ( pos > 0 )
+                    right = m_colRights[GetColAt( pos - 1 )];

 
 

-                for ( i = pos;  i < m_numCols;  i++ )
+                int colPos;
+                for ( colPos = pos; colPos < m_numCols; colPos++ )

                 {
                 {

+                    i = GetColAt( colPos );
+

                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }
                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }

+

             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current


@@ -4741,7 +4843,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 CalcDimensions();
                 m_colLabelWin->Refresh();
             }
                 CalcDimensions();
                 m_colLabelWin->Refresh();
             }

-

         }
         result = true;
         break;
         }
         result = true;
         break;


@@ -4751,20 +4852,38 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;

+
+            if ( !m_colAt.IsEmpty() )
+            {
+                m_colAt.Add( 0, numCols );
+
+                //Set the new columns' positions
+                int i;
+                for ( i = oldNumCols; i < m_numCols; i++ )
+                {
+                    m_colAt[i] = i;
+                }
+            }
+

             if ( !m_colWidths.IsEmpty() )
             {
                 m_colWidths.Add( m_defaultColWidth, numCols );
                 m_colRights.Add( 0, numCols );
 
                 int right = 0;
             if ( !m_colWidths.IsEmpty() )
             {
                 m_colWidths.Add( m_defaultColWidth, numCols );
                 m_colRights.Add( 0, numCols );
 
                 int right = 0;

-                if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+                if ( oldNumCols > 0 )
+                    right = m_colRights[GetColAt( oldNumCols - 1 )];

 
 

-                for ( i = oldNumCols;  i < m_numCols;  i++ )
+                int colPos;
+                for ( colPos = oldNumCols; colPos < m_numCols; colPos++ )

                 {
                 {

+                    i = GetColAt( colPos );
+

                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }
                     right += m_colWidths[i];
                     m_colRights[i] = right;
                 }
             }

+

             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current


@@ -4787,18 +4906,37 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt2();
             m_numCols -= numCols;
 
             int numCols = msg.GetCommandInt2();
             m_numCols -= numCols;
 

-            if ( !m_colWidths.IsEmpty() )
+            if ( !m_colAt.IsEmpty() )

             {
             {

-                m_colWidths.RemoveAt( pos, numCols );
-                m_colRights.RemoveAt( pos, numCols );
+                int colID = GetColAt( pos );

 
 

-                int w = 0;
-                for ( i = 0;  i < m_numCols;  i++ )
+                m_colAt.RemoveAt( pos, numCols );
+
+                //Shift the column IDs
+                int colPos;
+                for ( colPos = 0; colPos < m_numCols; colPos++ )
+                {
+                    if ( m_colAt[colPos] > colID )
+                        m_colAt[colPos] -= numCols;
+                }
+            }
+
+            if ( !m_colWidths.IsEmpty() )
+            {
+                m_colWidths.RemoveAt( pos, numCols );
+                m_colRights.RemoveAt( pos, numCols );
+
+                int w = 0;
+                int colPos;
+                for ( colPos = 0; colPos < m_numCols; colPos++ )

                 {
                 {

+                    i = GetColAt( colPos );
+

                     w += m_colWidths[i];
                     m_colRights[i] = w;
                 }
             }
                     w += m_colWidths[i];
                     m_colRights[i] = w;
                 }
             }

+

             if ( !m_numCols )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
             if ( !m_numCols )
             {
                 m_currentCellCoords = wxGridNoCellCoords;


@@ -4815,6 +4953,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if (attrProvider)
             {
                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
             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
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch row attributes, unless we


@@ -4826,6 +4965,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
 #endif
             }
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
 #endif
             }

+

             if ( !GetBatchCount() )
             {
                 CalcDimensions();
             if ( !GetBatchCount() )
             {
                 CalcDimensions();


@@ -4838,10 +4978,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
 
     if (result && !GetBatchCount() )
         m_gridWin->Refresh();
 
     if (result && !GetBatchCount() )
         m_gridWin->Refresh();

+

     return result;
 }
 
     return result;
 }
 

-

 wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
 wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );


@@ -4862,7 +5002,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 #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
 
         r.SetBottom( wxMin( r.GetBottom(), ch ) );
 #endif
 


@@ -4875,7 +5016,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
         // find the row labels within these bounds
         //
         int row;
         // 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;
         {
             if ( GetRowBottom(row) < top )
                 continue;


@@ -4892,7 +5033,6 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
     return rowlabels;
 }
 
     return rowlabels;
 }
 

-

 wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
 wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );


@@ -4913,7 +5053,8 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 #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
 
         r.SetRight( wxMin( r.GetRight(), cw ) );
 #endif
 


@@ -4926,8 +5067,11 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
         // find the cells within these bounds
         //
         int col;
         // find the cells within these bounds
         //
         int col;

-        for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+        int colPos;
+        for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )

         {
         {

+            col = GetColAt( colPos );
+

             if ( GetColRight(col) < left )
                 continue;
 
             if ( GetColRight(col) < left )
                 continue;
 


@@ -4939,10 +5083,10 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 
         ++iter;
     }
 
         ++iter;
     }

+

     return colLabels;
 }
 
     return colLabels;
 }
 

-

 wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
 wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );


@@ -4977,7 +5121,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
         // find the cells within these bounds
         //
         int row, col;
         // 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;
         {
             if ( GetRowBottom(row) <= top )
                 continue;


@@ -4985,8 +5129,11 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
             if ( GetRowTop(row) > bottom )
                 break;
 
             if ( GetRowTop(row) > bottom )
                 break;
 

-            for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+            int colPos;
+            for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )

             {
             {

+                col = GetColAt( colPos );
+

                 if ( GetColRight(col) <= left )
                     continue;
 
                 if ( GetColRight(col) <= left )
                     continue;
 


@@ -5073,7 +5220,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
 
     if (m_isDragging)
     {

-        if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
+        if (m_rowLabelWin->HasCapture())
+            m_rowLabelWin->ReleaseMouse();

         m_isDragging = false;
     }
 
         m_isDragging = false;
     }
 


@@ -5084,7 +5232,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
     }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
     }
 

-

     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )


@@ -5096,10 +5243,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         if ( YToEdgeOfRow(y) < 0 )
         {
             row = YToRow(y);
         if ( YToEdgeOfRow(y) < 0 )
         {
             row = YToRow(y);

-            if ( row >= 0  &&
+            if ( row >= 0 &&

                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {

-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )

                     ClearSelection();
                 if ( m_selection )
                 {
                     ClearSelection();
                 if ( m_selection )
                 {


@@ -5130,13 +5277,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         else
         {
             // starting to drag-resize a row
         else
         {
             // starting to drag-resize a row

-            //

             if ( CanDragRowSize() )
                 ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
         }
     }
 
             if ( CanDragRowSize() )
                 ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
         }
     }
 

-

     // ------------ Left double click
     //
     else if (event.LeftDClick() )
     // ------------ Left double click
     //
     else if (event.LeftDClick() )


@@ -5157,11 +5302,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             AutoSizeRowLabelSize( row );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
             AutoSizeRowLabelSize( row );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);

-            m_dragLastPos  = -1;
+            m_dragLastPos = -1;

         }
     }
 
         }
     }
 

-

     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     // ------------ Left button released
     //
     else if ( event.LeftUp() )


@@ -5180,7 +5324,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         m_dragLastPos = -1;
     }
 
         m_dragLastPos = -1;
     }
 

-

     // ------------ Right button down
     //
     else if ( event.RightDown() )
     // ------------ Right button down
     //
     else if ( event.RightDown() )


@@ -5193,7 +5336,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ Right double click
     //
     else if ( event.RightDClick() )
     // ------------ Right double click
     //
     else if ( event.RightDClick() )


@@ -5206,7 +5348,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )


@@ -5228,7 +5369,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
     }
 }
 

-

 void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 {
     int x, y, col;
 void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 {
     int x, y, col;


@@ -5241,6 +5381,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         {
             m_isDragging = true;
             m_colLabelWin->CaptureMouse();
         {
             m_isDragging = true;
             m_colLabelWin->CaptureMouse();

+
+            if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL )
+                m_dragRowOrCol = XToCol( x );

         }
 
         if ( event.LeftIsDown() )
         }
 
         if ( event.LeftIsDown() )


@@ -5261,9 +5404,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {
                     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;
                     m_dragLastPos = x;
                 }
                 break;


@@ -5284,6 +5427,63 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                 }
                 break;
 
                 }
                 break;
 

+                case WXGRID_CURSOR_MOVE_COL:
+                {
+                    if ( x < 0 )
+                        m_moveToCol = GetColAt( 0 );
+                    else
+                        m_moveToCol = XToCol( x );
+
+                    int markerX;
+
+                    if ( m_moveToCol < 0 )
+                        markerX = GetColRight( GetColAt( m_numCols - 1 ) );
+                    else
+                        markerX = GetColLeft( m_moveToCol );
+
+                    if ( markerX != m_dragLastPos )
+                    {
+                        wxClientDC dc( m_colLabelWin );
+
+                        int cw, ch;
+                        m_colLabelWin->GetClientSize( &cw, &ch );
+
+                        markerX++;
+
+                        //Clean up the last indicator
+                        if ( m_dragLastPos >= 0 )
+                        {
+                            wxPen pen( m_colLabelWin->GetBackgroundColour(), 2 );
+                            dc.SetPen(pen);
+                            dc.DrawLine( m_dragLastPos + 1, 0, m_dragLastPos + 1, ch );
+                            dc.SetPen(wxNullPen);
+
+                            if ( XToCol( m_dragLastPos ) != -1 )
+                                DrawColLabel( dc, XToCol( m_dragLastPos ) );
+                        }
+
+                        //Moving to the same place? Don't draw a marker
+                        if ( (m_moveToCol == m_dragRowOrCol)
+                          || (GetColPos( m_moveToCol ) == GetColPos( m_dragRowOrCol ) + 1)
+                          || (m_moveToCol < 0 && m_dragRowOrCol == GetColAt( m_numCols - 1 )))
+                        {
+                            m_dragLastPos = -1;
+                            return;
+                        }
+
+                        //Draw the marker
+                        wxPen pen( *wxBLUE, 2 );
+                        dc.SetPen(pen);
+
+                        dc.DrawLine( markerX, 0, markerX, ch );
+
+                        dc.SetPen(wxNullPen);
+
+                        m_dragLastPos = markerX - 1;
+                    }
+                }
+                break;
+

                 // default label to suppress warnings about "enumeration value
                 // 'xxx' not handled in switch
                 default:
                 // default label to suppress warnings about "enumeration value
                 // 'xxx' not handled in switch
                 default:


@@ -5298,7 +5498,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
 
     if (m_isDragging)
     {

-        if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
+        if (m_colLabelWin->HasCapture())
+            m_colLabelWin->ReleaseMouse();

         m_isDragging = false;
     }
 
         m_isDragging = false;
     }
 


@@ -5309,7 +5510,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
     }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
     }
 

-

     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )


@@ -5321,34 +5521,49 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         if ( XToEdgeOfCol(x) < 0 )
         {
             col = XToCol(x);
         if ( XToEdgeOfCol(x) < 0 )
         {
             col = XToCol(x);

-            if ( col >= 0  &&
+            if ( col >= 0 &&

                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {

-                if ( !event.ShiftDown() && !event.ControlDown() )
-                    ClearSelection();
-                if ( m_selection )
+                if ( m_canDragColMove )

                 {
                 {

-                    if ( event.ShiftDown() )
-                    {
-                        m_selection->SelectBlock( 0,
-                                                  m_currentCellCoords.GetCol(),
-                                                  GetNumberRows() - 1, col,
-                                                  event.ControlDown(),
-                                                  event.ShiftDown(),
-                                                  event.AltDown(),
-                                                  event.MetaDown() );
-                    }
-                    else
+                    //Show button as pressed
+                    wxClientDC dc( m_colLabelWin );
+                    int colLeft = GetColLeft( col );
+                    int colRight = GetColRight( col ) - 1;
+                    dc.SetPen( wxPen( m_colLabelWin->GetBackgroundColour(), 1 ) );
+                    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+                    dc.DrawLine( colLeft, 1, colRight, 1 );
+
+                    ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, m_colLabelWin);
+                }
+                else
+                {
+                    if ( !event.ShiftDown() && !event.CmdDown() )
+                        ClearSelection();
+                    if ( m_selection )

                     {
                     {

-                        m_selection->SelectCol( col,
-                                                event.ControlDown(),
-                                                event.ShiftDown(),
-                                                event.AltDown(),
-                                                event.MetaDown() );
+                        if ( event.ShiftDown() )
+                        {
+                            m_selection->SelectBlock( 0,
+                                                      m_currentCellCoords.GetCol(),
+                                                      GetNumberRows() - 1, col,
+                                                      event.ControlDown(),
+                                                      event.ShiftDown(),
+                                                      event.AltDown(),
+                                                      event.MetaDown() );
+                        }
+                        else
+                        {
+                            m_selection->SelectCol( col,
+                                                    event.ControlDown(),
+                                                    event.ShiftDown(),
+                                                    event.AltDown(),
+                                                    event.MetaDown() );
+                        }

                     }
                     }

-                }

 
 

-                ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+                    ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+                }

             }
         }
         else
             }
         }
         else


@@ -5360,7 +5575,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ Left double click
     //
     if ( event.LeftDClick() )
     // ------------ Left double click
     //
     if ( event.LeftDClick() )


@@ -5381,30 +5595,43 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             AutoSizeColLabelSize( col );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
             AutoSizeColLabelSize( col );
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);

-            m_dragLastPos  = -1;
+            m_dragLastPos = -1;

         }
     }
 
         }
     }
 

-

     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     {
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     {

-        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        switch ( m_cursorMode )

         {
         {

-            DoEndDragResizeCol();
+            case WXGRID_CURSOR_RESIZE_COL:
+                DoEndDragResizeCol();

 
 

-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+                // Note: we are ending the event *after* doing
+                // default processing in this case
+                //
+                SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+                break;
+
+            case WXGRID_CURSOR_MOVE_COL:
+                DoEndDragMoveCol();
+
+                SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );
+                break;
+
+            case WXGRID_CURSOR_SELECT_COL:
+            case WXGRID_CURSOR_SELECT_CELL:
+            case WXGRID_CURSOR_RESIZE_ROW:
+            case WXGRID_CURSOR_SELECT_ROW:
+                // nothing to do (?)
+                break;

         }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
         }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);

-        m_dragLastPos  = -1;
+        m_dragLastPos = -1;

     }
 
     }
 

-

     // ------------ Right button down
     //
     else if ( event.RightDown() )
     // ------------ Right button down
     //
     else if ( event.RightDown() )


@@ -5417,7 +5644,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ Right double click
     //
     else if ( event.RightDClick() )
     // ------------ Right double click
     //
     else if ( event.RightDClick() )


@@ -5430,7 +5656,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )


@@ -5452,7 +5677,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
     }
 }
 

-

 void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
 {
     if ( event.LeftDown() )
 void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
 {
     if ( event.LeftDown() )


@@ -5465,12 +5689,10 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             SelectAll();
         }
     }
             SelectAll();
         }
     }

-

     else if ( event.LeftDClick() )
     {
         SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
     }
     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 ) )
     else if ( event.RightDown() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )


@@ -5478,7 +5700,6 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             // no default action at the moment
         }
     }
             // no default action at the moment
         }
     }

-

     else if ( event.RightDClick() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
     else if ( event.RightDClick() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )


@@ -5499,7 +5720,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
         _T("RESIZE_ROW"),
         _T("RESIZE_COL"),
         _T("SELECT_ROW"),
         _T("RESIZE_ROW"),
         _T("RESIZE_COL"),
         _T("SELECT_ROW"),

-        _T("SELECT_COL")
+        _T("SELECT_COL"),
+        _T("MOVE_COL"),

     };
 
     wxLogTrace(_T("grid"),
     };
 
     wxLogTrace(_T("grid"),


@@ -5508,7 +5730,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                                     : win ? _T("rowLabelWin")
                                           : _T("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);
                                     : win ? _T("rowLabelWin")
                                           : _T("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);

-#endif // __WXDEBUG__
+#endif

 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&
 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&


@@ -5523,7 +5745,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
 
     if ( m_winCapture )
     {
 
     if ( m_winCapture )
     {

-        if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+        if (m_winCapture->HasCapture())
+            m_winCapture->ReleaseMouse();

         m_winCapture = (wxWindow *)NULL;
     }
 
         m_winCapture = (wxWindow *)NULL;
     }
 


@@ -5539,8 +5762,13 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
             win->SetCursor( m_colResizeCursor );
             break;
 
             win->SetCursor( m_colResizeCursor );
             break;
 

+        case WXGRID_CURSOR_MOVE_COL:
+            win->SetCursor( wxCursor(wxCURSOR_HAND) );
+            break;
+

         default:
             win->SetCursor( *wxSTANDARD_CURSOR );
         default:
             win->SetCursor( *wxSTANDARD_CURSOR );

+            break;

     }
 
     // we need to capture mouse when resizing
     }
 
     // we need to capture mouse when resizing


@@ -5609,11 +5837,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             if ( coords != wxGridNoCellCoords )
             {
 
             if ( coords != wxGridNoCellCoords )
             {

-                if ( event.ControlDown() )
+                if ( event.CmdDown() )

                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;
                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;

-                    HighlightBlock ( m_selectingKeyboard, coords );
+                    HighlightBlock( m_selectingKeyboard, coords );

                 }
                 else if ( CanDragCell() )
                 {
                 }
                 else if ( CanDragCell() )
                 {


@@ -5679,9 +5907,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {
             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;
         }
 
             m_dragLastPos = x;
         }
 


@@ -5712,7 +5940,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                        coords.GetCol(),
                        event ) )
         {
                        coords.GetCol(),
                        event ) )
         {

-            if ( !event.ControlDown() )
+            if ( !event.CmdDown() )

                 ClearSelection();
             if ( event.ShiftDown() )
             {
                 ClearSelection();
             if ( event.ShiftDown() )
             {


@@ -5728,13 +5956,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                                               event.MetaDown() );
                 }
             }
                                               event.MetaDown() );
                 }
             }

-            else if ( XToEdgeOfCol(x) < 0  &&
+            else if ( XToEdgeOfCol(x) < 0 &&

                       YToEdgeOfRow(y) < 0 )
             {
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 
                       YToEdgeOfRow(y) < 0 )
             {
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 

-                if ( event.ControlDown() )
+                if ( event.CmdDown() )

                 {
                     if ( m_selection )
                     {
                 {
                     if ( m_selection )
                     {


@@ -5766,14 +5994,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ Left double click
     //
     else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
     {
         DisableCellEditControl();
 
     // ------------ 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(),
         {
             if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
                              coords.GetRow(),


@@ -5785,10 +6012,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 m_waitForSlowClick = true;
             }
         }
                 m_waitForSlowClick = true;
             }
         }

-

     }
 
     }
 

-

     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     // ------------ Left button released
     //
     else if ( event.LeftUp() )


@@ -5797,16 +6022,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         {
             if (m_winCapture)
             {
         {
             if (m_winCapture)
             {

-                if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                if (m_winCapture->HasCapture())
+                    m_winCapture->ReleaseMouse();

                 m_winCapture = NULL;
             }
 
                 m_winCapture = NULL;
             }
 

-            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )

             {
                 ClearSelection();
                 EnableCellEditControl();
 
             {
                 ClearSelection();
                 EnableCellEditControl();
 

-                wxGridCellAttr* attr = GetCellAttr(coords);
+                wxGridCellAttr *attr = GetCellAttr(coords);

                 wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
                 editor->StartingClick();
                 editor->DecRef();
                 wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
                 editor->StartingClick();
                 editor->DecRef();


@@ -5861,7 +6087,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         m_dragLastPos = -1;
     }
 
         m_dragLastPos = -1;
     }
 

-

     // ------------ Right button down
     //
     else if ( event.RightDown() && coords != wxGridNoCellCoords )
     // ------------ Right button down
     //
     else if ( event.RightDown() && coords != wxGridNoCellCoords )


@@ -5876,7 +6101,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

     // ------------ Right double click
     //
     else if ( event.RightDClick() && coords != wxGridNoCellCoords )
     // ------------ Right double click
     //
     else if ( event.RightDClick() && coords != wxGridNoCellCoords )


@@ -5944,7 +6168,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     }
 }
 
     }
 }
 

-

 void wxGrid::DoEndDragResizeRow()
 {
     if ( m_dragLastPos >= 0 )
 void wxGrid::DoEndDragResizeRow()
 {
     if ( m_dragLastPos >= 0 )


@@ -5958,7 +6181,7 @@ void wxGrid::DoEndDragResizeRow()
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );
         dc.SetLogicalFunction( wxINVERT );
         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();
 
         HideCellEditControl();
         SaveEditControlValue();
 


@@ -5976,12 +6199,13 @@ void wxGrid::DoEndDragResizeRow()
             rect.height = ch - rect.y;
             m_rowLabelWin->Refresh( true, &rect );
             rect.width = cw;
             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);
             // 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++)
                 if (leftCol >= 0)
                 {
                     for (i=leftCol; i<rightCol; i++)


@@ -6016,7 +6240,7 @@ void wxGrid::DoEndDragResizeCol()
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );
         dc.SetLogicalFunction( wxINVERT );
         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();
 
         HideCellEditControl();
         SaveEditControlValue();
 


@@ -6035,12 +6259,13 @@ void wxGrid::DoEndDragResizeCol()
             rect.height = m_colLabelHeight;
             m_colLabelWin->Refresh( true, &rect );
             rect.height = ch;
             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);
             // 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++)
                 if (topRow >= 0)
                 {
                     for (i=topRow; i<bottomRow; i++)


@@ -6049,11 +6274,13 @@ void wxGrid::DoEndDragResizeCol()
                         if (cell_cols < subtract_cols)
                             subtract_cols = cell_cols;
                     }
                         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;
                 }
             }
                     rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
                     CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
                     rect.width = cw - rect.x;
                 }
             }

+

             m_gridWin->Refresh( false, &rect );
         }
 
             m_gridWin->Refresh( false, &rect );
         }
 


@@ -6061,6 +6288,110 @@ void wxGrid::DoEndDragResizeCol()
     }
 }
 
     }
 }
 

+void wxGrid::DoEndDragMoveCol()
+{
+    //The user clicked on the column but didn't actually drag
+    if ( m_dragLastPos < 0 )
+    {
+        m_colLabelWin->Refresh();   //Do this to "unpress" the column
+        return;
+    }
+
+    int newPos;
+    if ( m_moveToCol == -1 )
+        newPos = m_numCols - 1;
+    else
+    {
+        newPos = GetColPos( m_moveToCol );
+        if ( newPos > GetColPos( m_dragRowOrCol ) )
+            newPos--;
+    }
+
+    SetColPos( m_dragRowOrCol, newPos );
+}
+
+void wxGrid::SetColPos( int colID, int newPos )
+{
+    if ( m_colAt.IsEmpty() )
+    {
+        m_colAt.Alloc( m_numCols );
+
+        int i;
+        for ( i = 0; i < m_numCols; i++ )
+        {
+            m_colAt.Add( i );
+        }
+    }
+
+    int oldPos = GetColPos( colID );
+
+    //Reshuffle the m_colAt array
+    if ( newPos > oldPos )
+    {
+        int i;
+        for ( i = oldPos; i < newPos; i++ )
+        {
+            m_colAt[i] = m_colAt[i+1];
+        }
+    }
+    else
+    {
+        int i;
+        for ( i = oldPos; i > newPos; i-- )
+        {
+            m_colAt[i] = m_colAt[i-1];
+        }
+    }
+
+    m_colAt[newPos] = colID;
+
+    //Recalculate the column rights
+    if ( !m_colWidths.IsEmpty() )
+    {
+        int colRight = 0;
+        int colPos;
+        for ( colPos = 0; colPos < m_numCols; colPos++ )
+        {
+            int colID = GetColAt( colPos );
+
+            colRight += m_colWidths[colID];
+            m_colRights[colID] = colRight;
+        }
+    }
+
+    m_colLabelWin->Refresh();
+    m_gridWin->Refresh();
+}
+
+
+
+void wxGrid::EnableDragColMove( bool enable )
+{
+    if ( m_canDragColMove == enable )
+        return;
+
+    m_canDragColMove = enable;
+
+    if ( !m_canDragColMove )
+    {
+        m_colAt.Clear();
+
+        //Recalculate the column rights
+        if ( !m_colWidths.IsEmpty() )
+        {
+            int colRight = 0;
+            int colPos;
+            for ( colPos = 0; colPos < m_numCols; colPos++ )
+            {
+                colRight += m_colWidths[colPos];
+                m_colRights[colPos] = colRight;
+            }
+        }
+
+        m_colLabelWin->Refresh();
+        m_gridWin->Refresh();
+    }
+}

 
 
 //
 
 
 //


@@ -6089,10 +6420,8 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
     }
 }
 
     }
 }
 

-
-

 // The behaviour of this function depends on the grid table class
 // 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.
 //
 // behavious is to replace all cell contents with wxEmptyString but
 // not to change the number of rows or cols.
 //


@@ -6104,11 +6433,11 @@ void wxGrid::ClearGrid()
             DisableCellEditControl();
 
         m_table->Clear();
             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
 bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6130,10 +6459,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
     }
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
 bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6148,13 +6477,14 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
     {
         bool done = m_table && m_table->AppendRows( numRows );
         return done;
     {
         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
     }
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
 bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6175,10 +6505,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
     }
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
 bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6199,10 +6529,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
     }
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
 bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6220,10 +6550,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
     }
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag
 bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 {
     // TODO: something with updateLabels flag


@@ -6244,11 +6574,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
     }
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message
     }

+

     return false;
 }
 
     return false;
 }
 

-
-

 //
 // ----- event handlers
 //
 //
 // ----- event handlers
 //


@@ -6260,8 +6589,7 @@ int wxGrid::SendEvent( const wxEventType type,
                         int row, int col,
                         wxMouseEvent& mouseEv )
 {
                         int row, int col,
                         wxMouseEvent& mouseEv )
 {

-   bool claimed;
-   bool vetoed;
+   bool claimed, vetoed;

 
    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
    {
 
    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
    {


@@ -6298,6 +6626,32 @@ int wxGrid::SendEvent( const wxEventType type,
        claimed = GetEventHandler()->ProcessEvent(gridEvt);
        vetoed = !gridEvt.IsAllowed();
    }
        claimed = GetEventHandler()->ProcessEvent(gridEvt);
        vetoed = !gridEvt.IsAllowed();
    }

+   else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK ||
+             type == wxEVT_GRID_LABEL_LEFT_DCLICK ||
+             type == wxEVT_GRID_LABEL_RIGHT_CLICK ||
+             type == wxEVT_GRID_LABEL_RIGHT_DCLICK )
+   {
+       wxPoint pos = mouseEv.GetPosition();
+
+       if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() )
+           pos.y += GetColLabelSize();
+       if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
+           pos.x += GetRowLabelSize();
+       
+       wxGridEvent gridEvt( GetId(),
+               type,
+               this,
+               row, col,
+               pos.x,
+               pos.y,
+               false,
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }

    else
    {
        wxGridEvent gridEvt( GetId(),
    else
    {
        wxGridEvent gridEvt( GetId(),


@@ -6322,34 +6676,26 @@ int wxGrid::SendEvent( const wxEventType type,
    return claimed ? 1 : 0;
 }
 
    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 )
 {
 // 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);
 
 
     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
     {
 
         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();
 
         claimed = GetEventHandler()->ProcessEvent(gridEvt);
         vetoed  = !gridEvt.IsAllowed();


@@ -6364,7 +6710,8 @@ int wxGrid::SendEvent( const wxEventType type,
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 
 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)
 }
 
 void wxGrid::Refresh(bool eraseb, const wxRect* rect)


@@ -6382,7 +6729,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
             int width_label, width_cell, height_label, height_cell;
             int x, y;
 
             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();
             rect_x = rect->GetX();
             rect_y = rect->GetY();
             rectWidth = rect->GetWidth();


@@ -6393,7 +6740,8 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
                 width_label = rectWidth;
 
             height_label = m_colLabelHeight - rect_y;
                 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)
             {
 
             if (rect_x > m_rowLabelWidth)
             {


@@ -6465,7 +6813,6 @@ void wxGrid::OnSize( wxSizeEvent& event )
     event.Skip();
 }
 
     event.Skip();
 }
 

-

 void wxGrid::OnKeyDown( wxKeyEvent& event )
 {
     if ( m_inOnKeyDown )
 void wxGrid::OnKeyDown( wxKeyEvent& event )
 {
     if ( m_inOnKeyDown )


@@ -6478,60 +6825,49 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
     m_inOnKeyDown = true;
 
     // propagate the event up and see if it gets processed
     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 ) )
     {
     wxWindow *parent = GetParent();
     wxKeyEvent keyEvt( event );
     keyEvt.SetEventObject( parent );
 
     if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
     {

-
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            if (event.GetKeyCode() == WXK_RIGHT)
+                event.m_keyCode = WXK_LEFT;
+            else if (event.GetKeyCode() == WXK_LEFT)
+                event.m_keyCode = WXK_RIGHT;
+        }
+    

         // try local handlers
         // try local handlers

-        //

         switch ( event.GetKeyCode() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )
         switch ( event.GetKeyCode() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )

-                {

                     MoveCursorUpBlock( event.ShiftDown() );
                     MoveCursorUpBlock( event.ShiftDown() );

-                }

                 else
                 else

-                {

                     MoveCursorUp( event.ShiftDown() );
                     MoveCursorUp( event.ShiftDown() );

-                }

                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )

-                {

                     MoveCursorDownBlock( event.ShiftDown() );
                     MoveCursorDownBlock( event.ShiftDown() );

-                }

                 else
                 else

-                {

                     MoveCursorDown( event.ShiftDown() );
                     MoveCursorDown( event.ShiftDown() );

-                }

                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )

-                {

                     MoveCursorLeftBlock( event.ShiftDown() );
                     MoveCursorLeftBlock( event.ShiftDown() );

-                }

                 else
                 else

-                {

                     MoveCursorLeft( event.ShiftDown() );
                     MoveCursorLeft( event.ShiftDown() );

-                }

                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )

-                {

                     MoveCursorRightBlock( event.ShiftDown() );
                     MoveCursorRightBlock( event.ShiftDown() );

-                }

                 else
                 else

-                {

                     MoveCursorRight( event.ShiftDown() );
                     MoveCursorRight( event.ShiftDown() );

-                }

                 break;
 
             case WXK_RETURN:
                 break;
 
             case WXK_RETURN:


@@ -6573,7 +6909,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 else
                 {
                 }
                 else
                 {

-                    if ( GetGridCursorCol() < GetNumberCols()-1 )
+                    if ( GetGridCursorCol() < GetNumberCols() - 1 )

                     {
                         MoveCursorRight( false );
                     }
                     {
                         MoveCursorRight( false );
                     }


@@ -6600,8 +6936,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
             case WXK_END:
                 if ( event.ControlDown() )
                 {
             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
                 {
                 }
                 else
                 {


@@ -6609,11 +6945,11 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 break;
 
                 }
                 break;
 

-            case WXK_PRIOR:
+            case WXK_PAGEUP:

                 MovePageUp();
                 break;
 
                 MovePageUp();
                 break;
 

-            case WXK_NEXT:
+            case WXK_PAGEDOWN:

                 MovePageDown();
                 break;
 
                 MovePageDown();
                 break;
 


@@ -6622,21 +6958,22 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( m_selection )
                     {
                 {
                     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;
                 }
                     }
                     break;
                 }

+

                 if ( !IsEditable() )
                 if ( !IsEditable() )

-                {

                     MoveCursorRight( false );
                     MoveCursorRight( false );

-                    break;
-                }
-                // Otherwise fall through to default
+                else
+                    event.Skip();
+                break;

 
             default:
                 event.Skip();
 
             default:
                 event.Skip();


@@ -6658,14 +6995,15 @@ void wxGrid::OnKeyUp( wxKeyEvent& event )
         {
             if ( m_selection )
             {
         {
             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() );

             }
         }
 
             }
         }
 


@@ -6683,7 +7021,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();
         // 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
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
 
         // <F2> is special and will always start editing, for


@@ -6716,7 +7054,6 @@ void wxGrid::OnChar( wxKeyEvent& event )
     }
 }
 
     }
 }
 

-

 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }


@@ -6729,8 +7066,8 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
         return;
     }
 

-    wxClientDC dc(m_gridWin);
-    PrepareDC(dc);
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );

 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {


@@ -6739,7 +7076,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         if ( IsVisible( m_currentCellCoords, false ) )
         {
             wxRect r;
         if ( IsVisible( m_currentCellCoords, false ) )
         {
             wxRect r;

-            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );

             if ( !m_gridLinesEnabled )
             {
                 r.x--;
             if ( !m_gridLinesEnabled )
             {
                 r.x--;


@@ -6753,19 +7090,18 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 

-            DrawGridCellArea(dc,cells);
+            DrawGridCellArea( dc, cells );

             DrawAllGridLines( dc, r );
         }
     }
 
     m_currentCellCoords = coords;
 
             DrawAllGridLines( dc, r );
         }
     }
 
     m_currentCellCoords = coords;
 

-    wxGridCellAttr* attr = GetCellAttr(coords);
-    DrawCellHighlight(dc, attr);
+    wxGridCellAttr *attr = GetCellAttr( coords );
+    DrawCellHighlight( dc, attr );

     attr->DecRef();
 }
 
     attr->DecRef();
 }
 

-

 void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 {
     int temp;
 void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 {
     int temp;


@@ -6811,6 +7147,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
                                   wxGridCellCoords ( bottomRow, rightCol ) );
         m_gridWin->Refresh( false, &rect );
     }
                                   wxGridCellCoords ( bottomRow, rightCol ) );
         m_gridWin->Refresh( false, &rect );
     }

+

     // Now handle changing an existing selection area.
     else if ( m_selectingTopLeft != updateTopLeft ||
               m_selectingBottomRight != updateBottomRight )
     // Now handle changing an existing selection area.
     else if ( m_selectingTopLeft != updateTopLeft ||
               m_selectingBottomRight != updateBottomRight )


@@ -6827,9 +7164,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         int     i;
 
         // Store intermediate values
         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.
         wxCoord oldBottom = m_selectingBottomRight.GetRow();
 
         // Determine the outer/inner coordinates.


@@ -6867,21 +7204,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;
             // 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;
         {
             // 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 )
         }
 
         if ( oldRight > rightCol )


@@ -6889,10 +7224,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;
             // 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 )
         }
 
         if ( oldBottom > bottomRow )


@@ -6900,10 +7234,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;
             // 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
         }
 
         // various Refresh() calls


@@ -6911,7 +7244,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]) );
     }
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
                 m_gridWin->Refresh( false, &(rect[i]) );
     }

-    // Change Selection
+
+    // change selection

     m_selectingTopLeft = updateTopLeft;
     m_selectingBottomRight = updateBottomRight;
 }
     m_selectingTopLeft = updateTopLeft;
     m_selectingBottomRight = updateBottomRight;
 }


@@ -6936,7 +7270,6 @@ bool wxGrid::GetModelValues()
     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::SetModelValues()
 {
     int row, col;
 bool wxGrid::SetModelValues()
 {
     int row, col;


@@ -6948,9 +7281,9 @@ bool wxGrid::SetModelValues()
 
     if ( m_table )
     {
 
     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) );
             }
             {
                 m_table->SetValue( row, col, GetCellValue(row, col) );
             }


@@ -6962,8 +7295,6 @@ bool wxGrid::SetModelValues()
     return false;
 }
 
     return false;
 }
 

-
-

 // Note - this function only draws cells that are in the list of
 // exposed cells (usually set from the update region by
 // CalcExposedCells)
 // Note - this function only draws cells that are in the list of
 // exposed cells (usually set from the update region by
 // CalcExposedCells)


@@ -6977,7 +7308,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
     int row, col, cell_rows, cell_cols;
     wxGridCellCoordsArray redrawCells;
 
     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();
     {
         row = cells[i].GetRow();
         col = cells[i].GetCol();


@@ -6986,9 +7317,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 )
         {
         // 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;
             bool marked = false;

-            for ( int j = 0;  j < numCells;  j++ )
+            for ( int j = 0; j < numCells; j++ )

             {
                 if ( cell == cells[j] )
                 {
             {
                 if ( cell == cells[j] )
                 {


@@ -6996,6 +7327,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                     break;
                 }
             }
                     break;
                 }
             }

+

             if (!marked)
             {
                 int count = redrawCells.GetCount();
             if (!marked)
             {
                 int count = redrawCells.GetCount();


@@ -7007,10 +7339,13 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                         break;
                     }
                 }
                         break;
                     }
                 }

+

                 if (!marked)
                     redrawCells.Add( cell );
             }
                 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
         }
 
         // If this cell is empty, find cell to left that might want to overflow


@@ -7018,23 +7353,25 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         {
             for ( int l = 0; l < cell_rows; l++ )
             {
         {
             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))
                 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();
                         left = redrawCells[k].GetCol();

+                    }

 
                 if (left == col)
                     left = 0; // oh well
 
 
                 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++)
                             bool marked = false;
 
                             for (int k = 0; k < numCells; k++)


@@ -7072,13 +7409,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
 
     numCells = redrawCells.GetCount();
 
 
     numCells = redrawCells.GetCount();
 

-    for ( i = numCells - 1; i >= 0;  i-- )
+    for ( i = numCells - 1; i >= 0; i-- )

     {
         DrawCell( dc, redrawCells[i] );
     }
 }
 
     {
         DrawCell( dc, redrawCells[i] );
     }
 }
 

-

 void wxGrid::DrawGridSpace( wxDC& dc )
 {
   int cw, ch;
 void wxGrid::DrawGridSpace( wxDC& dc )
 {
   int cw, ch;


@@ -7087,8 +7423,8 @@ void wxGrid::DrawGridSpace( wxDC& dc )
   int right, bottom;
   CalcUnscrolledPosition( cw, ch, &right, &bottom );
 
   int right, bottom;
   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 rightCol = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) : 0;
+  int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;

 
   if ( right > rightCol || bottom > bottomRow )
   {
 
   if ( right > rightCol || bottom > bottomRow )
   {


@@ -7100,17 +7436,16 @@ void wxGrid::DrawGridSpace( wxDC& dc )
 
       if ( right > rightCol )
       {
 
       if ( right > rightCol )
       {

-          dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch );

       }
 
       if ( bottom > bottomRow )
       {
       }
 
       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();
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();


@@ -7135,7 +7470,7 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
     // Note: However, only if it is really _shown_, i.e. not hidden!
     if ( isCurrent && IsCellEditControlShown() )
     {
     // Note: However, only if it is really _shown_, i.e. not hidden!
     if ( isCurrent && IsCellEditControlShown() )
     {

-        // OSAF NB: this "#if..." is temporary and fixes a problem where the
+        // 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.
         // 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.


@@ -7147,8 +7482,7 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
     }
     else
     {
     }
     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();
         wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
         renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
         renderer->DecRef();


@@ -7175,17 +7509,16 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 
     if (penWidth > 0)
     {
 
     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;
 
         // 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.
         // Now draw the rectangle
         // use the cellHighlightColour if the cell is inside a selection, this
         // will ensure the cell is always visible.


@@ -7195,7 +7528,7 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
     }
 
 #if 0
     }
 
 #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,
 
         // how to properly set colours for arbitrary bg?
         wxCoord x1 = rect.x,


@@ -7208,14 +7541,28 @@ 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(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.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

 }
 
 }
 

+wxPen wxGrid::GetDefaultGridLinePen()
+{
+    return wxPen(GetGridLineColour(), 1, wxSOLID);
+}
+
+wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
+{
+    return GetDefaultGridLinePen();
+}
+
+wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col))
+{
+    return GetDefaultGridLinePen();
+}

 
 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {
 
 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {


@@ -7224,27 +7571,26 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
     if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
 
     if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
 

-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );

 
     wxRect rect = CellToRect( row, col );
 
     // right hand border
 
     wxRect rect = CellToRect( row, col );
 
     // right hand border

-    //
+    dc.SetPen( GetColGridLinePen(col) );

     dc.DrawLine( rect.x + rect.width, rect.y,
                  rect.x + rect.width, rect.y + rect.height + 1 );
 
     // bottom 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.SetPen( GetRowGridLinePen(row) );
+    dc.DrawLine( rect.x, rect.y + rect.height,

                  rect.x + rect.width, 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
     //
 {
     // 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);
          m_numRows && m_numCols )
     {
         m_currentCellCoords.Set(0, 0);


@@ -7282,9 +7628,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     return;
 #endif
 
     return;
 #endif
 

-    if ( !m_gridLinesEnabled ||
-         !m_numRows ||
-         !m_numCols )
+    if ( !m_gridLinesEnabled || !m_numRows || !m_numCols )

          return;
 
     int top, bottom, left, right;
          return;
 
     int top, bottom, left, right;


@@ -7316,13 +7660,13 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
     // avoid drawing grid lines past the last row and col
     //
 
     // avoid drawing grid lines past the last row and col
     //

-    right = wxMin( right, GetColRight(m_numCols - 1) );
+    right = wxMin( right, GetColRight(GetColAt( m_numCols - 1 )) );

     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out
     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 = GetColPos( internalXToCol(left) );
+    int topRow = internalYToRow(top);
+    int rightCol = GetColPos( internalXToCol(right) );

     int bottomRow = internalYToRow(bottom);
 
 #ifndef __WXMAC__
     int bottomRow = internalYToRow(bottom);
 
 #ifndef __WXMAC__


@@ -7334,8 +7678,11 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
     for (j=topRow; j<bottomRow; j++)
     {
 
     for (j=topRow; j<bottomRow; j++)
     {

-        for (i=leftCol; i<rightCol; i++)
+        int colPos;
+        for (colPos=leftCol; colPos<rightCol; colPos++)

         {
         {

+            i = GetColAt( colPos );
+

             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))
             {
             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))
             {


@@ -7345,14 +7692,14 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             }
             else if ((cell_rows < 0) || (cell_cols < 0))
             {
             }
             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
                 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;
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;


@@ -7364,20 +7711,20 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))
             {
             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))
             {
                 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
                 clippedcells.Subtract(rect);
             }
         }
     }
 #endif

+

     dc.SetClippingRegion( clippedcells );
 
     dc.SetClippingRegion( clippedcells );
 

-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );

 
     // horizontal grid lines
     //
 
     // horizontal grid lines
     //


@@ -7393,15 +7740,24 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
         if ( bot >= top )
         {
 
         if ( bot >= top )
         {

+            dc.SetPen( GetRowGridLinePen(i) );

             dc.DrawLine( left, bot, right, bot );
         }
     }
 
     // vertical grid lines
     //
             dc.DrawLine( left, bot, right, bot );
         }
     }
 
     // vertical grid lines
     //

-    for ( i = internalXToCol(left); i < m_numCols; i++ )
+    int colPos;
+    for ( colPos = leftCol; colPos < m_numCols; colPos++ )

     {
     {

-        int colRight = GetColRight(i) - 1;
+        i = GetColAt( colPos );
+
+        int colRight = GetColRight(i);
+#ifdef __WXGTK__
+        if (GetLayoutDirection() != wxLayout_RightToLeft)
+#endif
+            colRight--;
+

         if ( colRight > right )
         {
             break;
         if ( colRight > right )
         {
             break;


@@ -7409,13 +7765,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
         if ( colRight >= left )
         {
 
         if ( colRight >= left )
         {

+            dc.SetPen( GetColGridLinePen(i) );

             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }

+

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 

-void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
+void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)

 {
     if ( !m_numRows )
         return;
 {
     if ( !m_numRows )
         return;


@@ -7423,7 +7781,7 @@ void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
     size_t i;
     size_t numLabels = rows.GetCount();
 
     size_t i;
     size_t numLabels = rows.GetCount();
 

-    for ( i = 0;  i < numLabels;  i++ )
+    for ( i = 0; i < numLabels; i++ )

     {
         DrawRowLabel( dc, rows[i] );
     }
     {
         DrawRowLabel( dc, rows[i] );
     }


@@ -7435,6 +7793,7 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
         return;
 
     wxRect rect;
         return;
 
     wxRect rect;

+

 #ifdef __WXGTK20__
     rect.SetX( 1 );
     rect.SetY( GetRowTop(row) + 1 );
 #ifdef __WXGTK20__
     rect.SetX( 1 );
     rect.SetY( GetRowTop(row) + 1 );


@@ -7450,18 +7809,16 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
     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_3DSHADOW), 1, wxSOLID) );
+    dc.DrawLine( m_rowLabelWidth - 1, rowTop, m_rowLabelWidth - 1, rowBottom );

     dc.DrawLine( 0, rowTop, 0, 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( 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
 #endif

+

     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );


@@ -7484,7 +7841,7 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
     size_t i;
     size_t numLabels = cols.GetCount();
 
     size_t i;
     size_t numLabels = cols.GetCount();
 

-    for ( i = 0;  i < numLabels;  i++ )
+    for ( i = 0; i < numLabels; i++ )

     {
         DrawColLabel( dc, cols[i] );
     }
     {
         DrawColLabel( dc, cols[i] );
     }


@@ -7498,6 +7855,7 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     int colLeft = GetColLeft(col);
 
     wxRect rect;
     int colLeft = GetColLeft(col);
 
     wxRect rect;

+

 #ifdef __WXGTK20__
     rect.SetX( colLeft + 1 );
     rect.SetY( 1 );
 #ifdef __WXGTK20__
     rect.SetX( colLeft + 1 );
     rect.SetY( 1 );


@@ -7510,19 +7868,17 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
 #else
     int colRight = GetColRight(col) - 1;
 
 #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_3DSHADOW), 1, wxSOLID) );
+    dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );

     dc.DrawLine( colLeft, 0, colRight, 0 );
     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.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.DrawLine( colLeft, 1, colRight, 1 );
 #endif

+

     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );


@@ -7549,42 +7905,41 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
     StringToLines( value, lines );
 
 
     StringToLines( value, lines );
 

-    //Forward to new API.
-    DrawTextRectangle(  dc,
+    // Forward to new API.
+    DrawTextRectangle( dc,

         lines,
         rect,
         horizAlign,
         vertAlign,
         textOrientation );
         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,
                                const wxArrayString& lines,
                                const wxRect& rect,
                                int horizAlign,
                                int vertAlign,

-                               int textOrientation )
+                               int textOrientation)

 {
 {

-    long textWidth = 0, textHeight = 0;
-    long lineWidth = 0, lineHeight = 0;
-    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);
         case wxALIGN_BOTTOM:
             if ( textOrientation == wxHORIZONTAL )
                 y = rect.y + (rect.height - textHeight - 1);


@@ -7594,9 +7949,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
         case wxALIGN_CENTRE:
             if ( textOrientation == wxHORIZONTAL )
 
         case wxALIGN_CENTRE:
             if ( textOrientation == wxHORIZONTAL )

-                y = rect.y + ((rect.height - textHeight)/2);
+                y = rect.y + ((rect.height - textHeight) / 2);

             else
             else

-                x = rect.x + ((rect.width - textWidth)/2);
+                x = rect.x + ((rect.width - textWidth) / 2);

             break;
 
         case wxALIGN_TOP:
             break;
 
         case wxALIGN_TOP:


@@ -7606,15 +7961,26 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
             else
                 x = rect.x + 1;
             break;
             else
                 x = rect.x + 1;
             break;

-        }
+    }

 
 

-        // Align each line of a multi-line label
-        for ( l = 0; l < nLines; l++ )
+    // 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];
+
+        if ( line.empty() )

         {
         {

-            dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+            *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+            continue;
+        }

 
 

-            switch ( horizAlign )
-            {
+        long lineWidth = 0,
+             lineHeight = 0;
+        dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+        switch ( horizAlign )
+        {

             case wxALIGN_RIGHT:
                 if ( textOrientation == wxHORIZONTAL )
                     x = rect.x + (rect.width - lineWidth - 1);
             case wxALIGN_RIGHT:
                 if ( textOrientation == wxHORIZONTAL )
                     x = rect.x + (rect.width - lineWidth - 1);


@@ -7624,9 +7990,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
             case wxALIGN_CENTRE:
                 if ( textOrientation == wxHORIZONTAL )
 
             case wxALIGN_CENTRE:
                 if ( textOrientation == wxHORIZONTAL )

-                    x = rect.x + ((rect.width - lineWidth)/2);
+                    x = rect.x + ((rect.width - lineWidth) / 2);

                 else
                 else

-                    y = rect.y + rect.height - ((rect.height - lineWidth)/2);
+                    y = rect.y + rect.height - ((rect.height - lineWidth) / 2);

                 break;
 
             case wxALIGN_LEFT:
                 break;
 
             case wxALIGN_LEFT:


@@ -7636,27 +8002,23 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
                 else
                     y = rect.y + rect.height - 1;
                 break;
                 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 )
 {
 //
 void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
 {


@@ -7665,7 +8027,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
     wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
     wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
 
     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 )
     {
         pos = tVal.Mid(startPos).Find( eol );
         if ( pos < 0 )


@@ -7680,16 +8042,16 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
         {
             lines.Add( value.Mid(startPos, pos) );
         }
         {
             lines.Add( value.Mid(startPos, pos) );
         }

+

         startPos += pos + 1;
     }
 
         startPos += pos + 1;
     }
 

-    if ( startPos < (int)value.Length() )
+    if ( startPos < (int)value.length() )

     {
         lines.Add( value.Mid( startPos ) );
     }
 }
 
     {
         lines.Add( value.Mid( startPos ) );
     }
 }
 

-

 void wxGrid::GetTextBoxSize( const wxDC& dc,
                              const wxArrayString& lines,
                              long *width, long *height )
 void wxGrid::GetTextBoxSize( const wxDC& dc,
                              const wxArrayString& lines,
                              long *width, long *height )


@@ -7699,7 +8061,7 @@ void wxGrid::GetTextBoxSize( const wxDC& dc,
     long lineW = 0, lineH = 0;
 
     size_t i;
     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 );
     {
         dc.GetTextExtent( lines[i], &lineW, &lineH );
         w = wxMax( w, lineW );


@@ -7750,7 +8112,6 @@ bool wxGrid::Enable(bool enable)
     return true;
 }
 
     return true;
 }
 

-

 //
 // ------ Edit control functions
 //
 //
 // ------ Edit control functions
 //


@@ -7780,8 +8141,7 @@ void wxGrid::EnableCellEditControl( bool enable )
                 return;
 
             // this should be checked by the caller!
                 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;
 
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;


@@ -7791,7 +8151,7 @@ void wxGrid::EnableCellEditControl( bool enable )
         else
         {
             //FIXME:add veto support
         else
         {
             //FIXME:add veto support

-            SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
+            SendEvent( wxEVT_GRID_EDITOR_HIDDEN );

 
             HideCellEditControl();
             SaveEditControlValue();
 
             HideCellEditControl();
             SaveEditControlValue();


@@ -7816,7 +8176,6 @@ bool wxGrid::CanEnableCellControl() const
 {
     return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
         !IsCurrentCellReadOnly();
 {
     return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
         !IsCurrentCellReadOnly();

-

 }
 
 bool wxGrid::IsCellEditControlEnabled() const
 }
 
 bool wxGrid::IsCellEditControlEnabled() const


@@ -7878,24 +8237,20 @@ void wxGrid::ShowCellEditControl()
                 m_currentCellCoords.SetCol( col );
             }
 
                 m_currentCellCoords.SetCol( col );
             }
 

-            // convert to scrolled coords
-            //
-            CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-
-            int nXMove = 0;
-            if(rect.x < 0)
-                nXMove = rect.x;
-
-            // done in PaintBackground()
-#if 0

             // erase the highlight and the cell contents because the editor
             // might not cover the entire cell
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
             // erase the highlight and the cell contents because the editor
             // might not cover the entire cell
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );

-            dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            dc.SetBrush(wxBrush(GetCellAttr(row, col)->GetBackgroundColour(), wxSOLID));

             dc.SetPen(*wxTRANSPARENT_PEN);
             dc.DrawRectangle(rect);
             dc.SetPen(*wxTRANSPARENT_PEN);
             dc.DrawRectangle(rect);

-#endif // 0
+
+            // convert to scrolled coords
+            CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+
+            int nXMove = 0;
+            if (rect.x < 0)
+                nXMove = rect.x;

 
             // cell is shifted by one pixel
             // However, don't allow x or y to become negative
 
             // cell is shifted by one pixel
             // However, don't allow x or y to become negative


@@ -7922,59 +8277,52 @@ void wxGrid::ShowCellEditControl()
                 GetEventHandler()->ProcessEvent(evt);
             }
 
                 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;
             // 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();
             }
 
             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
                 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 );
                 {
                     int c_rows, c_cols;
                     GetCellSize( row, i, &c_rows, &c_cols );

+

                     // looks weird going over a multicell
                     // 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 < maxWidth) && (c_rows == 1))

-                        rect.width += GetColWidth(i);
+                    {
+                        rect.width += GetColWidth( i );
+                    }

                     else
                         break;
                 }
 
                 if (rect.GetRight() > client_right)
                     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 );
             editor->SetSize( rect );

-            editor->GetControl()->Move(editor->GetControl()->GetPosition().x + nXMove, editor->GetControl()->GetPosition().y);
+            if (nXMove != 0)
+                editor->GetControl()->Move(
+                    editor->GetControl()->GetPosition().x + nXMove,
+                    editor->GetControl()->GetPosition().y );

             editor->Show( true, attr );
 
             editor->Show( true, attr );
 

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

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


@@ -7995,7 +8343,7 @@ void wxGrid::HideCellEditControl()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
         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();
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->Show( false );
         editor->DecRef();


@@ -8007,10 +8355,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;
         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
 #ifdef __WXMAC__
         // ensure that the pixels under the focus ring get refreshed as well
         rect.Inflate(10, 10);
 #endif

+

         m_gridWin->Refresh( false, &rect );
     }
 }
         m_gridWin->Refresh( false, &rect );
     }
 }


@@ -8044,7 +8394,6 @@ void wxGrid::SaveEditControlValue()
     }
 }
 
     }
 }
 

-

 //
 // ------ Grid location functions
 //  Note that all of these functions work with the logical coordinates of
 //
 // ------ Grid location functions
 //  Note that all of these functions work with the logical coordinates of


@@ -8057,7 +8406,7 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
     int row = YToRow(y);
     int col = XToCol(x);
 
     int row = YToRow(y);
     int col = XToCol(x);
 

-    if ( row == -1  ||  col == -1 )
+    if ( row == -1 || col == -1 )

     {
         coords = wxGridNoCellCoords;
     }
     {
         coords = wxGridNoCellCoords;
     }


@@ -8067,7 +8416,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
 // Internal Helper function for computing row or column from some
 // (unscrolled) coordinate value, using either
 // m_defaultRowHeight/m_defaultColWidth or binary search on array


@@ -8094,7 +8442,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
     }
 
     if ( i_max >= BorderArray.GetCount())
     }
 
     if ( i_max >= BorderArray.GetCount())

+    {

         i_max = BorderArray.GetCount() - 1;
         i_max = BorderArray.GetCount() - 1;

+    }

     else
     {
         if ( coord >= BorderArray[i_max])
     else
     {
         if ( coord >= BorderArray[i_max])


@@ -8139,21 +8489,84 @@ int wxGrid::YToRow( int y )
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 

-int wxGrid::XToCol( int x )
+int wxGrid::XToCol( int x, bool clipToMinMax )

 {
 {

-    return CoordToRowOrCol(x, m_defaultColWidth,
-                           m_minAcceptableColWidth, m_colRights, m_numCols, false);
+    if (x < 0)
+        return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
+
+    if (!m_defaultColWidth)
+        m_defaultColWidth = 1;
+
+    int maxPos = x / m_defaultColWidth;
+    int minPos = 0;
+
+    if (m_colRights.IsEmpty())
+    {
+        if(maxPos < m_numCols)
+            return GetColAt( maxPos );
+        return clipToMinMax ? GetColAt( m_numCols - 1 ) : -1;
+    }
+
+    if ( maxPos >= m_numCols)
+        maxPos = m_numCols - 1;
+    else
+    {
+        if ( x >= m_colRights[GetColAt( maxPos )])
+        {
+            minPos = maxPos;
+            if (m_minAcceptableColWidth)
+                maxPos = x / m_minAcceptableColWidth;
+            else
+                maxPos =  m_numCols - 1;
+        }
+        if ( maxPos >= m_numCols)
+            maxPos = m_numCols - 1;
+    }
+
+    //X is beyond the last column
+    if ( x >= m_colRights[GetColAt( maxPos )])
+        return clipToMinMax ? GetColAt( maxPos ) : -1;
+
+    //X is before the first column
+    if ( x < m_colRights[GetColAt( 0 )] )
+        return GetColAt( 0 );
+
+    //Perform a binary search
+    while ( maxPos - minPos > 0 )
+    {
+        wxCHECK_MSG(m_colRights[GetColAt( minPos )] <= x && x < m_colRights[GetColAt( maxPos )],
+                    0, _T("wxGrid: internal error in XToCol"));
+
+        if (x >=  m_colRights[GetColAt( maxPos - 1 )])
+            return GetColAt( maxPos );
+        else
+            maxPos--;
+        int median = minPos + (maxPos - minPos + 1) / 2;
+        if (x < m_colRights[GetColAt( median )])
+            maxPos = median;
+        else
+            minPos = median;
+    }
+    return GetColAt( maxPos );

 }
 
 }
 

-// return the row number that that the y coord is near the edge of, or
-// -1 if not near an edge
+// return the row number that that the y coord is near
+//  the edge of, or -1 if not near an edge.
+// coords can only possibly be near an edge if
+//    (a) the row/column is large enough to still allow for an "inner" area
+//        that is _not_ nead the edge (i.e., if the height/width is smaller
+//        than WXGRID_LABEL_EDGE_ZONE, coords are _never_ considered to be
+//        near the edge).
+//   and
+//    (b) resizing rows/columns (the thing for which edge detection is
+//        relevant at all) is enabled.

 //
 int wxGrid::YToEdgeOfRow( int y )
 {
     int i;
     i = internalYToRow(y);
 
 //
 int wxGrid::YToEdgeOfRow( int y )
 {
     int i;
     i = internalYToRow(y);
 

-    if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
+    if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE && CanDragRowSize() )

     {
         // We know that we are in row i, test whether we are
         // close enough to lower or upper border, respectively.
     {
         // We know that we are in row i, test whether we are
         // close enough to lower or upper border, respectively.


@@ -8168,15 +8581,16 @@ int wxGrid::YToEdgeOfRow( int y )
 
 // return the col number that that the x coord is near the edge of, or
 // -1 if not near an edge
 
 // return the col number that that the x coord is near the edge of, or
 // -1 if not near an edge

+// See comment at YToEdgeOfRow for conditions on edge detection.

 //
 int wxGrid::XToEdgeOfCol( int x )
 {
     int i;
     i = internalXToCol(x);
 
 //
 int wxGrid::XToEdgeOfCol( int x )
 {
     int i;
     i = internalXToCol(x);
 

-    if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
+    if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE && CanDragColSize() )

     {
     {

-        // 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;
         // close enough to right or left border, respectively.
         if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
             return i;


@@ -8191,22 +8605,24 @@ wxRect wxGrid::CellToRect( int row, int col )
 {
     wxRect rect( -1, -1, -1, -1 );
 
 {
     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
     {
         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);
         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);
     }
 
             rect.height += GetRowHeight(i);
     }
 


@@ -8233,23 +8649,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
     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 ?
     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 ?
         //
     }
     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)) );

     }
 }
 
     }
 }
 


@@ -8261,15 +8675,13 @@ void wxGrid::MakeCellVisible( int row, int col )
     int i;
     int xpos = -1, ypos = -1;
 
     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
     {
         // get the cell rectangle in logical coords

-        //

         wxRect r( CellToRect( row, col ) );
 
         // convert to device 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 );
         int left, top, right, bottom;
         CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
         CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );


@@ -8285,7 +8697,7 @@ void wxGrid::MakeCellVisible( int row, int col )
         {
             int h = r.GetHeight();
             ypos = r.GetTop();
         {
             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 )
             {
                 int rowHeight = GetRowHeight(i);
                 if ( h + rowHeight > ch )


@@ -8296,19 +8708,19 @@ void wxGrid::MakeCellVisible( int row, int col )
             }
 
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             }
 
             // 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;
         }
 
         // special handling for wide cells - show always left part of the cell!
             ypos += m_scrollLineY;
         }
 
         // 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 
+        // 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 )
         // left and right part of the cell on every step!
 //      if ( left < 0 )

-        if ( left < 0 || (right-left) >= cw )
+        if ( left < 0 || (right - left) >= cw )

         {
             xpos = r.GetLeft();
         }
         {
             xpos = r.GetLeft();
         }


@@ -8323,7 +8735,7 @@ void wxGrid::MakeCellVisible( int row, int col )
             xpos += m_scrollLineX;
         }
 
             xpos += m_scrollLineX;
         }
 

-        if ( xpos != -1  ||  ypos != -1 )
+        if ( xpos != -1 || ypos != -1 )

         {
             if ( xpos != -1 )
                 xpos /= m_scrollLineX;
         {
             if ( xpos != -1 )
                 xpos /= m_scrollLineX;


@@ -8335,17 +8747,16 @@ void wxGrid::MakeCellVisible( int row, int col )
     }
 }
 
     }
 }
 

-

 //
 // ------ Grid cursor movement functions
 //
 
 bool wxGrid::MoveCursorUp( bool expandSelection )
 {
 //
 // ------ Grid cursor movement functions
 //
 
 bool wxGrid::MoveCursorUp( bool expandSelection )
 {

-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&

          m_currentCellCoords.GetRow() >= 0 )
     {
          m_currentCellCoords.GetRow() >= 0 )
     {

-        if ( expandSelection)
+        if ( expandSelection )

         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;


@@ -8374,17 +8785,16 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
     return false;
 }
 
     return false;
 }
 

-

 bool wxGrid::MoveCursorDown( bool expandSelection )
 {
 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;
          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(),
             {
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),


@@ -8411,7 +8821,7 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
 
 bool wxGrid::MoveCursorLeft( bool expandSelection )
 {
 
 bool wxGrid::MoveCursorLeft( bool expandSelection )
 {

-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&

          m_currentCellCoords.GetCol() >= 0 )
     {
         if ( expandSelection )
          m_currentCellCoords.GetCol() >= 0 )
     {
         if ( expandSelection )


@@ -8426,11 +8836,12 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
                 HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
                 HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }

-        else if ( m_currentCellCoords.GetCol() > 0 )
+        else if ( GetColPos( m_currentCellCoords.GetCol() ) > 0 )

         {
             int row = m_currentCellCoords.GetRow();
         {
             int row = m_currentCellCoords.GetRow();

-            int col = m_currentCellCoords.GetCol() - 1;
+            int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) - 1 );

             ClearSelection();
             ClearSelection();

+

             MakeCellVisible( row, col );
             SetCurrentCell( row, col );
         }
             MakeCellVisible( row, col );
             SetCurrentCell( row, col );
         }


@@ -8445,7 +8856,7 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
 
 bool wxGrid::MoveCursorRight( bool expandSelection )
 {
 
 bool wxGrid::MoveCursorRight( bool expandSelection )
 {

-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+    if ( m_currentCellCoords != wxGridNoCellCoords &&

          m_currentCellCoords.GetCol() < m_numCols )
     {
         if ( expandSelection )
          m_currentCellCoords.GetCol() < m_numCols )
     {
         if ( expandSelection )


@@ -8460,11 +8871,12 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
                 HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
                 HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }

-        else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+        else if ( GetColPos( m_currentCellCoords.GetCol() ) < m_numCols - 1 )

         {
             int row = m_currentCellCoords.GetRow();
         {
             int row = m_currentCellCoords.GetRow();

-            int col = m_currentCellCoords.GetCol() + 1;
+            int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) + 1 );

             ClearSelection();
             ClearSelection();

+

             MakeCellVisible( row, col );
             SetCurrentCell( row, col );
         }
             MakeCellVisible( row, col );
             SetCurrentCell( row, col );
         }


@@ -8493,7 +8905,7 @@ bool wxGrid::MovePageUp()
 
         if ( newRow == row )
         {
 
         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;
         }
 
             newRow = row - 1;
         }
 


@@ -8512,7 +8924,7 @@ bool wxGrid::MovePageDown()
         return false;
 
     int row = m_currentCellCoords.GetRow();
         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 );
     {
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );


@@ -8521,7 +8933,7 @@ bool wxGrid::MovePageDown()
         int newRow = internalYToRow( y + ch );
         if ( newRow == row )
         {
         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;
         }
 
             newRow = row + 1;
         }
 


@@ -8537,7 +8949,7 @@ bool wxGrid::MovePageDown()
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 {
     if ( m_table &&
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 {
     if ( m_table &&

-         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords != wxGridNoCellCoords &&

          m_currentCellCoords.GetRow() > 0 )
     {
         int row = m_currentCellCoords.GetRow();
          m_currentCellCoords.GetRow() > 0 )
     {
         int row = m_currentCellCoords.GetRow();


@@ -8550,19 +8962,19 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             //
             while ( row > 0 )
             {
             //
             while ( row > 0 )
             {

-                row-- ;
+                row--;

                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
                 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 )
             {
         {
             // starting at the top of a block: find the next block
             //
             row--;
             while ( row > 0 )
             {

-                row-- ;
+                row--;

                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }


@@ -8573,10 +8985,10 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             //
             while ( row > 0 )
             {
             //
             while ( row > 0 )
             {

-                row-- ;
+                row--;

                 if ( m_table->IsEmptyCell(row, col) )
                 {
                 if ( m_table->IsEmptyCell(row, col) )
                 {

-                    row++ ;
+                    row++;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -8603,8 +9015,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 {
     if ( m_table &&
 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();
     {
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();


@@ -8614,21 +9026,21 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
             // starting in an empty cell: find the next block of
             // non-empty cells
             //
             // 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;
             }
         }
                 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++;
         {
             // 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;
             }
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }


@@ -8637,12 +9049,12 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
         {
             // starting within a block: find the bottom of the block
             //
         {
             // 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) )
                 {
                 if ( m_table->IsEmptyCell(row, col) )
                 {

-                    row-- ;
+                    row--;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -8669,7 +9081,7 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 {
     if ( m_table &&
 bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 {
     if ( m_table &&

-         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords != wxGridNoCellCoords &&

          m_currentCellCoords.GetCol() > 0 )
     {
         int row = m_currentCellCoords.GetRow();
          m_currentCellCoords.GetCol() > 0 )
     {
         int row = m_currentCellCoords.GetRow();


@@ -8682,19 +9094,19 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             //
             while ( col > 0 )
             {
             //
             while ( col > 0 )
             {

-                col-- ;
+                col--;

                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
         }
                 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 )
             {
         {
             // starting at the left of a block: find the next block
             //
             col--;
             while ( col > 0 )
             {

-                col-- ;
+                col--;

                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }


@@ -8705,10 +9117,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             //
             while ( col > 0 )
             {
             //
             while ( col > 0 )
             {

-                col-- ;
+                col--;

                 if ( m_table->IsEmptyCell(row, col) )
                 {
                 if ( m_table->IsEmptyCell(row, col) )
                 {

-                    col++ ;
+                    col++;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -8735,8 +9147,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 {
     if ( m_table &&
 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();
     {
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();


@@ -8746,21 +9158,21 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
             // starting in an empty cell: find the next block of
             // non-empty cells
             //
             // 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;
             }
         }
                 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++;
         {
             // 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;
             }
                 if ( !(m_table->IsEmptyCell(row, col)) )
                     break;
             }


@@ -8769,12 +9181,12 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
         {
             // starting within a block: find the right of the block
             //
         {
             // 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) )
                 {
                 if ( m_table->IsEmptyCell(row, col) )
                 {

-                    col-- ;
+                    col--;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -8798,22 +9210,24 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
     return false;
 }
 
     return false;
 }
 

-
-

 //
 // ------ Label values and formatting
 //
 
 void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
 {
 //
 // ------ 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 )
 {
 }
 
 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()
 }
 
 int wxGrid::GetColLabelTextOrientation()


@@ -8849,7 +9263,6 @@ wxString wxGrid::GetColLabelValue( int col )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetRowLabelSize( int width )
 {
     width = wxMax( width, 0 );
 void wxGrid::SetRowLabelSize( int width )
 {
     width = wxMax( width, 0 );


@@ -8863,7 +9276,8 @@ void wxGrid::SetRowLabelSize( int width )
         else if ( m_rowLabelWidth == 0 )
         {
             m_rowLabelWin->Show( true );
         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;
         }
 
         m_rowLabelWidth = width;


@@ -8872,7 +9286,6 @@ void wxGrid::SetRowLabelSize( int width )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetColLabelSize( int height )
 {
     height = wxMax( height, 0 );
 void wxGrid::SetColLabelSize( int height )
 {
     height = wxMax( height, 0 );


@@ -8886,7 +9299,8 @@ void wxGrid::SetColLabelSize( int height )
         else if ( m_colLabelHeight == 0 )
         {
             m_colLabelWin->Show( true );
         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;
         }
 
         m_colLabelHeight = height;


@@ -8895,7 +9309,6 @@ void wxGrid::SetColLabelSize( int height )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )
 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )


@@ -9013,14 +9426,10 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {
     if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {
     if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )

-    {

         m_colLabelTextOrientation = textOrientation;
         m_colLabelTextOrientation = textOrientation;

-    }

 
     if ( !GetBatchCount() )
 
     if ( !GetBatchCount() )

-    {

         m_colLabelWin->Refresh();
         m_colLabelWin->Refresh();

-    }

 }
 
 void wxGrid::SetRowLabelValue( int row, const wxString& s )
 }
 
 void wxGrid::SetRowLabelValue( int row, const wxString& s )


@@ -9030,7 +9439,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
         m_table->SetRowLabelValue( row, s );
         if ( !GetBatchCount() )
         {
         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);
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);


@@ -9073,7 +9482,6 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetCellHighlightColour( const wxColour& colour )
 {
     if ( m_cellHighlightColour != colour )
 void wxGrid::SetCellHighlightColour( const wxColour& colour )
 {
     if ( m_cellHighlightColour != colour )


@@ -9100,6 +9508,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;

+

         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }
         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }


@@ -9117,6 +9526,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         int col = m_currentCellCoords.GetCol();
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;

+

         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }
         wxRect rect = CellToRect(row, col);
         m_gridWin->Refresh(true, &rect);
     }


@@ -9144,7 +9554,6 @@ void wxGrid::EnableGridLines( bool enable )
     }
 }
 
     }
 }
 

-

 int wxGrid::GetDefaultRowSize()
 {
     return m_defaultRowHeight;
 int wxGrid::GetDefaultRowSize()
 {
     return m_defaultRowHeight;


@@ -9206,7 +9615,6 @@ void wxGrid::SetDefaultCellFont( const wxFont& font )
     m_defaultCellAttr->SetFont(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
 // 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


@@ -9274,6 +9682,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col)
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
     attr->DecRef();
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
     attr->DecRef();

+

     return colour;
 }
 
     return colour;
 }
 


@@ -9282,6 +9691,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col )
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
     attr->DecRef();
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
     attr->DecRef();

+

     return colour;
 }
 
     return colour;
 }
 


@@ -9290,6 +9700,7 @@ wxFont wxGrid::GetCellFont( int row, int col )
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
     attr->DecRef();
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
     attr->DecRef();

+

     return font;
 }
 
     return font;
 }
 


@@ -9413,7 +9824,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
     {
         if ( !LookupAttr(row, col, &attr) )
         {
     {
         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);
         }
                            : (wxGridCellAttr *)NULL;
             CacheAttr(row, col, attr);
         }


@@ -9607,9 +10018,9 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
         if ((cell_rows > 1) || (cell_rows > 1))
         {
             int i, j;
         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))
                     {
                 {
                     if ((i != col) || (j != row))
                     {


@@ -9626,14 +10037,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;
         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);
                 {
                     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();
                     }
                 }
                         attr_stub->DecRef();
                     }
                 }


@@ -9684,20 +10095,19 @@ 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);
 }
 
 {
     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);
 }
 
 {
     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 )
 {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )


@@ -9713,13 +10123,12 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const
     return m_typeRegistry->GetEditor(index);
 }
 
     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 )
     {
 {
     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());
 
         errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
         wxFAIL_MSG(errStr.c_str());


@@ -9790,10 +10199,11 @@ void wxGrid::SetRowSize( int row, int height )
 
     m_rowHeights[row] = h;
     int i;
 
     m_rowHeights[row] = h;
     int i;

-    for ( i = row;  i < m_numRows;  i++ )
+    for ( i = row; i < m_numRows; i++ )

     {
         m_rowBottoms[i] += diff;
     }
     {
         m_rowBottoms[i] += diff;
     }

+

     if ( !GetBatchCount() )
         CalcDimensions();
 }
     if ( !GetBatchCount() )
         CalcDimensions();
 }


@@ -9822,8 +10232,8 @@ void wxGrid::SetColSize( int col, int width )
     // should we check that it's bigger than GetColMinimalWidth(col) here?
     //                                                                 (VZ)
     // No, because it is reasonable to assume the library user know's
     // should we check that it's bigger than GetColMinimalWidth(col) here?
     //                                                                 (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
+    // what he is doing. However we should test against the weaker
+    // constraint of minimalAcceptableWidth, as this breaks rendering

     //
     // This test then fixes sf.net bug #645734
 
     //
     // This test then fixes sf.net bug #645734
 


@@ -9836,16 +10246,16 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
         InitColWidths();
     }
 

-    // if < 0 calc new width from label
+    // if < 0 then calculate new width from label

     if ( width < 0 )
     {
     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 w = wxMax( 0, width );


@@ -9853,8 +10263,10 @@ void wxGrid::SetColSize( int col, int width )
     m_colWidths[col] = w;
 
     int i;
     m_colWidths[col] = w;
 
     int i;

-    for ( i = col;  i < m_numCols;  i++ )
+    int colPos;
+    for ( colPos = GetColPos( col ); colPos < m_numCols; colPos++ )

     {
     {

+        i = GetColAt( colPos );

         m_colRights[i] += diff;
     }
 
         m_colRights[i] += diff;
     }
 


@@ -9951,16 +10363,14 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         else
             col = rowOrCol;
 
         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 )
         if ( renderer )
         {
             wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
             extent = column ? size.x : size.y;
             if ( extent > extentMax )

-            {

                 extentMax = extent;
                 extentMax = extent;

-            }

 
             renderer->DecRef();
         }
 
             renderer->DecRef();
         }


@@ -9974,23 +10384,21 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 
     if ( column )
     {
 
     if ( column )
     {

-        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+        dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );

         if ( GetColLabelTextOrientation() == wxVERTICAL )
             w = h;
     }
     else
         if ( GetColLabelTextOrientation() == wxVERTICAL )
             w = h;
     }
     else

-        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+        dc.GetMultiLineTextExtent( GetRowLabelValue(row), &w, &h );

 
     extent = column ? w : h;
     if ( extent > extentMax )
 
     extent = column ? w : h;
     if ( extent > extentMax )

-    {

         extentMax = extent;
         extentMax = extent;

-    }

 
     if ( !extentMax )
     {
         // empty column - give default extent (notice that if extentMax is less
 
     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
         extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
     }
     else


@@ -10024,7 +10432,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         {
             int cw, ch, dummy;
             m_gridWin->GetClientSize( &cw, &ch );
         {
             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;
             rect.x = 0;
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;


@@ -10032,6 +10440,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
             m_rowLabelWin->Refresh( true, &rect );
         }
     }
             m_rowLabelWin->Refresh( true, &rect );
         }
     }

+

     if ( setAsMin )
     {
         if ( column )
     if ( setAsMin )
     {
         if ( column )


@@ -10051,9 +10460,7 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )
     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )

-        {

             AutoSizeColumn(col, setAsMin);
             AutoSizeColumn(col, setAsMin);

-        }

 
         width += GetColWidth(col);
     }
 
         width += GetColWidth(col);
     }


@@ -10095,8 +10502,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
     // 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
 
     // distribute the extra space between the columns/rows to avoid having
     // extra white space


@@ -10172,7 +10580,7 @@ void wxGrid::AutoSizeRowLabelSize( int row )
     // autosize row height depending on label text
     StringToLines( GetRowLabelValue( row ), lines );
     wxClientDC dc( m_rowLabelWin );
     // 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);
     if ( h < m_defaultRowHeight )
         h = m_defaultRowHeight;
     SetRowSize(row, h);


@@ -10185,7 +10593,7 @@ void wxGrid::AutoSizeColLabelSize( int col )
     long w, h;
 
     // Hide the edit control, so it
     long w, h;
 
     // Hide the edit control, so it

-    // won't interfer with drag-shrinking.
+    // won't interfere with drag-shrinking.

     if ( IsCellEditControlShown() )
     {
         HideCellEditControl();
     if ( IsCellEditControlShown() )
     {
         HideCellEditControl();


@@ -10196,9 +10604,9 @@ void wxGrid::AutoSizeColLabelSize( int col )
     StringToLines( GetColLabelValue( col ), lines );
     wxClientDC dc( m_colLabelWin );
     if ( GetColLabelTextOrientation() == wxHORIZONTAL )
     StringToLines( GetColLabelValue( col ), lines );
     wxClientDC dc( m_colLabelWin );
     if ( GetColLabelTextOrientation() == wxHORIZONTAL )

-        GetTextBoxSize( dc, lines, &w, &h);
+        GetTextBoxSize( dc, lines, &w, &h );

     else
     else

-        GetTextBoxSize( dc, lines, &h, &w);
+        GetTextBoxSize( dc, lines, &h, &w );

     if ( w < m_defaultColWidth )
         w = m_defaultColWidth;
     SetColSize(col, w);
     if ( w < m_defaultColWidth )
         w = m_defaultColWidth;
     SetColSize(col, w);


@@ -10220,7 +10628,7 @@ wxSize wxGrid::DoGetBestSize() const
         height = 80;
 
     // Round up to a multiple the scroll rate
         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);
     // is there any magic incantation for that?
     int xpu, ypu;
     GetScrollPixelsPerUnit(&xpu, &ypu);


@@ -10291,9 +10699,8 @@ 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 )
 // ----------------------------------------------------------------------------
 
 void wxGrid::SelectRow( int row, bool addToSelected )


@@ -10330,7 +10737,7 @@ void wxGrid::SelectAll()
     if ( m_numRows > 0 && m_numCols > 0 )
     {
         if ( m_selection )
     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 );

     }
 }
 
     }
 }
 


@@ -10346,15 +10753,15 @@ void wxGrid::DeselectRow( int row )
     if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
     {
         if ( m_selection->IsInSelection(row, 0 ) )
     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();
     }
     else
     {
         int nCols = GetNumberCols();

-        for ( int i = 0; i < nCols ; i++ )
+        for ( int i = 0; i < nCols; i++ )

         {
             if ( m_selection->IsInSelection(row, i ) )
         {
             if ( m_selection->IsInSelection(row, i ) )

-                m_selection->ToggleCellSelection( row, i);
+                m_selection->ToggleCellSelection(row, i);

         }
     }
 }
         }
     }
 }


@@ -10367,12 +10774,12 @@ void wxGrid::DeselectCol( int col )
     if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
     {
         if ( m_selection->IsInSelection(0, 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();
     }
     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);
         {
             if ( m_selection->IsInSelection(i, col ) )
                 m_selection->ToggleCellSelection(i, col);


@@ -10459,13 +10866,13 @@ wxArrayInt wxGrid::GetSelectedCols() const
 
 void wxGrid::ClearSelection()
 {
 
 void wxGrid::ClearSelection()
 {

-    m_selectingTopLeft = wxGridNoCellCoords;
-    m_selectingBottomRight = wxGridNoCellCoords;
+    m_selectingTopLeft =
+    m_selectingBottomRight =
+    m_selectingKeyboard = wxGridNoCellCoords;

     if ( m_selection )
         m_selection->ClearSelection();
 }
 
     if ( m_selection )
         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.
 //
 // This function returns the rectangle that encloses the given block
 // in device coords clipped to the client size of the grid window.
 //


@@ -10622,13 +11029,13 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
                                                bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {
                                                bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {

-    m_topLeft     = topLeft;
+    m_topLeft = topLeft;

     m_bottomRight = bottomRight;
     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);
 }
 
     SetEventObject(obj);
 }


@@ -10648,4 +11055,3 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
 }
 
 #endif // wxUSE_GRID
 }
 
 #endif // wxUSE_GRID

-