move m_sizeSet out of wxWindow

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 55049525f78ed0584fedcf9c2227e4fdb0699066..3601bf69d6b05a69c7b2e4a0837765aaadd28c33 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,37 +1,25 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////

-// 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
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "grid.h"
-#endif
-
-// 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
 
 #if wxUSE_GRID
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #if wxUSE_GRID
 

+#include "wx/grid.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"


@@ -42,6 +30,8 @@
     #include "wx/combobox.h"
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/combobox.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"


@@ -49,9 +39,10 @@
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 

-#include "wx/grid.h"

 #include "wx/generic/gridsel.h"
 
 #include "wx/generic/gridsel.h"
 

+const wxChar wxGridNameStr[] = wxT("grid");
+

 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else
 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else


@@ -117,6 +108,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)


@@ -128,16 +120,43 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
+// common base class for various grid subwindows
+class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
+{
+public:
+    wxGridSubwindow() { m_owner = NULL; }
+    wxGridSubwindow(wxGrid *owner,
+                    wxWindowID id,
+                    const wxPoint& pos,
+                    const wxSize& size,
+                    int additionalStyle = 0,
+                    const wxString& name = wxPanelNameStr)
+        : wxWindow(owner, id, pos, size,
+                   wxWANTS_CHARS | wxBORDER_NONE | additionalStyle,
+                   name)
+    {
+        m_owner = owner;
+    }
+
+    wxGrid *GetOwner() { return m_owner; }
+
+protected:
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+
+    wxGrid *m_owner;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridSubwindow)
+};
+
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow

 {
 public:
 {
 public:

-    wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridRowLabelWindow() { }

     wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:

-    wxGrid   *m_owner;
-

     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );


@@ -151,17 +170,15 @@ private:
 };
 
 
 };
 
 

-class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow

 {
 public:
 {
 public:

-    wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridColLabelWindow() { }

     wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 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 );


@@ -174,16 +191,14 @@ private:
 };
 
 
 };
 
 

-class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow

 {
 public:
 {
 public:

-    wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridCornerLabelWindow() { }

     wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
                              const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
                              const wxPoint &pos, const wxSize &size );
 
 private:

-    wxGrid *m_owner;
-

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


@@ -196,28 +211,23 @@ private:
     DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
 };
 
     DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
 };
 

-class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow

 {
 public:
     wxGridWindow()
     {
 {
 public:
     wxGridWindow()
     {

-        m_owner = (wxGrid *)NULL;
-        m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
-        m_colLabelWin = (wxGridColLabelWindow *)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(){}

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

-    wxGrid* GetOwner() { return m_owner; }
-

 private:
 private:

-    wxGrid                   *m_owner;

     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 


@@ -236,37 +246,45 @@ private:
 };
 
 
 };
 
 

-

 class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
 public:
 class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
 public:

-    wxGridCellEditorEvtHandler()
-        : m_grid(0), m_editor(0)
-        { }

     wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
     wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)

-        : m_grid(grid), m_editor(editor)
-        { }
+        : m_grid(grid),
+          m_editor(editor),
+          m_inSetFocus(false)
+    {
+    }

 
 

+    void OnKillFocus(wxFocusEvent& event);

     void OnKeyDown(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
 
     void OnKeyDown(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
 

+    void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; }
+

 private:
 private:

-    wxGrid*             m_grid;
-    wxGridCellEditor*   m_editor;
-    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
+    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.
+    bool                m_inSetFocus;
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)

     DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
 };
 
 
     DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
 };
 
 

-IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler )
+IMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler)
+

 BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
 BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )

+    EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus )

     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
 END_EVENT_TABLE()
 
 
     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
 END_EVENT_TABLE()
 
 

-

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


@@ -292,7 +310,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);


@@ -325,7 +343,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()
     {


@@ -374,6 +392,7 @@ private:
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
     wxGridDataTypeInfoArray m_typeinfo;
 };
 

+

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


@@ -390,14 +409,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


@@ -448,7 +467,6 @@ wxGridCellEditor::wxGridCellEditor()
     m_attr = NULL;
 }
 
     m_attr = NULL;
 }
 

-

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


@@ -483,7 +501,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;


@@ -492,8 +510,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 )


@@ -512,6 +530,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
         }


@@ -530,6 +549,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() )


@@ -543,8 +563,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);
 }
 


@@ -557,6 +577,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.


@@ -568,27 +589,33 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
     // through in that case.
     if ((ctrl || alt) && !(ctrl && alt))
         return false;
     // through in that case.
     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)


@@ -618,7 +645,11 @@ 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_ENTER |
+                               wxTE_PROCESS_TAB |
+                               wxTE_AUTO_SCROLL |
+                               wxNO_BORDER

 #endif
                               );
 
 #endif
                               );
 


@@ -634,19 +665,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)


@@ -656,34 +685,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);
 


@@ -694,15 +729,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();


@@ -713,17 +746,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);
 }


@@ -749,7 +781,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
     wxTextCtrl* tc = Text();
     wxChar ch;
     long pos;
     wxTextCtrl* tc = Text();
     wxChar ch;
     long pos;

-    
+

 #if wxUSE_UNICODE
     ch = event.GetUnicodeKey();
     if (ch <= 127)
 #if wxUSE_UNICODE
     ch = event.GetUnicodeKey();
     if (ch <= 127)


@@ -757,20 +789,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:


@@ -806,13 +839,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() );

         }
     }
 }
         }
     }
 }


@@ -820,7 +853,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();

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


@@ -856,7 +889,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

     }
 }
 
     }
 }
 


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

+

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


@@ -1016,7 +1050,7 @@ wxString wxGridCellNumberEditor::GetValue() const
     wxString s;
 
 #if wxUSE_SPINCTRL
     wxString s;
 
 #if wxUSE_SPINCTRL

-    if( HasRange() )
+    if ( HasRange() )

     {
         long value = Spin()->GetValue();
         s.Printf(wxT("%ld"), value);
     {
         long value = Spin()->GetValue();
         s.Printf(wxT("%ld"), value);


@@ -1048,7 +1082,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)


@@ -1079,7 +1113,8 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col,
     double value = 0.0;
     wxString text(Text()->GetValue());
 
     double value = 0.0;
     wxString text(Text()->GetValue());
 

-    if ( (text.empty() || text.ToDouble(&value)) && (value != m_valueOld) )
+    if ( (text.empty() || text.ToDouble(&value)) &&
+            !wxIsSameDouble(value, m_valueOld) )

     {
         if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
             grid->GetTable()->SetValueAsDouble(row, col, value);
     {
         if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
             grid->GetTable()->SetValueAsDouble(row, col, value);


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

+

     return false;
 }
 
     return false;
 }
 


@@ -1103,12 +1139,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        
+
+#if wxUSE_INTL

     bool is_decimal_point = ( strbuf ==
        wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
 #else
     bool is_decimal_point = ( strbuf == _T(".") );
 #endif
     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 )
     {


@@ -1152,20 +1190,25 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params)
 wxString wxGridCellFloatEditor::GetString() const
 {
     wxString fmt;
 wxString wxGridCellFloatEditor::GetString() const
 {
     wxString fmt;

-    if ( m_width == -1 )
-    {
-        // default width/precision
-        fmt = _T("%f");
-    }
-    else if ( m_precision == -1 )
+    if ( m_precision == -1 && m_width != -1)

     {
         // default precision
         fmt.Printf(_T("%%%d.f"), m_width);
     }
     {
         // default precision
         fmt.Printf(_T("%%%d.f"), m_width);
     }

-    else
+    else if ( m_precision != -1 && m_width == -1)
+    {
+        // default width
+        fmt.Printf(_T("%%.%df"), m_precision);
+    }
+    else if ( m_precision != -1 && m_width != -1 )

     {
         fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
     }
     {
         fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
     }

+    else
+    {
+        // default width/precision
+        fmt = _T("%f");
+    }

 
     return wxString::Format(fmt, m_valueOld);
 }
 
     return wxString::Format(fmt, m_valueOld);
 }


@@ -1174,24 +1217,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);
-#if wxUSE_INTL        
-        bool is_decimal_point =
-            ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
-                                          wxLOCALE_CAT_NUMBER) );
+        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
+            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;


@@ -1205,6 +1255,9 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 

+// the default values for GetValue()
+wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
+

 void wxGridCellBoolEditor::Create(wxWindow* parent,
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)
 void wxGridCellBoolEditor::Create(wxWindow* parent,
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)


@@ -1266,20 +1319,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);


@@ -1299,15 +1354,30 @@ 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) );
     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );

-        m_startValue = !( !cellval || (cellval == wxT("0")) );
+
+        if ( cellval == ms_stringValues[false] )
+            m_startValue = false;
+        else if ( cellval == ms_stringValues[true] )
+            m_startValue = true;
+        else
+        {
+            // do not try to be smart here and convert it to true or false
+            // because we'll still overwrite it with something different and
+            // this risks to be very surprising for the user code, let them
+            // know about it
+            wxFAIL_MSG( _T("invalid value for a cell with bool editor!") );
+        }

     }
     }

+

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


@@ -1316,7 +1386,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();


@@ -1325,10 +1395,11 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
 
     if ( changed )
     {
 
     if ( changed )
     {

-        if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
-            grid->GetTable()->SetValueAsBool(row, col, value);
+        wxGridTableBase * const table = grid->GetTable();
+        if ( table->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+            table->SetValueAsBool(row, col, value);

         else
         else

-            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+            table->SetValue(row, col, GetValue());

     }
 
     return changed;
     }
 
     return changed;


@@ -1337,7 +1408,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);
 }


@@ -1372,23 +1443,34 @@ void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
         case WXK_SPACE:
             CBox()->SetValue(!CBox()->GetValue());
             break;
         case WXK_SPACE:
             CBox()->SetValue(!CBox()->GetValue());
             break;

-            
+

         case '+':
             CBox()->SetValue(true);
             break;
         case '+':
             CBox()->SetValue(true);
             break;

-                
+

         case '-':
             CBox()->SetValue(false);
             break;
     }
 }
 
         case '-':
             CBox()->SetValue(false);
             break;
     }
 }
 

-
-// return the value as "1" for true and the empty string for false

 wxString wxGridCellBoolEditor::GetValue() const
 {
 wxString wxGridCellBoolEditor::GetValue() const
 {

-  bool bSet = CBox()->GetValue();
-  return bSet ? _T("1") : wxEmptyString;
+  return ms_stringValues[CBox()->GetValue()];
+}
+
+/* static */ void
+wxGridCellBoolEditor::UseStringValues(const wxString& valueTrue,
+                                      const wxString& valueFalse)
+{
+    ms_stringValues[false] = valueFalse;
+    ms_stringValues[true] = valueTrue;
+}
+
+/* static */ bool
+wxGridCellBoolEditor::IsTrueValue(const wxString& value)
+{
+    return value == ms_stringValues[true];

 }
 
 #endif // wxUSE_CHECKBOX
 }
 
 #endif // wxUSE_CHECKBOX


@@ -1447,30 +1529,50 @@ 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)
+        evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler);
+
+    // Don't immediately end if we get a kill focus event within BeginEdit
+    if (evtHandler)
+        evtHandler->SetInSetFocus(true);

 
     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
         int pos = Combo()->FindString(m_startValue);
     else
     {
         // find the right position, or default to the first if not found
         int pos = Combo()->FindString(m_startValue);

-        if (pos == -1)
+        if (pos == wxNOT_FOUND)

             pos = 0;
         Combo()->SetSelection(pos);
     }
             pos = 0;
         Combo()->SetSelection(pos);
     }

+

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

+
+    if (evtHandler)
+    {
+        // When dropping down the menu, a kill focus event
+        // happens after this point, so we can't reset the flag yet.
+#if !defined(__WXGTK20__)
+        evtHandler->SetInSetFocus(false);
+#endif
+    }

 }
 
 bool wxGridCellChoiceEditor::EndEdit(int row, int col,
 }
 
 bool wxGridCellChoiceEditor::EndEdit(int row, int col,


@@ -1520,6 +1622,18 @@ wxString wxGridCellChoiceEditor::GetValue() const
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------
 
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------
 

+void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
+{
+    // Don't disable the cell if we're just starting to edit it
+    if (m_inSetFocus)
+        return;
+
+    // accept changes
+    m_grid->DisableCellEditControl();
+
+    event.Skip();
+}
+

 void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 {
     switch ( event.GetKeyCode() )
 void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 {
     switch ( event.GetKeyCode() )


@@ -1541,11 +1655,21 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 
         default:
             event.Skip();
 
         default:
             event.Skip();

+            break;

     }
 }
 
 void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {
     }
 }
 
 void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {

+    int row = m_grid->GetGridCursorRow();
+    int col = m_grid->GetGridCursorCol();
+    wxRect rect = m_grid->CellToRect( row, col );
+    int cw, ch;
+    m_grid->GetGridWindow()->GetClientSize( &cw, &ch );
+
+    // if cell width is smaller than grid client area, cell is wholly visible
+    bool wholeCellVisible = (rect.GetWidth() < cw);
+

     switch ( event.GetKeyCode() )
     {
         case WXK_ESCAPE:
     switch ( event.GetKeyCode() )
     {
         case WXK_ESCAPE:


@@ -1554,8 +1678,92 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
         case WXK_NUMPAD_ENTER:
             break;
 
         case WXK_NUMPAD_ENTER:
             break;
 

+        case WXK_HOME:
+        {
+            if ( wholeCellVisible )
+            {
+                // no special processing needed...
+                event.Skip();
+                break;
+            }
+
+            // do special processing for partly visible cell...
+
+            // get the widths of all cells previous to this one
+            int colXPos = 0;
+            for ( int i = 0; i < col; i++ )
+            {
+                colXPos += m_grid->GetColSize(i);
+            }
+
+            int xUnit = 1, yUnit = 1;
+            m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+            if (col != 0)
+            {
+                m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+            }
+            else
+            {
+                m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL));
+            }
+            event.Skip();
+            break;
+        }
+
+        case WXK_END:
+        {
+            if ( wholeCellVisible )
+            {
+                // no special processing needed...
+                event.Skip();
+                break;
+            }
+
+            // do special processing for partly visible cell...
+
+            int textWidth = 0;
+            wxString value = m_grid->GetCellValue(row, col);
+            if ( wxEmptyString != value )
+            {
+                // get width of cell CONTENTS (text)
+                int y;
+                wxFont font = m_grid->GetCellFont(row, col);
+                m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font);
+
+                // try to RIGHT align the text by scrolling
+                int client_right = m_grid->GetGridWindow()->GetClientSize().GetWidth();
+
+                // (m_grid->GetScrollLineX()*2) is a factor for not scrolling to far,
+                // otherwise the last part of the cell content might be hidden below the scroll bar
+                // FIXME: maybe there is a more suitable correction?
+                textWidth -= (client_right - (m_grid->GetScrollLineX() * 2));
+                if ( textWidth < 0 )
+                {
+                    textWidth = 0;
+                }
+            }
+
+            // get the widths of all cells previous to this one
+            int colXPos = 0;
+            for ( int i = 0; i < col; i++ )
+            {
+                colXPos += m_grid->GetColSize(i);
+            }
+
+            // and add the (modified) text width of the cell contents
+            // as we'd like to see the last part of the cell contents
+            colXPos += textWidth;
+
+            int xUnit = 1, yUnit = 1;
+            m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+            m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+            event.Skip();
+            break;
+        }
+

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

+            break;

     }
 }
 
     }
 }
 


@@ -1591,7 +1799,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
     dc.SetBackgroundMode( wxSOLID );
 
     // grey out fields if the grid is disabled
     dc.SetBackgroundMode( wxSOLID );
 
     // grey out fields if the grid is disabled

-    if( grid.IsEnabled() )
+    if ( grid.IsEnabled() )

     {
         if ( isSelected )
         {
     {
         if ( isSelected )
         {


@@ -1615,8 +1823,8 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
 // wxGridCellStringRenderer
 // ----------------------------------------------------------------------------
 
 // wxGridCellStringRenderer
 // ----------------------------------------------------------------------------
 

-void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
-                                                     wxGridCellAttr& attr,
+void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
+                                                     const wxGridCellAttr& attr,

                                                      wxDC& dc,
                                                      bool isSelected)
 {
                                                      wxDC& dc,
                                                      bool isSelected)
 {


@@ -1625,29 +1833,29 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
     // TODO some special colours for attr.IsReadOnly() case?
 
     // different coloured text when the grid is disabled
     // TODO some special colours for attr.IsReadOnly() case?
 
     // different coloured text when the grid is disabled

-    if( grid.IsEnabled() )
+    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() );
 }
 

-wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+wxSize wxGridCellStringRenderer::DoGetBestSize(const wxGridCellAttr& attr,

                                                wxDC& dc,
                                                const wxString& text)
 {
                                                wxDC& dc,
                                                const wxString& text)
 {


@@ -1696,35 +1904,43 @@ 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;
             overflowCols = i - col - cell_cols + 1;

-            if (overflowCols >= cols) overflowCols = cols - 1;
+            if (overflowCols >= cols)
+                overflowCols = cols - 1;

         }
 
         if (overflowCols > 0) // redraw overflow cells w/ proper hilight
         }
 
         if (overflowCols > 0) // redraw overflow cells w/ proper hilight


@@ -1733,10 +1949,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();


@@ -1768,7 +1984,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
 // wxGridCellNumberRenderer
 // ----------------------------------------------------------------------------
 
 // wxGridCellNumberRenderer
 // ----------------------------------------------------------------------------
 

-wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+wxString wxGridCellNumberRenderer::GetString(const wxGrid& grid, int row, int col)

 {
     wxGridTableBase *table = grid.GetTable();
     wxString text;
 {
     wxGridTableBase *table = grid.GetTable();
     wxString text;


@@ -1834,7 +2050,7 @@ wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
     return renderer;
 }
 
     return renderer;
 }
 

-wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+wxString wxGridCellFloatRenderer::GetString(const wxGrid& grid, int row, int col)

 {
     wxGridTableBase *table = grid.GetTable();
 
 {
     wxGridTableBase *table = grid.GetTable();
 


@@ -1939,26 +2155,24 @@ 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() )
-                {
-                    long precision;
+
+        tmp = params.AfterFirst(_T(','));
+        if ( !tmp.empty() )
+        {
+            long precision;

             if ( tmp.ToLong(&precision) )
             if ( tmp.ToLong(&precision) )

-                    {
+            {

                 SetPrecision((int)precision);
                 SetPrecision((int)precision);

-                    }
-                    else
-                    {
+            }
+            else
+            {

                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
                 wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());

-        }
-
+            }

         }
     }
 }
 
         }
     }
 }
 

-

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


@@ -1982,7 +2196,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__)


@@ -2019,51 +2233,54 @@ 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) );

-        value = !( !cellval || (cellval == wxT("0")) );
+        value = wxGridCellBoolEditor::IsTrueValue(cellval);

     }
 
     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);


@@ -2124,6 +2341,7 @@ wxGridCellAttr *wxGridCellAttr::Clone() const
     if ( IsReadOnly() )
         attr->SetReadOnly();
 
     if ( IsReadOnly() )
         attr->SetReadOnly();
 

+    attr->SetOverflow( m_overflow == Overflow );

     attr->SetKind( m_attrkind );
 
     return attr;
     attr->SetKind( m_attrkind );
 
     return attr;


@@ -2137,13 +2355,14 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
         SetBackgroundColour(mergefrom->GetBackgroundColour());
     if ( !HasFont() && mergefrom->HasFont() )
         SetFont(mergefrom->GetFont());
         SetBackgroundColour(mergefrom->GetBackgroundColour());
     if ( !HasFont() && mergefrom->HasFont() )
         SetFont(mergefrom->GetFont());

-    if ( !HasAlignment() && mergefrom->HasAlignment() ){
+    if ( !HasAlignment() && mergefrom->HasAlignment() )
+    {

         int hAlign, vAlign;
         mergefrom->GetAlignment( &hAlign, &vAlign);
         SetAlignment(hAlign, vAlign);
     }
         int hAlign, vAlign;
         mergefrom->GetAlignment( &hAlign, &vAlign);
         SetAlignment(hAlign, vAlign);
     }

-
-    mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
+    if ( !HasSize() && mergefrom->HasSize() )
+        mergefrom->GetSize( &m_sizeRows, &m_sizeCols );

 
     // Directly access member functions as GetRender/Editor don't just return
     // m_renderer/m_editor
 
     // Directly access member functions as GetRender/Editor don't just return
     // m_renderer/m_editor


@@ -2159,10 +2378,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);


@@ -2180,9 +2399,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;


@@ -2206,13 +2425,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"));


@@ -2220,13 +2442,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"));


@@ -2234,16 +2459,19 @@ 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())
     {

-        if ( hAlign ) *hAlign = m_hAlign;
-        if ( vAlign ) *vAlign = m_vAlign;
+        if ( hAlign )
+            *hAlign = m_hAlign;
+        if ( vAlign )
+            *vAlign = m_vAlign;

     }
     else if (m_defGridAttr && m_defGridAttr != this)
     }
     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"));


@@ -2252,8 +2480,10 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 
 void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 {
 
 void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 {

-    if ( num_rows ) *num_rows = m_sizeRows;
-    if ( num_cols ) *num_cols = m_sizeCols;
+    if ( num_rows )
+        *num_rows = m_sizeRows;
+    if ( num_cols )
+        *num_cols = m_sizeCols;

 }
 
 // GetRenderer and GetEditor use a slightly different decision path about
 }
 
 // GetRenderer and GetEditor use a slightly different decision path about


@@ -2261,11 +2491,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(const wxGrid* grid, int row, int col) const

 {
 {

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

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


@@ -2273,7 +2503,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 )


@@ -2281,14 +2511,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)


@@ -2311,9 +2537,9 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
 }
 
 // same as above, except for s/renderer/editor/g
 }
 
 // same as above, except for s/renderer/editor/g

-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
+wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const

 {
 {

-    wxGridCellEditor *editor;
+    wxGridCellEditor *editor = NULL;

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


@@ -2329,14 +2555,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)


@@ -2430,7 +2652,8 @@ void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
                     // 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--;

                 }
             }
         }
                 }
             }
         }


@@ -2465,7 +2688,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--;

                 }
             }
         }
                 }
             }
         }


@@ -2493,7 +2717,7 @@ int wxGridCellAttrData::FindIndex(int row, int col) const
 
 wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
 {
 
 wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
 {

-    size_t count = m_attrs.Count();
+    size_t count = m_attrs.GetCount();

     for ( size_t n = 0; n < count; n++ )
     {
         m_attrs[n]->DecRef();
     for ( size_t n = 0; n < count; n++ )
     {
         m_attrs[n]->DecRef();


@@ -2565,7 +2789,8 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols
                     m_rowsOrCols.RemoveAt(n);
                     m_attrs[n]->DecRef();
                     m_attrs.RemoveAt(n);
                     m_rowsOrCols.RemoveAt(n);
                     m_attrs[n]->DecRef();
                     m_attrs.RemoveAt(n);

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

                 }
             }
         }
                 }
             }
         }


@@ -2597,77 +2822,88 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
     if ( m_data )
     {
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
     if ( m_data )
     {

-        switch(kind)
+        switch (kind)

         {
             case (wxGridCellAttr::Any):
         {
             case (wxGridCellAttr::Any):

-                //Get cached merge attributes.
-                // Currenlty not used as no cache implemented as not mutiable
+                // Get cached merge attributes.
+                // Currently not used as no cache implemented as not mutable

                 // attr = m_data->m_mergeAttr.GetAttr(row, col);
                 // attr = m_data->m_mergeAttr.GetAttr(row, col);

-                if(!attr)
+                if (!attr)

                 {
                 {

-                    //Basicaly implement old version.
-                    //Also check merge cache, so we don't have to re-merge every time..
+                    // Basically implement old version.
+                    // Also check merge cache, so we don't have to re-merge every time..

                     wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
                     wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
                     wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
 
                     wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
                     wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
                     wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
 

-                    if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){
+                    if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol))
+                    {

                         // Two or more are non NULL
                         attr = new wxGridCellAttr;
                         attr->SetKind(wxGridCellAttr::Merged);
 
                         // Two or more are non NULL
                         attr = new wxGridCellAttr;
                         attr->SetKind(wxGridCellAttr::Merged);
 

-                        //Order important..
-                        if(attrcell){
+                        // Order is important..
+                        if (attrcell)
+                        {

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

-                        if(attrcol){
+                        if (attrcol)
+                        {

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

-                        if(attrrow){
+                        if (attrrow)
+                        {

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

-                        //store merge attr if cache implemented
+
+                        // store merge attr if cache implemented

                         //attr->IncRef();
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
                     else
                     {
                         // one or none is non null return it or null.
                         //attr->IncRef();
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
                     else
                     {
                         // one or none is non null return it or null.

-                        if(attrrow) attr = attrrow;
-                        if(attrcol)
+                        if (attrrow)
+                            attr = attrrow;
+                        if (attrcol)

                         {
                         {

-                            if(attr)
+                            if (attr)

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

-                        if(attrcell)
+                        if (attrcell)

                         {
                         {

-                            if(attr)
+                            if (attr)

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

-            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;
 }
 


@@ -2722,12 +2958,11 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {

-    size_t count = m_typeinfo.Count();
+    size_t count = m_typeinfo.GetCount();

     for ( size_t i = 0; i < count; i++ )
         delete m_typeinfo[i];
 }
 
     for ( size_t i = 0; i < count; 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)


@@ -2774,7 +3009,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
             RegisterDataType(wxGRID_VALUE_STRING,
                              new wxGridCellStringRenderer,
                              new wxGridCellTextEditor);
             RegisterDataType(wxGRID_VALUE_STRING,
                              new wxGridCellStringRenderer,
                              new wxGridCellTextEditor);

-        } else
+        }
+        else

 #endif // wxUSE_TEXTCTRL
 #if wxUSE_CHECKBOX
         if ( typeName == wxGRID_VALUE_BOOL )
 #endif // wxUSE_TEXTCTRL
 #if wxUSE_CHECKBOX
         if ( typeName == wxGRID_VALUE_BOOL )


@@ -2782,7 +3018,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
             RegisterDataType(wxGRID_VALUE_BOOL,
                              new wxGridCellBoolRenderer,
                              new wxGridCellBoolEditor);
             RegisterDataType(wxGRID_VALUE_BOOL,
                              new wxGridCellBoolRenderer,
                              new wxGridCellBoolEditor);

-        } else
+        }
+        else

 #endif // wxUSE_CHECKBOX
 #if wxUSE_TEXTCTRL
         if ( typeName == wxGRID_VALUE_NUMBER )
 #endif // wxUSE_CHECKBOX
 #if wxUSE_TEXTCTRL
         if ( typeName == wxGRID_VALUE_NUMBER )


@@ -2796,7 +3033,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
             RegisterDataType(wxGRID_VALUE_FLOAT,
                              new wxGridCellFloatRenderer,
                              new wxGridCellFloatEditor);
             RegisterDataType(wxGRID_VALUE_FLOAT,
                              new wxGridCellFloatRenderer,
                              new wxGridCellFloatEditor);

-        } else
+        }
+        else

 #endif // wxUSE_TEXTCTRL
 #if wxUSE_COMBOBOX
         if ( typeName == wxGRID_VALUE_CHOICE )
 #endif // wxUSE_TEXTCTRL
 #if wxUSE_COMBOBOX
         if ( typeName == wxGRID_VALUE_CHOICE )


@@ -2804,7 +3042,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
             RegisterDataType(wxGRID_VALUE_CHOICE,
                              new wxGridCellStringRenderer,
                              new wxGridCellChoiceEditor);
             RegisterDataType(wxGRID_VALUE_CHOICE,
                              new wxGridCellStringRenderer,
                              new wxGridCellChoiceEditor);

-        } else
+        }
+        else

 #endif // wxUSE_COMBOBOX
         {
             return wxNOT_FOUND;
 #endif // wxUSE_COMBOBOX
         {
             return wxNOT_FOUND;


@@ -2861,6 +3100,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;
 }
 


@@ -2869,6 +3109,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;
 }
 


@@ -2878,7 +3119,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;


@@ -2903,6 +3143,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;
 }
 


@@ -3005,12 +3246,14 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
     return false;
 }
 
     return false;
 }
 

-

 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;
 }
 


@@ -3025,22 +3268,22 @@ 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;
-        if ( col < 0 ) break;
+        s += (wxChar) (_T('A') + (wxChar)(col % 26));
+        col = col / 26 - 1;
+        if ( col < 0 )
+            break;

     }
 
     // reverse the string...
     wxString s2;
     }
 
     // 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;
 }
 

-

 wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
 {
     return wxGRID_VALUE_STRING;
 wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
 {
     return wxGRID_VALUE_STRING;


@@ -3087,7 +3330,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) )
 {


@@ -3123,8 +3365,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


@@ -3205,9 +3445,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;
             }


@@ -3215,7 +3455,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();


@@ -3231,6 +3470,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,


@@ -3247,8 +3487,9 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 bool wxGridStringTable::AppendRows( size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();
 bool wxGridStringTable::AppendRows( size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();

-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
-                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+    size_t curNumCols = ( curNumRows > 0
+                         ? m_data[0].GetCount()
+                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );

 
     wxArrayString sa;
     if ( curNumCols > 0 )
 
     wxArrayString sa;
     if ( curNumCols > 0 )


@@ -3301,6 +3542,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
     {
         m_data.RemoveAt( pos, numRows );
     }
     {
         m_data.RemoveAt( pos, numRows );
     }

+

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


@@ -3319,21 +3561,32 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();

-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
-                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+    size_t curNumCols = ( curNumRows > 0
+                         ? m_data[0].GetCount()
+                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );

 
     if ( pos >= curNumCols )
     {
         return AppendCols( numCols );
     }
 
 
     if ( pos >= curNumCols )
     {
         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 );
         }
     }

+

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


@@ -3352,6 +3605,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 )
     {


@@ -3362,7 +3616,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 );
     }


@@ -3399,12 +3653,28 @@ 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 stores just as many elements as it needs, e.g. if only
+        // the label of the first column had been set it would have only one
+        // element and not numCols, so account for it
+        int nToRm = m_colLabels.size() - colID;
+        if ( nToRm > 0 )
+            m_colLabels.RemoveAt( colID, nToRm );

     }
 
     }
 

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

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


@@ -3412,9 +3682,10 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         }
         else
         {
         }
         else
         {

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

         }
     }
         }
     }

+

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


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

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

     }
 }
 
     }
 }
 


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

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

     }
 }
 
     }
 }
 


@@ -3462,7 +3733,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) );
         }


@@ -3477,7 +3749,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) );
         }


@@ -3487,25 +3760,33 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
 }
 
 
 }
 
 

-

 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 

+BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+    EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
+END_EVENT_TABLE()
+
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+    m_owner->CancelMouseCapture();
+}
+

 IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )

     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     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 )
+  : wxGridSubwindow(parent, id, pos, size)

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3522,62 +3803,61 @@ 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 )
 {
     m_owner->ProcessRowLabelMouseEvent( event );
 }
 
 void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessRowLabelMouseEvent( 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
 // cursor must be in the cell edit control to get key events
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 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 )
 
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )

     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     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 )
+  : wxGridSubwindow(parent, id, pos, size)

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3594,13 +3874,16 @@ 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 )
 {
     m_owner->ProcessColLabelMouseEvent( event );
 void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessColLabelMouseEvent( event );


@@ -3608,46 +3891,47 @@ 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
 // cursor must be in the cell edit control to get key events
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
 {
 }
 
 void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 }
 

-

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

-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
-    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
+    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 )
+  : wxGridSubwindow(parent, id, pos, size)

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3660,7 +3944,9 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 

-#if __WXGTK__
+    // VZ: any reason for this ifdef? (FIXME)
+#if 0
+def __WXGTK__

     wxRect rect;
     rect.SetX( 1 );
     rect.SetY( 1 );
     wxRect rect;
     rect.SetX( 1 );
     rect.SetY( 1 );


@@ -3668,26 +3954,24 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     rect.SetHeight( client_height - 2 );
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
     rect.SetHeight( client_height - 2 );
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );

-#else
-    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 );
+#else // !__WXGTK__
+    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 );
+    dc.DrawLine( 1, 1, client_width - 1, 1 );
+    dc.DrawLine( 1, 1, 1, client_height - 1 );

 #endif
 }
 
 #endif
 }
 

-

 void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessCornerLabelMouseEvent( event );
 }
 
 void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessCornerLabelMouseEvent( event );
 }
 

-

 void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
 {
     m_owner->GetEventHandler()->ProcessEvent(event);
 void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
 {
     m_owner->GetEventHandler()->ProcessEvent(event);


@@ -3698,31 +3982,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 )
 
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )

     EVT_PAINT( wxGridWindow::OnPaint )
     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 )


@@ -3734,31 +4020,30 @@ 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") )
-
+            : wxGridSubwindow(parent, id, pos, size,
+                              wxCLIP_CHILDREN, wxT("grid window") )

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;
 }
 
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;
 }
 

-

 void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();
 void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();

-    wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
-    m_owner->DrawGridCellArea( dc , DirtyCells);
+    wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc, dirtyCells );
+

 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
 #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 )
 {
     wxWindow::ScrollWindow( dx, dy, rect );
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {
     wxWindow::ScrollWindow( dx, dy, rect );


@@ -3766,18 +4051,17 @@ void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
     m_colLabelWin->ScrollWindow( dx, 0, rect );
 }
 
     m_colLabelWin->ScrollWindow( dx, 0, rect );
 }
 

-

 void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 {
     if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
         SetFocus();
 void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 {
     if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
         SetFocus();

-    
+

     m_owner->ProcessGridCellMouseEvent( event );
 }
 
 void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
 {
     m_owner->ProcessGridCellMouseEvent( 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


@@ -3785,17 +4069,20 @@ void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 void wxGridWindow::OnChar( wxKeyEvent& event )
 {
 }
 
 void wxGridWindow::OnChar( wxKeyEvent& event )
 {

-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();

 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )


@@ -3821,12 +4108,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


@@ -3856,7 +4142,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)
 


@@ -3875,7 +4161,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 )


@@ -3894,10 +4180,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,


@@ -3911,7 +4197,7 @@ wxGrid::wxGrid( wxWindow *parent,
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();

-    SetBestFittingSize(size);
+    SetInitialSize(size);

 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,


@@ -3919,19 +4205,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() ;
-    SetBestFittingSize(size);
+    Create();
+    SetInitialSize(size);

 
     return true;
 }
 
 
     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


@@ -3947,14 +4232,17 @@ wxGrid::~wxGrid()
              total ? (gs_nAttrCacheHits*100) / total : 0);
 #endif
 
              total ? (gs_nAttrCacheHits*100) / total : 0);
 #endif
 

-    if (m_ownTable)
+    // if we own the table, just delete it, otherwise at least don't leave it
+    // with dangling view pointer
+    if ( m_ownTable )

         delete m_table;
         delete m_table;

+    else if ( m_table && m_table->GetView() == this )
+        m_table->SetView(NULL);

 
     delete m_typeRegistry;
     delete m_selection;
 }
 
 
     delete m_typeRegistry;
     delete m_selection;
 }
 

-

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


@@ -3963,16 +4251,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;
+
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
+    m_selection = NULL;

 
 

-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = false;
+    m_table = (wxGridTableBase *) NULL;
+    m_ownTable = false;

 
     m_cellEditCtrlEnabled = false;
 
 
     m_cellEditCtrlEnabled = false;
 


@@ -4007,16 +4296,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,


@@ -4027,6 +4307,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,


@@ -4047,6 +4332,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);


@@ -4060,7 +4346,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 )
 {


@@ -4102,24 +4387,35 @@ wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
                        wxGrid::wxGridSelectionModes selmode )
 {
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
                        wxGrid::wxGridSelectionModes selmode )
 {

+    bool checkSelection = false;

     if ( m_created )
     {
         // stop all processing
         m_created = false;
 
     if ( m_created )
     {
         // stop all processing
         m_created = false;
 

-        if (m_ownTable)
+        if (m_table)

         {
         {

-            wxGridTableBase *t=m_table;
-            m_table=0;
-            delete t;
+            m_table->SetView(0);
+            if( m_ownTable )
+                delete m_table;
+            m_table = NULL;

         }
         }

+

         delete m_selection;
         delete m_selection;

+        m_selection = NULL;
+
+        m_ownTable = false;
+        m_numRows = 0;
+        m_numCols = 0;
+        checkSelection = true;

 
 

-        m_table=0;
-        m_selection=0;
-        m_numRows=0;
-        m_numCols=0;
+        // kill row and column size arrays
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();

     }
     }

+

     if (table)
     {
         m_numRows = table->GetNumberRows();
     if (table)
     {
         m_numRows = table->GetNumberRows();


@@ -4127,10 +4423,30 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 
         m_table = table;
         m_table->SetView( this );
 
         m_table = table;
         m_table->SetView( this );

-        if (takeOwnership)
-            m_ownTable = true;
+        m_ownTable = takeOwnership;

         m_selection = new wxGridSelection( this, selmode );
         m_selection = new wxGridSelection( this, selmode );

-
+        if (checkSelection)
+        {
+            // If the newly set table is smaller than the
+            // original one current cell and selection regions
+            // might be invalid,
+            m_selectingKeyboard = wxGridNoCellCoords;
+            m_currentCellCoords =
+              wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+                               wxMin(m_numCols, m_currentCellCoords.GetCol()));
+            if (m_selectingTopLeft.GetRow() >= m_numRows ||
+                m_selectingTopLeft.GetCol() >= m_numCols)
+            {
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
+            }
+            else
+                m_selectingBottomRight =
+                  wxGridCellCoords(wxMin(m_numRows,
+                                         m_selectingBottomRight.GetRow()),
+                                   wxMin(m_numCols,
+                                         m_selectingBottomRight.GetCol()));
+        }

         CalcDimensions();
 
         m_created = true;
         CalcDimensions();
 
         m_created = true;


@@ -4139,7 +4455,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;


@@ -4151,10 +4466,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;


@@ -4191,6 +4506,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;


@@ -4209,8 +4526,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);
 


@@ -4232,8 +4549,9 @@ void wxGrid::Init()
 // default widths/heights are used for all rows/columns, we may not use these
 // arrays at all
 //
 // default widths/heights are used for all rows/columns, we may not use these
 // arrays at all
 //

-// with some extra code, it should be possible to only store the
-// widths/heights different from default ones but this will be done later...
+// with some extra code, it should be possible to only store the widths/heights
+// different from default ones (resulting in space savings for huge grids) but
+// this is not done currently

 // ----------------------------------------------------------------------------
 
 void wxGrid::InitRowHeights()
 // ----------------------------------------------------------------------------
 
 void wxGrid::InitRowHeights()


@@ -4244,11 +4562,10 @@ void wxGrid::InitRowHeights()
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 

-    int rowBottom = 0;
-

     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 
     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 

-    for ( int i = 0;  i < m_numRows;  i++ )
+    int rowBottom = 0;
+    for ( int i = 0; i < m_numRows; i++ )

     {
         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );
     {
         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );


@@ -4262,13 +4579,13 @@ void wxGrid::InitColWidths()
 
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );
 
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );

-    int colRight = 0;

 
     m_colWidths.Add( m_defaultColWidth, m_numCols );
 
 
     m_colWidths.Add( m_defaultColWidth, m_numCols );
 

-    for ( int i = 0;  i < m_numCols;  i++ )
+    int colRight = 0;
+    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 );
     }
 }


@@ -4280,13 +4597,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];
 }
 


@@ -4309,37 +4626,34 @@ int wxGrid::GetRowBottom(int row) const
 
 void wxGrid::CalcDimensions()
 {
 
 void wxGrid::CalcDimensions()
 {

-    int cw, ch;
-    GetClientSize( &cw, &ch );
+    // compute the size of the scrollable area
+    int w = m_numCols > 0 ? GetColRight(GetColAt(m_numCols - 1)) : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;

 
 

-    if ( m_rowLabelWin->IsShown() )
-        cw -= m_rowLabelWidth;
-    if ( m_colLabelWin->IsShown() )
-        ch -= m_colLabelHeight;
-
-    // grid total size
-    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
-    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+    w += m_extraWidth;
+    h += m_extraHeight;

 
     // take into account editor if shown
 
     // 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();
+    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();

     }
 
     // preserve (more or less) the previous position
     }
 
     // preserve (more or less) the previous position


@@ -4354,7 +4668,8 @@ void wxGrid::CalcDimensions()
 
     // do set scrollbar parameters
     SetScrollbars( m_scrollLineX, m_scrollLineY,
 
     // do set scrollbar parameters
     SetScrollbars( m_scrollLineX, m_scrollLineY,

-                   GetScrollX(w), GetScrollY(h), x, y,
+                   GetScrollX(w), GetScrollY(h),
+                   x, y,

                    GetBatchCount() != 0);
 
     // if our OnSize() hadn't been called (it would if we have scrollbars), we
                    GetBatchCount() != 0);
 
     // if our OnSize() hadn't been called (it would if we have scrollbars), we


@@ -4362,33 +4677,58 @@ 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 );
 

+    // this block of code tries to work around the following problem: the grid
+    // could have been just resized to have enough space to show the full grid
+    // window contents without the scrollbars, but its client size could be
+    // not big enough because the grid has the scrollbars right now and so the
+    // scrollbars would remain even though we don't need them any more
+    //
+    // to prevent this from happening, check if we have enough space for
+    // everything without the scrollbars and explicitly disable them then
+    wxSize size = GetSize() - GetWindowBorderSize();
+    if ( size != wxSize(cw, ch) )
+    {
+        // check if we have enough space for grid window after accounting for
+        // the fixed size elements
+        size.x -= m_rowLabelWidth;
+        size.y -= m_colLabelHeight;
+
+        const wxSize vsize = m_gridWin->GetVirtualSize();
+
+        if ( size.x >= vsize.x && size.y >= vsize.y )
+        {
+            // yes, we do, so remove the scrollbars and use the new client size
+            // (which should be the same as full window size - borders now)
+            SetScrollbars(0, 0, 0, 0);
+            GetClientSize(&cw, &ch);
+        }
+    }
+

     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 )
 {


@@ -4398,12 +4738,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


@@ -4433,14 +4775,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


@@ -4476,14 +4820,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


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

+

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


@@ -4512,12 +4859,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;


@@ -4531,8 +4879,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( m_selection )
                 m_selection->UpdateRows( pos, -((int)numRows) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
             if ( m_selection )
                 m_selection->UpdateRows( pos, -((int)numRows) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();

-            if (attrProvider) {
+            if (attrProvider)
+            {

                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
                 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


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

+

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


@@ -4559,20 +4910,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


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

-

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


@@ -4601,20 +4975,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


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

+            if ( !m_colAt.IsEmpty() )
+            {
+                int colID = GetColAt( pos );
+
+                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;
             if ( !m_colWidths.IsEmpty() )
             {
                 m_colWidths.RemoveAt( pos, numCols );
                 m_colRights.RemoveAt( pos, numCols );
 
                 int w = 0;

-                for ( i = 0;  i < m_numCols;  i++ )
+                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;


@@ -4662,8 +5073,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( m_selection )
                 m_selection->UpdateCols( pos, -((int)numCols) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
             if ( m_selection )
                 m_selection->UpdateCols( pos, -((int)numCols) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();

-            if (attrProvider) {
+            if (attrProvider)
+            {

                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
                 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


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

+

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


@@ -4687,11 +5101,11 @@ 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 )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const

 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;


@@ -4711,7 +5125,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
 


@@ -4724,7 +5139,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;


@@ -4741,8 +5156,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
     return rowlabels;
 }
 
     return rowlabels;
 }
 

-
-wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const

 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;


@@ -4762,7 +5176,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
 


@@ -4775,8 +5190,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;
 


@@ -4788,11 +5206,11 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 
         ++iter;
     }
 
         ++iter;
     }

+

     return colLabels;
 }
 
     return colLabels;
 }
 

-
-wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const

 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;


@@ -4826,7 +5244,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;


@@ -4834,8 +5252,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;
 


@@ -4869,7 +5290,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
         if ( event.LeftIsDown() )
         {
 
         if ( event.LeftIsDown() )
         {

-            switch( m_cursorMode )
+            switch ( m_cursorMode )

             {
                 case WXGRID_CURSOR_RESIZE_ROW:
                 {
             {
                 case WXGRID_CURSOR_RESIZE_ROW:
                 {


@@ -4893,6 +5314,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:

+                {

                     if ( (row = YToRow( y )) >= 0 )
                     {
                         if ( m_selection )
                     if ( (row = YToRow( y )) >= 0 )
                     {
                         if ( m_selection )


@@ -4904,6 +5326,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                                                     event.MetaDown() );
                         }
                     }
                                                     event.MetaDown() );
                         }
                     }

+                }
+                break;

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


@@ -4919,7 +5343,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;
     }
 


@@ -4930,7 +5355,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() )


@@ -4942,10 +5366,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 )
                 {


@@ -4976,18 +5400,16 @@ 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() )
     {

-        int row = YToEdgeOfRow(y);
+        row = YToEdgeOfRow(y);

         if ( row < 0 )
         {
             row = YToRow(y);
         if ( row < 0 )
         {
             row = YToRow(y);


@@ -5003,11 +5425,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() )


@@ -5026,7 +5447,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() )


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

-

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


@@ -5052,7 +5471,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() )


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

-

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


@@ -5087,11 +5504,14 @@ 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() )
         {

-            switch( m_cursorMode )
+            switch ( m_cursorMode )

             {
                 case WXGRID_CURSOR_RESIZE_COL:
                 {
             {
                 case WXGRID_CURSOR_RESIZE_COL:
                 {


@@ -5107,14 +5527,15 @@ 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;
 
                 case WXGRID_CURSOR_SELECT_COL:
                     m_dragLastPos = x;
                 }
                 break;
 
                 case WXGRID_CURSOR_SELECT_COL:

+                {

                     if ( (col = XToCol( x )) >= 0 )
                     {
                         if ( m_selection )
                     if ( (col = XToCol( x )) >= 0 )
                     {
                         if ( m_selection )


@@ -5126,6 +5547,65 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                                                     event.MetaDown() );
                         }
                     }
                                                     event.MetaDown() );
                         }
                     }

+                }
+                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 label to suppress warnings about "enumeration value
                 // 'xxx' not handled in switch


@@ -5141,7 +5621,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;
     }
 


@@ -5152,7 +5633,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() )


@@ -5164,34 +5644,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


@@ -5203,12 +5698,11 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-

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

-        int col = XToEdgeOfCol(x);
+        col = XToEdgeOfCol(x);

         if ( col < 0 )
         {
             col = XToCol(x);
         if ( col < 0 )
         {
             col = XToCol(x);


@@ -5224,30 +5718,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() )


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

-

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


@@ -5273,7 +5779,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() )


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

-

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


@@ -5308,12 +5812,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 ) )


@@ -5321,7 +5823,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 ) )


@@ -5331,6 +5832,21 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
     }
 }
 

+void wxGrid::CancelMouseCapture()
+{
+    // cancel operation currently in progress, whatever it is
+    if ( m_winCapture )
+    {
+        m_isDragging = false;
+        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+        m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+        m_winCapture = NULL;
+
+        // remove traces of whatever we drew on screen
+        Refresh();
+    }
+}
+

 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)
 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)


@@ -5342,7 +5858,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"),


@@ -5351,7 +5868,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 &&


@@ -5366,7 +5883,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;
     }
 


@@ -5382,8 +5900,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


@@ -5419,7 +5942,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     {
         //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
 
     {
         //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
 

-        // Don't start doing anything until the mouse has been drug at
+        // Don't start doing anything until the mouse has been dragged at

         // least 3 pixels in any direction...
         if (! m_isDragging)
         {
         // least 3 pixels in any direction...
         if (! m_isDragging)
         {


@@ -5436,27 +5959,20 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
             // Hide the edit control, so it
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
             // Hide the edit control, so it

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

             if ( IsCellEditControlShown() )
             {
                 HideCellEditControl();
                 SaveEditControlValue();
             }
 
             if ( IsCellEditControlShown() )
             {
                 HideCellEditControl();
                 SaveEditControlValue();
             }
 

-            // Have we captured the mouse yet?
-            if (! m_winCapture)
-            {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
-            }
-

             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() )
                 {


@@ -5469,6 +5985,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                                    coords.GetRow(),
                                    coords.GetCol(),
                                    event );
                                    coords.GetRow(),
                                    coords.GetCol(),
                                    event );

+                        return;

                     }
                 }
                 else
                     }
                 }
                 else


@@ -5490,6 +6007,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                     // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }
                     // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }

+            // Have we captured the mouse yet?
+            if (! m_winCapture)
+            {
+                m_winCapture = m_gridWin;
+                m_winCapture->CaptureMouse();
+            }
+
+

         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {
         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {


@@ -5522,9 +6047,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;
         }
 


@@ -5555,7 +6080,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() )
             {


@@ -5571,13 +6096,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 )
                     {


@@ -5609,14 +6134,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(),


@@ -5628,10 +6152,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() )


@@ -5640,16 +6162,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();


@@ -5704,7 +6227,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 )


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

-

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


@@ -5738,7 +6259,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     //
     else if ( event.Moving() && !event.IsButton() )
     {
     //
     else if ( event.Moving() && !event.IsButton() )
     {

-        if( coords.GetRow() < 0 || coords.GetCol() < 0 )
+        if ( coords.GetRow() < 0 || coords.GetCol() < 0 )

         {
             // out of grid cell area
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
         {
             // out of grid cell area
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);


@@ -5751,7 +6272,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         // Dragging on the corner of a cell to resize in both
         // directions is not implemented yet...
         //
         // Dragging on the corner of a cell to resize in both
         // directions is not implemented yet...
         //

-        if ( dragRow >= 0  &&  dragCol >= 0 )
+        if ( dragRow >= 0 && dragCol >= 0 )

         {
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
             return;
         {
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
             return;


@@ -5766,16 +6287,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 if ( CanDragRowSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
             }
                 if ( CanDragRowSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
             }

-
-            if ( dragCol >= 0 )
-            {
-                m_dragRowOrCol = dragCol;
-            }
-
-            return;

         }
         }

-
-        if ( dragCol >= 0 )
+        else if ( dragCol >= 0 )

         {
             m_dragRowOrCol = dragCol;
 
         {
             m_dragRowOrCol = dragCol;
 


@@ -5784,20 +6297,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 if ( CanDragColSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
             }
                 if ( CanDragColSize() && CanDragGridSize() )
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
             }

-
-            return;

         }
         }

-
-        // Neither on a row or col edge
-        //
-        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        else // Neither on a row or col edge

         {
         {

-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+            {
+                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            }

         }
     }
 }
 
         }
     }
 }
 

-

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


@@ -5811,7 +6321,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();
 


@@ -5829,12 +6339,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++)


@@ -5869,7 +6380,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();
 


@@ -5888,12 +6399,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++)


@@ -5902,11 +6414,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 );
         }
 


@@ -5914,6 +6428,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();
+    }
+}

 
 
 //
 
 
 //


@@ -5942,10 +6560,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.
 //


@@ -5957,11 +6573,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


@@ -5983,10 +6599,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


@@ -6001,13 +6617,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


@@ -6028,10 +6645,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


@@ -6052,10 +6669,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


@@ -6073,10 +6690,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


@@ -6097,11 +6714,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
 //


@@ -6113,8 +6729,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 )
    {


@@ -6151,6 +6766,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(),


@@ -6169,52 +6810,48 @@ int wxGrid::SendEvent( const wxEventType type,
    }
 
    // A Veto'd event may not be `claimed' so test this first
    }
 
    // A Veto'd event may not be `claimed' so test this first

-   if (vetoed) return -1;
+   if (vetoed)
+       return -1;
+

    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();
      }
 
     // A Veto'd event may not be `claimed' so test this first
 
         claimed = GetEventHandler()->ProcessEvent(gridEvt);
         vetoed  = !gridEvt.IsAllowed();
      }
 
     // A Veto'd event may not be `claimed' so test this first

-    if (vetoed) return -1;
+    if (vetoed)
+        return -1;
+

     return claimed ? 1 : 0;
 }
 
     return claimed ? 1 : 0;
 }
 

-

 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)


@@ -6224,7 +6861,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
     if (! GetBatchCount())
     {
         // Refresh to get correct scrolled position:
     if (! GetBatchCount())
     {
         // Refresh to get correct scrolled position:

-        wxScrolledWindow::Refresh(eraseb,rect);
+        wxScrolledWindow::Refresh(eraseb, rect);

 
         if (rect)
         {
 
         if (rect)
         {


@@ -6232,17 +6869,19 @@ 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();
             rectHeight = rect->GetHeight();
 
             width_label = m_rowLabelWidth - rect_x;
             rect_x = rect->GetX();
             rect_y = rect->GetY();
             rectWidth = rect->GetWidth();
             rectHeight = rect->GetHeight();
 
             width_label = m_rowLabelWidth - rect_x;

-            if (width_label > rectWidth) width_label = rectWidth;
+            if (width_label > rectWidth)
+                width_label = rectWidth;

 
             height_label = m_colLabelHeight - rect_y;
 
             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)
             {


@@ -6304,17 +6943,12 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
     }
 }
 
     }
 }
 

-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))

 {
 {

-    // position the child windows
-    CalcWindowSizes();
-
-    // don't call CalcDimensions() from here, the base class handles the size
-    // changes itself
-    event.Skip();
+    // update our children window positions and scrollbars
+    CalcDimensions();

 }
 
 }
 

-

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


@@ -6327,60 +6961,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:


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

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

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


@@ -6449,8 +7072,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
                 {


@@ -6458,11 +7081,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;
 


@@ -6471,21 +7094,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();


@@ -6507,14 +7131,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() );

             }
         }
 
             }
         }
 


@@ -6532,7 +7157,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


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

-

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


@@ -6578,8 +7202,10 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
         return;
     }
 

-    wxClientDC dc(m_gridWin);
-    PrepareDC(dc);
+#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );
+#endif

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


@@ -6588,7 +7214,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--;


@@ -6602,19 +7228,24 @@ 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);
+#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
+            m_gridWin->Refresh(true /*, & r */);
+#else
+            DrawGridCellArea( dc, cells );

             DrawAllGridLines( dc, r );
             DrawAllGridLines( dc, r );

+#endif

         }
     }
 
     m_currentCellCoords = coords;
 
         }
     }
 
     m_currentCellCoords = coords;
 

-    wxGridCellAttr* attr = GetCellAttr(coords);
-    DrawCellHighlight(dc, attr);
+    wxGridCellAttr *attr = GetCellAttr( coords );
+#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+    DrawCellHighlight( dc, attr );
+#endif

     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;


@@ -6660,6 +7291,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 )


@@ -6676,9 +7308,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.


@@ -6716,21 +7348,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 )


@@ -6738,10 +7368,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 )


@@ -6749,10 +7378,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


@@ -6760,7 +7388,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;
 }


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

-

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


@@ -6797,9 +7425,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) );
             }


@@ -6811,21 +7439,20 @@ 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)
 //
 void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
 {
 // Note - this function only draws cells that are in the list of
 // exposed cells (usually set from the update region by
 // CalcExposedCells)
 //
 void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
 {

-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numRows || !m_numCols )
+        return;

 
     int i, numCells = cells.GetCount();
     int row, col, cell_rows, cell_cols;
     wxGridCellCoordsArray redrawCells;
 
 
     int i, numCells = cells.GetCount();
     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();


@@ -6834,9 +7461,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] )
                 {


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

+

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


@@ -6855,9 +7483,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


@@ -6865,22 +7497,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++)


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

+

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


@@ -6902,7 +7538,8 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                                         break;
                                     }
                                 }
                                         break;
                                     }
                                 }

-                                if (!marked) redrawCells.Add( cell );
+                                if (!marked)
+                                    redrawCells.Add( cell );

                             }
                         }
                         break;
                             }
                         }
                         break;


@@ -6910,18 +7547,18 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                 }
             }
         }
                 }
             }
         }

+

         DrawCell( dc, cells[i] );
     }
 
     numCells = redrawCells.GetCount();
 
         DrawCell( dc, cells[i] );
     }
 
     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;


@@ -6930,8 +7567,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 )
   {


@@ -6943,17 +7580,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();


@@ -6978,14 +7614,19 @@ 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() )
     {

+        // NB: this "#if..." is temporary and fixes a problem where the
+        // edit control is erased by this code after being rendered.
+        // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
+        // implicitly, causing this out-of order render.
+#if !defined(__WXMAC__)

         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();

+#endif

     }
     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();


@@ -7012,47 +7653,60 @@ 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.
         // please #ifdef this appropriately.

-        rect.x += penWidth/2;
-        rect.y += penWidth/2;
-        rect.width -= penWidth-1;
-        rect.height -= penWidth-1;
-
+        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.

-        dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
+        dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxSOLID));

         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
     }
 
 #if 0
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
     }
 
 #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,
                 y1 = rect.y,
 
         // how to properly set colours for arbitrary bg?
         wxCoord x1 = rect.x,
                 y1 = rect.y,

-                x2 = rect.x + rect.width -1,
-                y2 = rect.y + rect.height -1;
+                x2 = rect.x + rect.width - 1,
+                y2 = rect.y + rect.height - 1;

 
         dc.SetPen(*wxWHITE_PEN);
         dc.DrawLine(x1, y1, x2, y1);
         dc.DrawLine(x1, y1, x1, y2);
 
         dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
 
         dc.SetPen(*wxWHITE_PEN);
         dc.DrawLine(x1, y1, x2, y1);
         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 )
 {


@@ -7061,27 +7715,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);


@@ -7119,9 +7772,8 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     return;
 #endif
 
     return;
 #endif
 

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

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


@@ -7152,26 +7804,28 @@ 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);
 
     int bottomRow = internalYToRow(bottom);
 

-#ifndef __WXMAC__
-    // CS: I don't know why suddenly unscrolled coordinates are used for clipping
+#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS

     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 
     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 

-    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))
             {


@@ -7181,39 +7835,39 @@ 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;
 

-    for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<=bottomRow; j++)

     {
     {

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

         {
             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
     //


@@ -7229,16 +7883,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 );
         }
     }
 
             dc.DrawLine( left, bot, right, bot );
         }
     }
 

-

     // vertical grid lines
     //
     // 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;


@@ -7246,34 +7908,37 @@ 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;

 
     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] );
     }
 }
 

-

 void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
     if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
         return;
 
     wxRect rect;
 void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
     if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
         return;
 
     wxRect rect;

-#ifdef __WXGTK20__
+
+#if 0
+def __WXGTK20__

     rect.SetX( 1 );
     rect.SetY( GetRowTop(row) + 1 );
     rect.SetWidth( m_rowLabelWidth - 2 );
     rect.SetX( 1 );
     rect.SetY( GetRowTop(row) + 1 );
     rect.SetWidth( m_rowLabelWidth - 2 );


@@ -7288,18 +7953,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() );


@@ -7314,21 +7977,20 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 

-

 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {

-    if ( !m_numCols ) return;
+    if ( !m_numCols )
+        return;

 
     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] );
     }
 }
 

-

 void wxGrid::DrawColLabel( wxDC& dc, int col )
 {
     if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )
 void wxGrid::DrawColLabel( wxDC& dc, int col )
 {
     if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )


@@ -7337,7 +7999,9 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     int colLeft = GetColLeft(col);
 
     wxRect rect;
     int colLeft = GetColLeft(col);
 
     wxRect rect;

-#ifdef __WXGTK20__
+
+#if 0
+def __WXGTK20__

     rect.SetX( colLeft + 1 );
     rect.SetY( 1 );
     rect.SetWidth( GetColWidth(col) - 2 );
     rect.SetX( colLeft + 1 );
     rect.SetY( 1 );
     rect.SetWidth( GetColWidth(col) - 2 );


@@ -7349,19 +8013,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() );


@@ -7388,123 +8050,129 @@ 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, textHeight;
-    long lineWidth, lineHeight;
-    int nLines;
+    if ( lines.empty() )
+        return;

 
 

-    dc.SetClippingRegion( rect );
+    wxDCClipper clip(dc, rect);

 
 

-    nLines = lines.GetCount();
-    if( nLines > 0 )
-    {
-        int l;
-        float x = 0.0, y = 0.0;
+    long textWidth,
+         textHeight;

 
 

-        if( textOrientation == wxHORIZONTAL )
-            GetTextBoxSize(dc, lines, &textWidth, &textHeight);
-        else
-            GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+    if ( textOrientation == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+    else
+        GetTextBoxSize( dc, lines, &textHeight, &textWidth );

 
 

-        switch( vertAlign )
-        {
+    int x = 0,
+        y = 0;
+    switch ( vertAlign )
+    {

         case wxALIGN_BOTTOM:
         case wxALIGN_BOTTOM:

-            if( textOrientation == wxHORIZONTAL )
+            if ( textOrientation == wxHORIZONTAL )

                 y = rect.y + (rect.height - textHeight - 1);
             else
                 x = rect.x + rect.width - textWidth;
             break;
 
         case wxALIGN_CENTRE:
                 y = rect.y + (rect.height - textHeight - 1);
             else
                 x = rect.x + rect.width - textWidth;
             break;
 
         case wxALIGN_CENTRE:

-            if( textOrientation == wxHORIZONTAL )
-                y = rect.y + ((rect.height - textHeight)/2);
+            if ( textOrientation == wxHORIZONTAL )
+                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:
         default:
             break;
 
         case wxALIGN_TOP:
         default:

-            if( textOrientation == wxHORIZONTAL )
+            if ( textOrientation == wxHORIZONTAL )

                 y = rect.y + 1;
             else
                 x = rect.x + 1;
             break;
                 y = rect.y + 1;
             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 )
-            {
+        wxCoord lineWidth = 0,
+             lineHeight = 0;
+        dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+        switch ( horizAlign )
+        {

             case wxALIGN_RIGHT:
             case wxALIGN_RIGHT:

-                if( textOrientation == wxHORIZONTAL )
+                if ( textOrientation == wxHORIZONTAL )

                     x = rect.x + (rect.width - lineWidth - 1);
                 else
                     y = rect.y + lineWidth + 1;
                 break;
 
             case wxALIGN_CENTRE:
                     x = rect.x + (rect.width - lineWidth - 1);
                 else
                     y = rect.y + lineWidth + 1;
                 break;
 
             case wxALIGN_CENTRE:

-                if( textOrientation == wxHORIZONTAL )
-                    x = rect.x + ((rect.width - lineWidth)/2);
+                if ( textOrientation == wxHORIZONTAL )
+                    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:
             default:
                 break;
 
             case wxALIGN_LEFT:
             default:

-                if( textOrientation == wxHORIZONTAL )
+                if ( textOrientation == wxHORIZONTAL )

                     x = rect.x + 1;
                 else
                     y = rect.y + rect.height - 1;
                 break;
                     x = rect.x + 1;
                 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 ) const

 {
     int startPos = 0;
     int pos;
     wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
     wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
 
 {
     int startPos = 0;
     int pos;
     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 )


@@ -7519,25 +8187,26 @@ 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( wxDC& dc,
+void wxGrid::GetTextBoxSize( const wxDC& dc,

                              const wxArrayString& lines,
                              const wxArrayString& lines,

-                             long *width, long *height )
+                             long *width, long *height ) const

 {
 {

-    long w = 0;
-    long h = 0;
-    long lineW, lineH;
+    wxCoord w = 0;
+    wxCoord h = 0;
+    wxCoord lineW = 0, lineH = 0;

 
     size_t i;
 
     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 );


@@ -7592,27 +8261,23 @@ bool wxGrid::Enable(bool enable)
 // ------ Edit control functions
 //
 
 // ------ Edit control functions
 //
 

-

 void wxGrid::EnableEditing( bool edit )
 {
     // TODO: improve this ?
     //
     if ( edit != m_editable )
     {
 void wxGrid::EnableEditing( bool edit )
 {
     // TODO: improve this ?
     //
     if ( edit != m_editable )
     {

-        if(!edit) EnableCellEditControl(edit);
+        if (!edit)
+            EnableCellEditControl(edit);

         m_editable = edit;
     }
 }
 
         m_editable = edit;
     }
 }
 

-

 void wxGrid::EnableCellEditControl( bool enable )
 {
     if (! m_editable)
         return;
 
 void wxGrid::EnableCellEditControl( bool enable )
 {
     if (! m_editable)
         return;
 

-    if ( m_currentCellCoords == wxGridNoCellCoords )
-        SetCurrentCell( 0, 0 );
-

     if ( enable != m_cellEditCtrlEnabled )
     {
         if ( enable )
     if ( enable != m_cellEditCtrlEnabled )
     {
         if ( enable )


@@ -7621,8 +8286,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;


@@ -7632,7 +8296,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();


@@ -7657,7 +8321,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


@@ -7697,7 +8360,7 @@ void wxGrid::ShowCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
 {
     if ( IsCellEditControlEnabled() )
     {

-        if ( !IsVisible( m_currentCellCoords ) )
+        if ( !IsVisible( m_currentCellCoords, false ) )

         {
             m_cellEditCtrlEnabled = false;
             return;
         {
             m_cellEditCtrlEnabled = false;
             return;


@@ -7719,20 +8382,21 @@ void wxGrid::ShowCellEditControl()
                 m_currentCellCoords.SetCol( col );
             }
 
                 m_currentCellCoords.SetCol( col );
             }
 

-            // convert to scrolled coords
-            //
-            CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-
-            // 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));
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            dc.SetBrush(wxBrush(attr->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


@@ -7743,7 +8407,6 @@ void wxGrid::ShowCellEditControl()
             if (rect.y > 0)
                 rect.y--;
 
             if (rect.y > 0)
                 rect.y--;
 

-            wxGridCellAttr* attr = GetCellAttr(row, col);

             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {


@@ -7759,42 +8422,50 @@ 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;
                 }
                     else
                         break;
                 }

+

                 if (rect.GetRight() > client_right)
                 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 );

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

             editor->Show( true, attr );
 
             // recalc dimensions in case we need to
             editor->Show( true, attr );
 
             // recalc dimensions in case we need to


@@ -7810,7 +8481,6 @@ void wxGrid::ShowCellEditControl()
     }
 }
 
     }
 }
 

-

 void wxGrid::HideCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
 void wxGrid::HideCellEditControl()
 {
     if ( IsCellEditControlEnabled() )


@@ -7818,25 +8488,28 @@ 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();
         attr->DecRef();
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->Show( false );
         editor->DecRef();
         attr->DecRef();

+

         m_gridWin->SetFocus();
         m_gridWin->SetFocus();

+

         // refresh whole row to the right
         wxRect rect( CellToRect(row, col) );
         CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
         rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
         // refresh whole row to the right
         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
 #ifdef __WXMAC__
         // ensure that the pixels under the focus ring get refreshed as well

-        rect.Inflate(10,10);
+        rect.Inflate(10, 10);

 #endif
 #endif

+

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

-

 void wxGrid::SaveEditControlValue()
 {
     if ( IsCellEditControlEnabled() )
 void wxGrid::SaveEditControlValue()
 {
     if ( IsCellEditControlEnabled() )


@@ -7844,7 +8517,7 @@ void wxGrid::SaveEditControlValue()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 

-        wxString oldval = GetCellValue(row,col);
+        wxString oldval = GetCellValue(row, col);

 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);


@@ -7857,16 +8530,15 @@ void wxGrid::SaveEditControlValue()
         {
             if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
                        m_currentCellCoords.GetRow(),
         {
             if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
                        m_currentCellCoords.GetRow(),

-                       m_currentCellCoords.GetCol() ) < 0 ) {
-
+                       m_currentCellCoords.GetCol() ) < 0 )
+            {

                 // Event has been vetoed, set the data back.
                 // Event has been vetoed, set the data back.

-                SetCellValue(row,col,oldval);
+                SetCellValue(row, col, oldval);

             }
         }
     }
 }
 
             }
         }
     }
 }
 

-

 //
 // ------ 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


@@ -7874,12 +8546,12 @@ void wxGrid::SaveEditControlValue()
 //  coordinates for mouse events etc.
 //
 
 //  coordinates for mouse events etc.
 //
 

-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) const

 {
     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;
     }


@@ -7889,7 +8561,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


@@ -7899,11 +8570,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
                            bool clipToMinMax)
 {
                            const wxArrayInt& BorderArray, int nMax,
                            bool clipToMinMax)
 {

-

     if (coord < 0)
         return clipToMinMax && (nMax > 0) ? 0 : -1;
 
     if (coord < 0)
         return clipToMinMax && (nMax > 0) ? 0 : -1;
 

-

     if (!defaultDist)
         defaultDist = 1;
 
     if (!defaultDist)
         defaultDist = 1;
 


@@ -7912,13 +8581,15 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 
     if (BorderArray.IsEmpty())
     {
 
     if (BorderArray.IsEmpty())
     {

-        if((int) i_max < nMax)
+        if ((int) i_max < nMax)

             return i_max;
         return clipToMinMax ? nMax - 1 : -1;
     }
 
     if ( i_max >= BorderArray.GetCount())
             return i_max;
         return clipToMinMax ? nMax - 1 : -1;
     }
 
     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])


@@ -7929,9 +8600,11 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
             else
                 i_max =  BorderArray.GetCount() - 1;
         }
             else
                 i_max =  BorderArray.GetCount() - 1;
         }

+

         if ( i_max >= BorderArray.GetCount())
             i_max = BorderArray.GetCount() - 1;
     }
         if ( i_max >= BorderArray.GetCount())
             i_max = BorderArray.GetCount() - 1;
     }

+

     if ( coord >= BorderArray[i_max])
         return clipToMinMax ? (int)i_max : -1;
     if ( coord < BorderArray[0] )
     if ( coord >= BorderArray[i_max])
         return clipToMinMax ? (int)i_max : -1;
     if ( coord < BorderArray[0] )


@@ -7951,100 +8624,163 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
         else
             i_min = median;
     }
         else
             i_min = median;
     }

+

     return i_max;
 }
 
     return i_max;
 }
 

-int wxGrid::YToRow( int y )
+int wxGrid::YToRow( int y ) const

 {
     return CoordToRowOrCol(y, m_defaultRowHeight,
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 
 {
     return CoordToRowOrCol(y, m_defaultRowHeight,
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 

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

 {
 {

-    return CoordToRowOrCol(x, m_defaultColWidth,
-                           m_minAcceptableColWidth, m_colRights, m_numCols, false);
-}
+    if (x < 0)
+        return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;

 
 

+    wxASSERT_MSG(m_defaultColWidth > 0, wxT("Default column width can not be zero"));

 
 

-// return the row number that that the y coord is near the edge of, or
-// -1 if not near an edge
+    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.
+// 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 wxGrid::YToEdgeOfRow( int y ) const

 {
     int i;
     i = internalYToRow(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.
         if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
             return i;
     {
         // We know that we are in row i, test whether we are
         // close enough to lower or upper border, respectively.
         if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
             return i;

-        else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
+        else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )

             return i - 1;
     }
 
     return -1;
 }
 
             return i - 1;
     }
 
     return -1;
 }
 

-

 // 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 wxGrid::XToEdgeOfCol( int x ) const

 {
     int i;
     i = internalXToCol(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;

-        else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
+        else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )

             return i - 1;
     }
 
     return -1;
 }
 
             return i - 1;
     }
 
     return -1;
 }
 

-
-wxRect wxGrid::CellToRect( int row, int col )
+wxRect wxGrid::CellToRect( int row, int col ) const

 {
     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);
     }
 
     // if grid lines are enabled, then the area of the cell is a bit smaller
             rect.height += GetRowHeight(i);
     }
 
     // if grid lines are enabled, then the area of the cell is a bit smaller

-    if (m_gridLinesEnabled) {
+    if (m_gridLinesEnabled)
+    {

         rect.width -= 1;
         rect.height -= 1;
     }
         rect.width -= 1;
         rect.height -= 1;
     }

+

     return rect;
 }
 
     return rect;
 }
 

-
-bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const

 {
     // get the cell rectangle in logical coords
     //
 {
     // get the cell rectangle in logical coords
     //


@@ -8057,45 +8793,39 @@ 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)) );

     }
 }
 
     }
 }
 

-

 // make the specified cell location visible by doing a minimal amount
 // of scrolling
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {
 // make the specified cell location visible by doing a minimal amount
 // of scrolling
 //
 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 );


@@ -8111,7 +8841,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 )


@@ -8122,15 +8852,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;
         }
 
             ypos += m_scrollLineY;
         }
 

-        if ( left < 0 )
+        // special handling for wide cells - show always left part of the cell!
+        // Otherwise, e.g. when stepping from row to row, it would jump between
+        // left and right part of the cell on every step!
+//      if ( left < 0 )
+        if ( left < 0 || (right - left) >= cw )

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


@@ -8145,7 +8879,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;


@@ -8157,17 +8891,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;


@@ -8181,31 +8914,31 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetRow() > 0 )
         {
         }
         else if ( m_currentCellCoords.GetRow() > 0 )
         {

+            int row = m_currentCellCoords.GetRow() - 1;
+            int col = m_currentCellCoords.GetCol();

             ClearSelection();
             ClearSelection();

-            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                            m_currentCellCoords.GetCol() );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );

         }
         else
             return false;
         }
         else
             return false;

+

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


@@ -8215,24 +8948,24 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
         }
         else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
         {
         }
         else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
         {

+            int row = m_currentCellCoords.GetRow() + 1;
+            int col = m_currentCellCoords.GetCol();

             ClearSelection();
             ClearSelection();

-            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                            m_currentCellCoords.GetCol() );
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );

         }
         else
             return false;
         }
         else
             return false;

+

         return true;
     }
 
     return false;
 }
 
         return true;
     }
 
     return false;
 }
 

-

 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 )


@@ -8247,26 +8980,27 @@ 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 col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) - 1 );

             ClearSelection();
             ClearSelection();

-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() - 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() - 1 );
+
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );

         }
         else
             return false;
         }
         else
             return false;

+

         return true;
     }
 
     return false;
 }
 
         return true;
     }
 
     return false;
 }
 

-

 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 )


@@ -8281,26 +9015,28 @@ 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 col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) + 1 );

             ClearSelection();
             ClearSelection();

-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() + 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() + 1 );
+
+            MakeCellVisible( row, col );
+            SetCurrentCell( row, col );

         }
         else
             return false;
         }
         else
             return false;

+

         return true;
     }
 
     return false;
 }
 
         return true;
     }
 
     return false;
 }
 

-

 bool wxGrid::MovePageUp()
 {
 bool wxGrid::MovePageUp()
 {

-    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;

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


@@ -8313,7 +9049,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;
         }
 


@@ -8328,10 +9064,11 @@ bool wxGrid::MovePageUp()
 
 bool wxGrid::MovePageDown()
 {
 
 bool wxGrid::MovePageDown()
 {

-    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;

 
     int row = m_currentCellCoords.GetRow();
 
     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 );


@@ -8340,7 +9077,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;
         }
 


@@ -8356,7 +9093,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();


@@ -8369,19 +9106,21 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             //
             while ( row > 0 )
             {
             //
             while ( row > 0 )
             {

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

             }
         }
             }
         }

-        else if ( m_table->IsEmptyCell(row-1, col) )
+        else if ( m_table->IsEmptyCell(row - 1, col) )

         {
             // starting at the top of a block: find the next block
             //
             row--;
             while ( row > 0 )
             {
         {
             // starting at the top of a block: find the next block
             //
             row--;
             while ( row > 0 )
             {

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

             }
         }
         else
             }
         }
         else


@@ -8390,10 +9129,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;
                 }
             }


@@ -8410,6 +9149,7 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             ClearSelection();
             SetCurrentCell( row, col );
         }
             ClearSelection();
             SetCurrentCell( row, col );
         }

+

         return true;
     }
 
         return true;
     }
 


@@ -8419,8 +9159,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();


@@ -8430,33 +9170,35 @@ 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++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
+                row++;
+                if ( !(m_table->IsEmptyCell(row, col)) )
+                    break;

             }
         }
             }
         }

-        else if ( m_table->IsEmptyCell(row+1, col) )
+        else if ( m_table->IsEmptyCell(row + 1, col) )

         {
             // starting at the bottom of a block: find the next block
             //
             row++;
         {
             // starting at the bottom of a block: find the next block
             //
             row++;

-            while ( row < m_numRows-1 )
+            while ( row < m_numRows - 1 )

             {
             {

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

             }
         }
         else
         {
             // starting within a block: find the bottom of the block
             //
             }
         }
         else
         {
             // 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;
                 }
             }


@@ -8483,7 +9225,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();


@@ -8496,19 +9238,21 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             //
             while ( col > 0 )
             {
             //
             while ( col > 0 )
             {

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

             }
         }
             }
         }

-        else if ( m_table->IsEmptyCell(row, col-1) )
+        else if ( m_table->IsEmptyCell(row, col - 1) )

         {
             // starting at the left of a block: find the next block
             //
             col--;
             while ( col > 0 )
             {
         {
             // starting at the left of a block: find the next block
             //
             col--;
             while ( col > 0 )
             {

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

             }
         }
         else
             }
         }
         else


@@ -8517,10 +9261,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;
                 }
             }


@@ -8547,8 +9291,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();


@@ -8558,33 +9302,35 @@ 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++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
+                col++;
+                if ( !(m_table->IsEmptyCell(row, col)) )
+                    break;

             }
         }
             }
         }

-        else if ( m_table->IsEmptyCell(row, col+1) )
+        else if ( m_table->IsEmptyCell(row, col + 1) )

         {
             // starting at the right of a block: find the next block
             //
             col++;
         {
             // starting at the right of a block: find the next block
             //
             col++;

-            while ( col < m_numCols-1 )
+            while ( col < m_numCols - 1 )

             {
             {

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

             }
         }
         else
         {
             // starting within a block: find the right of the block
             //
             }
         }
         else
         {
             // 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;
                 }
             }


@@ -8608,30 +9354,32 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
     return false;
 }
 
     return false;
 }
 

-
-

 //
 // ------ Label values and formatting
 //
 
 //
 // ------ Label values and formatting
 //
 

-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const

 {
 {

-    *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 ) const

 {
 {

-    *horiz = m_colLabelHorizAlign;
-    *vert  = m_colLabelVertAlign;
+    if ( horiz )
+        *horiz = m_colLabelHorizAlign;
+    if ( vert )
+        *vert  = m_colLabelVertAlign;

 }
 
 }
 

-int wxGrid::GetColLabelTextOrientation()
+int wxGrid::GetColLabelTextOrientation() const

 {
     return m_colLabelTextOrientation;
 }
 
 {
     return m_colLabelTextOrientation;
 }
 

-wxString wxGrid::GetRowLabelValue( int row )
+wxString wxGrid::GetRowLabelValue( int row ) const

 {
     if ( m_table )
     {
 {
     if ( m_table )
     {


@@ -8645,7 +9393,7 @@ wxString wxGrid::GetRowLabelValue( int row )
     }
 }
 
     }
 }
 

-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const

 {
     if ( m_table )
     {
 {
     if ( m_table )
     {


@@ -8659,10 +9407,15 @@ wxString wxGrid::GetColLabelValue( int col )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetRowLabelSize( int width )
 {
 void wxGrid::SetRowLabelSize( int width )
 {

-    width = wxMax( width, 0 );
+    wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE );
+
+    if ( width == wxGRID_AUTOSIZE )
+    {
+        width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW);
+    }
+

     if ( width != m_rowLabelWidth )
     {
         if ( width == 0 )
     if ( width != m_rowLabelWidth )
     {
         if ( width == 0 )


@@ -8673,7 +9426,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;


@@ -8682,10 +9436,15 @@ void wxGrid::SetRowLabelSize( int width )
     }
 }
 
     }
 }
 

-

 void wxGrid::SetColLabelSize( int height )
 {
 void wxGrid::SetColLabelSize( int height )
 {

-    height = wxMax( height, 0 );
+    wxASSERT( height >=0 || height == wxGRID_AUTOSIZE );
+
+    if ( height == wxGRID_AUTOSIZE )
+    {
+        height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN);
+    }
+

     if ( height != m_colLabelHeight )
     {
         if ( height == 0 )
     if ( height != m_colLabelHeight )
     {
         if ( height == 0 )


@@ -8696,7 +9455,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;


@@ -8705,7 +9465,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 )


@@ -8822,15 +9581,11 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
 //
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {
 //
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {

-    if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
-    {
+    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 )


@@ -8840,7 +9595,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);


@@ -8883,7 +9638,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 )


@@ -8900,15 +9654,17 @@ void wxGrid::SetCellHighlightColour( const wxColour& colour )
 
 void wxGrid::SetCellHighlightPenWidth(int width)
 {
 
 void wxGrid::SetCellHighlightPenWidth(int width)
 {

-    if (m_cellHighlightPenWidth != width) {
+    if (m_cellHighlightPenWidth != width)
+    {

         m_cellHighlightPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         m_cellHighlightPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();

-        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )

             return;
             return;

+

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


@@ -8916,7 +9672,8 @@ void wxGrid::SetCellHighlightPenWidth(int width)
 
 void wxGrid::SetCellHighlightROPenWidth(int width)
 {
 
 void wxGrid::SetCellHighlightROPenWidth(int width)
 {

-    if (m_cellHighlightROPenWidth != width) {
+    if (m_cellHighlightROPenWidth != width)
+    {

         m_cellHighlightROPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't
         m_cellHighlightROPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't


@@ -8925,6 +9682,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);
     }


@@ -8952,25 +9710,24 @@ void wxGrid::EnableGridLines( bool enable )
     }
 }
 
     }
 }
 

-
-int wxGrid::GetDefaultRowSize()
+int wxGrid::GetDefaultRowSize() const

 {
     return m_defaultRowHeight;
 }
 
 {
     return m_defaultRowHeight;
 }
 

-int wxGrid::GetRowSize( int row )
+int wxGrid::GetRowSize( int row ) const

 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
     return GetRowHeight(row);
 }
 
 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
     return GetRowHeight(row);
 }
 

-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const

 {
     return m_defaultColWidth;
 }
 
 {
     return m_defaultColWidth;
 }
 

-int wxGrid::GetColSize( int col )
+int wxGrid::GetColSize( int col ) const

 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 
 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 


@@ -9014,7 +9771,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


@@ -9035,30 +9791,30 @@ void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// access to the default attrbiutes
+// access to the default attributes

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxColour wxGrid::GetDefaultCellBackgroundColour() const

 {
     return m_defaultCellAttr->GetBackgroundColour();
 }
 
 {
     return m_defaultCellAttr->GetBackgroundColour();
 }
 

-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const

 {
     return m_defaultCellAttr->GetTextColour();
 }
 
 {
     return m_defaultCellAttr->GetTextColour();
 }
 

-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const

 {
     return m_defaultCellAttr->GetFont();
 }
 
 {
     return m_defaultCellAttr->GetFont();
 }
 

-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const

 {
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 
 {
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 

-bool wxGrid::GetDefaultCellOverflow()
+bool wxGrid::GetDefaultCellOverflow() const

 {
     return m_defaultCellAttr->GetOverflow();
 }
 {
     return m_defaultCellAttr->GetOverflow();
 }


@@ -9070,60 +9826,64 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {

-    return m_defaultCellAttr->GetEditor(NULL,0,0);
+    return m_defaultCellAttr->GetEditor(NULL, 0, 0);

 }
 
 // ----------------------------------------------------------------------------
 // access to cell attributes
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // access to cell attributes
 // ----------------------------------------------------------------------------
 

-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+wxColour wxGrid::GetCellBackgroundColour(int row, int col) const

 {
     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;
 }
 

-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int row, int col ) const

 {
     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;
 }
 

-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int row, int col ) const

 {
     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;
 }
 

-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
     attr->DecRef();
 }
 
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
     attr->DecRef();
 }
 

-bool wxGrid::GetCellOverflow( int row, int col )
+bool wxGrid::GetCellOverflow( int row, int col ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     bool allow = attr->GetOverflow();
     attr->DecRef();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     bool allow = attr->GetOverflow();
     attr->DecRef();

+

     return allow;
 }
 
     return allow;
 }
 

-void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetSize( num_rows, num_cols );
     attr->DecRef();
 }
 
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetSize( num_rows, num_cols );
     attr->DecRef();
 }
 

-wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) const

 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);


@@ -9132,7 +9892,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
     return renderer;
 }
 
     return renderer;
 }
 

-wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const

 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellEditor* editor = attr->GetEditor(this, row, col);
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellEditor* editor = attr->GetEditor(this, row, col);


@@ -9146,6 +9906,7 @@ bool wxGrid::IsReadOnly(int row, int col) const
     wxGridCellAttr* attr = GetCellAttr(row, col);
     bool isReadOnly = attr->IsReadOnly();
     attr->DecRef();
     wxGridCellAttr* attr = GetCellAttr(row, col);
     bool isReadOnly = attr->IsReadOnly();
     attr->DecRef();

+

     return isReadOnly;
 }
 
     return isReadOnly;
 }
 


@@ -9153,7 +9914,7 @@ bool wxGrid::IsReadOnly(int row, int col) const
 // attribute support: cache, automatic provider creation, ...
 // ----------------------------------------------------------------------------
 
 // attribute support: cache, automatic provider creation, ...
 // ----------------------------------------------------------------------------
 

-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const

 {
     if ( !m_table )
     {
 {
     if ( !m_table )
     {


@@ -9205,6 +9966,7 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheMisses++;
 #endif
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheMisses++;
 #endif

+

         return false;
     }
 }
         return false;
     }
 }


@@ -9218,11 +9980,12 @@ 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);
         }
     }

+

     if (attr)
     {
         attr->SetDefAttr(m_defaultCellAttr);
     if (attr)
     {
         attr->SetDefAttr(m_defaultCellAttr);


@@ -9285,7 +10048,7 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision)
 void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {
     wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
 void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {
     wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );

-    if(!attr)
+    if (!attr)

         attr = new wxGridCellAttr;
     wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
     attr->SetRenderer(renderer);
         attr = new wxGridCellAttr;
     wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
     attr->SetRenderer(renderer);


@@ -9411,9 +10174,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))
                     {


@@ -9430,14 +10193,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();
                     }
                 }


@@ -9488,25 +10251,27 @@ 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 )
     {

-        wxFAIL_MSG(wxT("Unknown data type name"));
+        wxString errStr;
+
+        errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
+        wxFAIL_MSG(errStr.c_str());

 
         return NULL;
     }
 
         return NULL;
     }


@@ -9514,13 +10279,15 @@ 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 )
     {

-        wxFAIL_MSG(wxT("Unknown data type name"));
+        wxString errStr;
+
+        errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
+        wxFAIL_MSG(errStr.c_str());

 
         return NULL;
     }
 
         return NULL;
     }


@@ -9528,7 +10295,6 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const
     return m_typeRegistry->GetRenderer(index);
 }
 
     return m_typeRegistry->GetRenderer(index);
 }
 

-

 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------


@@ -9538,7 +10304,6 @@ void wxGrid::EnableDragRowSize( bool enable )
     m_canDragRowSize = enable;
 }
 
     m_canDragRowSize = enable;
 }
 

-

 void wxGrid::EnableDragColSize( bool enable )
 {
     m_canDragColSize = enable;
 void wxGrid::EnableDragColSize( bool enable )
 {
     m_canDragColSize = enable;


@@ -9576,7 +10341,8 @@ void wxGrid::SetRowSize( int row, int height )
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 
     // See comment in SetColSize
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 
     // See comment in SetColSize

-    if ( height < GetRowMinimalAcceptableHeight()) { return; }
+    if ( height < GetRowMinimalAcceptableHeight())
+        return;

 
     if ( m_rowHeights.IsEmpty() )
     {
 
     if ( m_rowHeights.IsEmpty() )
     {


@@ -9588,18 +10354,19 @@ void wxGrid::SetRowSize( int row, int height )
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;

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

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

+

     if ( !GetBatchCount() )
         CalcDimensions();
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {
     if ( !GetBatchCount() )
         CalcDimensions();
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {

-    m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
+    // we dont allow zero default column width
+    m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );

 
     if ( resizeExistingCols )
     {
 
     if ( resizeExistingCols )
     {


@@ -9621,12 +10388,13 @@ 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
 

-    if ( width < GetColMinimalAcceptableWidth()) { return; }
+    if ( width < GetColMinimalAcceptableWidth() )
+        return;

 
     if ( m_colWidths.IsEmpty() )
     {
 
     if ( m_colWidths.IsEmpty() )
     {


@@ -9634,34 +10402,35 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
         InitColWidths();
     }
 

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

     {
     {

-      long w, h;
-      wxArrayString lines;
-      wxClientDC dc(m_colLabelWin);
-      dc.SetFont(GetLabelFont());
-      StringToLines(GetColLabelValue(col), lines);
-      GetTextBoxSize(dc, lines, &w, &h);
-      width = w + 6;
+        long w, h;
+        wxArrayString lines;
+        wxClientDC dc(m_colLabelWin);
+        dc.SetFont(GetLabelFont());
+        StringToLines(GetColLabelValue(col), lines);
+        GetTextBoxSize(dc, lines, &w, &h);
+        width = w + 6;

     }
     }

+

     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 
     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 

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

     {
     {

-        m_colRights[i] += diff;
+        m_colRights[GetColAt(colPos)] += diff;

     }
     }

+

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

-

 void wxGrid::SetColMinimalWidth( int col, int width )
 {
 void wxGrid::SetColMinimalWidth( int col, int width )
 {

-    if (width > GetColMinimalAcceptableWidth()) {
+    if (width > GetColMinimalAcceptableWidth())
+    {

         wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
         m_colMinWidths[key] = width;
     }
         wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
         m_colMinWidths[key] = width;
     }


@@ -9669,7 +10438,8 @@ void wxGrid::SetColMinimalWidth( int col, int width )
 
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
 
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {

-    if (width > GetRowMinimalAcceptableHeight()) {
+    if (width > GetRowMinimalAcceptableHeight())
+    {

         wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
         m_rowMinHeights[key] = width;
     }
         wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
         m_rowMinHeights[key] = width;
     }


@@ -9679,6 +10449,7 @@ int wxGrid::GetColMinimalWidth(int col) const
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);

+

     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 


@@ -9686,26 +10457,25 @@ int wxGrid::GetRowMinimalHeight(int row) const
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
 {
     wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);

+

     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
 
 void wxGrid::SetColMinimalAcceptableWidth( int width )
 {
     // We do allow a width of 0 since this gives us
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
 
 void wxGrid::SetColMinimalAcceptableWidth( int width )
 {
     // We do allow a width of 0 since this gives us

-    // an easy way to temporarily hidding columns.
-    if ( width<0 )
-        return;
-    m_minAcceptableColWidth = width;
+    // an easy way to temporarily hiding columns.
+    if ( width >= 0 )
+        m_minAcceptableColWidth = width;

 }
 
 void wxGrid::SetRowMinimalAcceptableHeight( int height )
 {
     // We do allow a height of 0 since this gives us
 }
 
 void wxGrid::SetRowMinimalAcceptableHeight( int height )
 {
     // We do allow a height of 0 since this gives us

-    // an easy way to temporarily hidding rows.
-    if ( height<0 )
-        return;
-    m_minAcceptableRowHeight = height;
-};
+    // an easy way to temporarily hiding rows.
+    if ( height >= 0 )
+        m_minAcceptableRowHeight = height;
+}

 
 int  wxGrid::GetColMinimalAcceptableWidth() const
 {
 
 int  wxGrid::GetColMinimalAcceptableWidth() const
 {


@@ -9721,15 +10491,18 @@ int  wxGrid::GetRowMinimalAcceptableHeight() const
 // auto sizing
 // ----------------------------------------------------------------------------
 
 // auto sizing
 // ----------------------------------------------------------------------------
 

-void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
+void
+wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)

 {
 {

+    const bool column = direction == wxGRID_COLUMN;
+

     wxClientDC dc(m_gridWin);
 
     wxClientDC dc(m_gridWin);
 

-    //Cancel editting of cell
+    // cancel editing of cell

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

-    // init both of them to avoid compiler warnings, even if weo nly need one
+    // init both of them to avoid compiler warnings, even if we only need one

     int row = -1,
         col = -1;
     if ( column )
     int row = -1,
         col = -1;
     if ( column )


@@ -9746,16 +10519,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();
         }


@@ -9769,41 +10540,35 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 
     if ( column )
     {
 
     if ( column )
     {

-        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
-        if( GetColLabelTextOrientation() == wxVERTICAL )
+        dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );
+        if ( GetColLabelTextOrientation() == wxVERTICAL )

             w = h;
     }
     else
             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
     {
         if ( column )
         extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
     }
     else
     {
         if ( column )

-        {

             // leave some space around text
             extentMax += 10;
             // leave some space around text
             extentMax += 10;

-        }

         else
         else

-        {

             extentMax += 6;
             extentMax += 6;

-        }

     }
 
     if ( column )
     {
     }
 
     if ( column )
     {

-        SetColSize(col, extentMax);
+        SetColSize( col, extentMax );

         if ( !GetBatchCount() )
         {
             int cw, ch, dummy;
         if ( !GetBatchCount() )
         {
             int cw, ch, dummy;


@@ -9823,7 +10588,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;


@@ -9831,6 +10596,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 )


@@ -9840,26 +10606,75 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     }
 }
 
     }
 }
 

+wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction)
+{
+    // calculate size for the rows or columns?
+    const bool calcRows = direction == wxGRID_ROW;
+
+    wxClientDC dc(calcRows ? GetGridRowLabelWindow()
+                           : GetGridColLabelWindow());
+    dc.SetFont(GetLabelFont());
+
+    // which dimension should we take into account for calculations?
+    //
+    // for columns, the text can be only horizontal so it's easy but for rows
+    // we also have to take into account the text orientation
+    const bool
+        useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL);
+
+    wxArrayString lines;
+    wxCoord extentMax = 0;
+
+    const int numRowsOrCols = calcRows ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ )
+    {
+        lines.Clear();
+
+        wxString label = calcRows ? GetRowLabelValue(rowOrCol)
+                                  : GetColLabelValue(rowOrCol);
+        StringToLines(label, lines);
+
+        long w, h;
+        GetTextBoxSize(dc, lines, &w, &h);
+
+        const wxCoord extent = useWidth ? w : h;
+        if ( extent > extentMax )
+            extentMax = extent;
+    }
+
+    if ( !extentMax )
+    {
+        // empty column - give default extent (notice that if extentMax is less
+        // than default extent but != 0, it's OK)
+        extentMax = calcRows ? GetDefaultRowLabelSize()
+                             : GetDefaultColLabelSize();
+    }
+
+    // leave some space around text (taken from AutoSizeColOrRow)
+    if ( calcRows )
+        extentMax += 10;
+    else
+        extentMax += 6;
+
+    return extentMax;
+}
+

 int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
     int width = m_rowLabelWidth;
 
 int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
     int width = m_rowLabelWidth;
 

-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);

 
     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);
     }
 

-    if ( !calcOnly )
-        EndBatch();
-

     return width;
 }
 
     return width;
 }
 


@@ -9867,43 +10682,36 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
     int height = m_colLabelHeight;
 
 {
     int height = m_colLabelHeight;
 

-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);

 
     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )
 
     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )

-        {

             AutoSizeRow(row, setAsMin);
             AutoSizeRow(row, setAsMin);

-        }

 
         height += GetRowHeight(row);
     }
 
 
         height += GetRowHeight(row);
     }
 

-    if ( !calcOnly )
-        EndBatch();
-

     return height;
 }
 
 void wxGrid::AutoSize()
 {
     return height;
 }
 
 void wxGrid::AutoSize()
 {

-    BeginBatch();
+    wxGridUpdateLocker locker(this);

 
 

-    wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));
-
-    // round up the size to a multiple of scroll step - this ensures that we
-    // 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);
+    // we need to round up the size of the scrollable area to a multiple of
+    // scroll step to ensure that we don't get the scrollbars when we're sized
+    // exactly to fit our contents
+    wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
+                SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
+    wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+                   GetScrollY(size.y) * GetScrollLineY());

 
     // 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

-
-    // Remove the extra m_extraWidth + 1 added above
-    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+    wxCoord diff = sizeFit.x - size.x;

     if ( diff && m_numCols )
     {
         // try to resize the columns uniformly
     if ( diff && m_numCols )
     {
         // try to resize the columns uniformly


@@ -9928,7 +10736,7 @@ void wxGrid::AutoSize()
     }
 
     // same for rows
     }
 
     // same for rows

-    diff = sizeFit.y - size.y - (m_extraHeight + 1);
+    diff = sizeFit.y - size.y;

     if ( diff && m_numRows )
     {
         // try to resize the columns uniformly
     if ( diff && m_numRows )
     {
         // try to resize the columns uniformly


@@ -9952,9 +10760,11 @@ void wxGrid::AutoSize()
         }
     }
 
         }
     }
 

-    EndBatch();
-
-    SetClientSize(sizeFit);
+    // we know that we're not going to have scrollbars so disable them now to
+    // avoid trouble in SetClientSize() which can otherwise set the correct
+    // client size but also leave space for (not needed any more) scrollbars
+    SetScrollbars(0, 0, 0, 0, 0, 0, true);
+    SetClientSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight);

 }
 
 void wxGrid::AutoSizeRowLabelSize( int row )
 }
 
 void wxGrid::AutoSizeRowLabelSize( int row )


@@ -9963,8 +10773,8 @@ void wxGrid::AutoSizeRowLabelSize( int row )
     long w, h;
 
     // Hide the edit control, so it
     long w, h;
 
     // Hide the edit control, so it

-    // won't interfer with drag-shrinking.
-    if( IsCellEditControlShown() )
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )

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


@@ -9973,8 +10783,8 @@ 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);
-    if( h < m_defaultRowHeight )
+    GetTextBoxSize( dc, lines, &w, &h );
+    if ( h < m_defaultRowHeight )

         h = m_defaultRowHeight;
     SetRowSize(row, h);
     ForceRefresh();
         h = m_defaultRowHeight;
     SetRowSize(row, h);
     ForceRefresh();


@@ -9986,8 +10796,8 @@ 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.
-    if( IsCellEditControlShown() )
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )

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


@@ -9996,11 +10806,11 @@ void wxGrid::AutoSizeColLabelSize( int col )
     // autosize column width depending on label text
     StringToLines( GetColLabelValue( col ), lines );
     wxClientDC dc( m_colLabelWin );
     // autosize column width depending on label text
     StringToLines( GetColLabelValue( col ), lines );
     wxClientDC dc( m_colLabelWin );

-    if( GetColLabelTextOrientation() == wxHORIZONTAL )
-        GetTextBoxSize( dc, lines, &w, &h);
+    if ( GetColLabelTextOrientation() == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &w, &h );

     else
     else

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

         w = m_defaultColWidth;
     SetColSize(col, w);
     ForceRefresh();
         w = m_defaultColWidth;
     SetColSize(col, w);
     ForceRefresh();


@@ -10008,40 +10818,22 @@ void wxGrid::AutoSizeColLabelSize( int col )
 
 wxSize wxGrid::DoGetBestSize() const
 {
 
 wxSize wxGrid::DoGetBestSize() const
 {

-    // don't set sizes, only calculate them

     wxGrid *self = (wxGrid *)this;  // const_cast
 
     wxGrid *self = (wxGrid *)this;  // const_cast
 

-    int width, height;
-    width = self->SetOrCalcColumnSizes(true);
-    height = self->SetOrCalcRowSizes(true);
-
-    if (!width) width=100;
-    if (!height) height=80;
-
-    // Round up to a multiple the scroll rate NOTE: this still doesn't get rid
-    // of the scrollbars, is there any magic incantaion for that?
-    int xpu, ypu;
-    GetScrollPixelsPerUnit(&xpu, &ypu);
-    if (xpu)
-        width  += 1 + xpu - (width  % xpu);
-    if (ypu)
-        height += 1 + ypu - (height % ypu);
+    // we do the same as in AutoSize() here with the exception that we don't
+    // change the column/row sizes, only calculate them
+    wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth,
+                self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight);
+    wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+                   GetScrollY(size.y) * GetScrollLineY());

 
 

-    // limit to 1/4 of the screen size
-    int maxwidth, maxheight;
-    wxDisplaySize( & maxwidth, & maxheight );
-    maxwidth /= 2;
-    maxheight /= 2;
-    if ( width > maxwidth ) width = maxwidth;
-    if ( height > maxheight ) height = maxheight;
-
-
-    wxSize best(width, height);

     // NOTE: This size should be cached, but first we need to add calls to
     // InvalidateBestSize everywhere that could change the results of this
     // calculation.
     // CacheBestSize(size);
     // NOTE: This size should be cached, but first we need to add calls to
     // InvalidateBestSize everywhere that could change the results of this
     // calculation.
     // CacheBestSize(size);

-    return best;
+
+    return wxSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight)
+            + GetWindowBorderSize();

 }
 
 void wxGrid::Fit()
 }
 
 void wxGrid::Fit()


@@ -10049,7 +10841,6 @@ void wxGrid::Fit()
     AutoSize();
 }
 
     AutoSize();
 }
 

-

 wxPen& wxGrid::GetDividerPen() const
 {
     return wxNullPen;
 wxPen& wxGrid::GetDividerPen() const
 {
     return wxNullPen;


@@ -10087,10 +10878,9 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
     }
 }
 
     }
 }
 

-
-//
-// ------ Block, row and col selection
-//
+// ----------------------------------------------------------------------------
+// block, row and column selection
+// ----------------------------------------------------------------------------

 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {


@@ -10101,7 +10891,6 @@ void wxGrid::SelectRow( int row, bool addToSelected )
         m_selection->SelectRow( row, false, addToSelected );
 }
 
         m_selection->SelectRow( row, false, addToSelected );
 }
 

-

 void wxGrid::SelectCol( int col, bool addToSelected )
 {
     if ( IsSelection() && !addToSelected )
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
     if ( IsSelection() && !addToSelected )


@@ -10111,7 +10900,6 @@ void wxGrid::SelectCol( int col, bool addToSelected )
         m_selection->SelectCol( col, false, addToSelected );
 }
 
         m_selection->SelectCol( col, false, addToSelected );
 }
 

-

 void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
                           bool addToSelected )
 {
 void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
                           bool addToSelected )
 {


@@ -10123,19 +10911,18 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
                                   false, addToSelected );
 }
 
                                   false, addToSelected );
 }
 

-

 void wxGrid::SelectAll()
 {
     if ( m_numRows > 0 && m_numCols > 0 )
     {
         if ( m_selection )
 void wxGrid::SelectAll()
 {
     if ( m_numRows > 0 && m_numCols > 0 )
     {
         if ( m_selection )

-            m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+            m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 );

     }
 }
 
     }
 }
 

-//
-// ------ Cell, row and col deselection
-//
+// ----------------------------------------------------------------------------
+// cell, row and col deselection
+// ----------------------------------------------------------------------------

 
 void wxGrid::DeselectRow( int row )
 {
 
 void wxGrid::DeselectRow( int row )
 {


@@ -10145,15 +10932,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);

         }
     }
 }
         }
     }
 }


@@ -10166,12 +10953,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);


@@ -10185,7 +10972,7 @@ void wxGrid::DeselectCell( int row, int col )
         m_selection->ToggleCellSelection(row, col);
 }
 
         m_selection->ToggleCellSelection(row, col);
 }
 

-bool wxGrid::IsSelection()
+bool wxGrid::IsSelection() const

 {
     return ( m_selection && (m_selection->IsSelection() ||
              ( m_selectingTopLeft != wxGridNoCellCoords &&
 {
     return ( m_selection && (m_selection->IsSelection() ||
              ( m_selectingTopLeft != wxGridNoCellCoords &&


@@ -10203,45 +10990,73 @@ bool wxGrid::IsInSelection( int row, int col ) const
 
 wxGridCellCoordsArray wxGrid::GetSelectedCells() const
 {
 
 wxGridCellCoordsArray wxGrid::GetSelectedCells() const
 {

-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+

     return m_selection->m_cellSelection;
 }
     return m_selection->m_cellSelection;
 }

+

 wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
 {
 wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
 {

-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+

     return m_selection->m_blockSelectionTopLeft;
 }
     return m_selection->m_blockSelectionTopLeft;
 }

+

 wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
 {
 wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
 {

-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+

     return m_selection->m_blockSelectionBottomRight;
 }
     return m_selection->m_blockSelectionBottomRight;
 }

+

 wxArrayInt wxGrid::GetSelectedRows() const
 {
 wxArrayInt wxGrid::GetSelectedRows() const
 {

-    if (!m_selection) { wxArrayInt a; return a; }
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
+

     return m_selection->m_rowSelection;
 }
     return m_selection->m_rowSelection;
 }

+

 wxArrayInt wxGrid::GetSelectedCols() const
 {
 wxArrayInt wxGrid::GetSelectedCols() const
 {

-    if (!m_selection) { wxArrayInt a; return a; }
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
+

     return m_selection->m_colSelection;
 }
 
     return m_selection->m_colSelection;
 }
 

-

 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.
 //
 wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 // This function returns the rectangle that encloses the given block
 // in device coords clipped to the client size of the grid window.
 //
 wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,

-                                  const wxGridCellCoords &bottomRight )
+                                  const wxGridCellCoords &bottomRight ) const

 {
     wxRect rect( wxGridNoCellRect );
     wxRect cellRect;
 {
     wxRect rect( wxGridNoCellRect );
     wxRect cellRect;


@@ -10253,7 +11068,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     }
     else
     {
     }
     else
     {

-        rect = wxRect(0,0,0,0);
+        rect = wxRect(0, 0, 0, 0);

     }
 
     cellRect = CellToRect( bottomRight );
     }
 
     cellRect = CellToRect( bottomRight );


@@ -10283,7 +11098,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
         left = right;
         right = i;
         i = leftCol;
         left = right;
         right = i;
         i = leftCol;

-        leftCol=rightCol;
+        leftCol = rightCol;

         rightCol = i;
     }
 
         rightCol = i;
     }
 


@@ -10297,12 +11112,11 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
         bottomRow = i;
     }
 
         bottomRow = i;
     }
 

-

     for ( j = topRow; j <= bottomRow; j++ )
     {
         for ( i = leftCol; i <= rightCol; i++ )
         {
     for ( j = topRow; j <= bottomRow; j++ )
     {
         for ( i = leftCol; i <= rightCol; i++ )
         {

-            if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol))
+            if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol))

             {
                 cellRect = CellToRect( j, i );
 
             {
                 cellRect = CellToRect( j, i );
 


@@ -10315,7 +11129,10 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
                 if (cellRect.y + cellRect.height > bottom)
                     bottom = cellRect.y + cellRect.height;
             }
                 if (cellRect.y + cellRect.height > bottom)
                     bottom = cellRect.y + cellRect.height;
             }

-            else i = rightCol; // jump over inner cells.
+            else
+            {
+                i = rightCol; // jump over inner cells.
+            }

         }
     }
 
         }
     }
 


@@ -10338,9 +11155,9 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     return rect;
 }
 
     return rect;
 }
 

-//
-// ------ Grid event classes
-//
+// ----------------------------------------------------------------------------
+// grid event classes
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
 


@@ -10391,13 +11208,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);
 }


@@ -10417,4 +11234,3 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
 }
 
 #endif // wxUSE_GRID
 }
 
 #endif // wxUSE_GRID

-