]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/grid.cpp
Only use wxFORCE_LINK_MODULE() in mediaplayer sample in static build.
[wxWidgets.git] / src / generic / grid.cpp
index a286e3706e38dce9110cc106a994952f4db82ec2..a05a2d519ac37234b4ad0b512c4de1d793bd054e 100644 (file)
@@ -1,40 +1,33 @@
 ///////////////////////////////////////////////////////////////////////////
-// Name:        generic/grid.cpp
+// Name:        src/generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
-// Modified by: Robin Dunn, Vadim Zeitlin
+// 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
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+/*
+    TODO:
 
-#ifdef __GNUG__
-    #pragma implementation "grid.h"
-#endif
+    - Replace use of wxINVERT with wxOverlay
+    - Make Begin/EndBatch() the same as the generic Freeze/Thaw()
+    - Review the column reordering code, it's a mess.
+    - Implement row reordering after dealing with the columns.
+ */
 
-// For compilers that support precompilatixon, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #if wxUSE_GRID
 
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-    #include "gridg.cpp"
-#else // wxUSE_NEW_GRID
+#include "wx/grid.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/checkbox.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"
 #include "wx/spinctrl.h"
 #include "wx/tokenzr.h"
+#include "wx/renderer.h"
+#include "wx/headerctrl.h"
+#include "wx/hashset.h"
 
-#include "wx/grid.h"
 #include "wx/generic/gridsel.h"
+#include "wx/generic/gridctrl.h"
+#include "wx/generic/grideditors.h"
+#include "wx/generic/private/grid.h"
+
+const char wxGridNameStr[] = "grid";
 
 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 // Required for wxIs... functions
 #include <ctype.h>
 
-// ----------------------------------------------------------------------------
-// array classes
-// ----------------------------------------------------------------------------
-
-WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
-
-struct wxGridCellWithAttr
-{
-    wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_)
-        : coords(row, col), attr(attr_)
-    {
-    }
-
-    ~wxGridCellWithAttr()
-    {
-        attr->DecRef();
-    }
-
-    wxGridCellCoords coords;
-    wxGridCellAttr  *attr;
-};
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
-WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
+WX_DECLARE_HASH_SET_WITH_DECL(int, wxIntegerHash, wxIntegerEqual,
+                              wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV);
 
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
-DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
-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_RANGE_SELECT)
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
-DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
-DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
-DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
-DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
 
 // ----------------------------------------------------------------------------
-// private classes
+// globals
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
-{
-public:
-    wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
-    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 OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-
-    DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+namespace
 {
-public:
-    wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
-    wxGridColLabelWindow( 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 OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-
-    DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
 
+//#define DEBUG_ATTR_CACHE
+#ifdef DEBUG_ATTR_CACHE
+    static size_t gs_nAttrCacheHits = 0;
+    static size_t gs_nAttrCacheMisses = 0;
+#endif
 
-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+// this struct simply combines together the default header renderers
+//
+// as the renderers ctors are trivial, there is no problem with making them
+// globals
+struct DefaultHeaderRenderers
 {
-public:
-    wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
-    wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
-                             const wxPoint &pos, const wxSize &size );
+    wxGridColumnHeaderRendererDefault colRenderer;
+    wxGridRowHeaderRendererDefault rowRenderer;
+    wxGridCornerHeaderRendererDefault cornerRenderer;
+} gs_defaultHeaderRenderers;
 
-private:
-    wxGrid *m_owner;
+} // anonymous namespace
 
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnMouseWheel( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-    void OnPaint( wxPaintEvent& event );
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
 
-    DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
+wxGridCellCoords wxGridNoCellCoords( -1, -1 );
+wxRect wxGridNoCellRect( -1, -1, -1, -1 );
 
-class WXDLLEXPORT wxGridWindow : public wxWindow
+namespace
 {
-public:
-    wxGridWindow()
-    {
-        m_owner = (wxGrid *)NULL;
-        m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
-        m_colLabelWin = (wxGridColLabelWindow *)NULL;
-    }
-
-    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 );
-
-private:
-    wxGrid                   *m_owner;
-    wxGridRowLabelWindow     *m_rowLabelWin;
-    wxGridColLabelWindow     *m_colLabelWin;
+// scroll line size
+const size_t GRID_SCROLL_LINE_X = 15;
+const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
 
-    void OnPaint( wxPaintEvent &event );
-    void OnMouseWheel( wxMouseEvent& event );
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& );
-    void OnKeyUp( wxKeyEvent& );
-    void OnEraseBackground( wxEraseEvent& );
+// the size of hash tables used a bit everywhere (the max number of elements
+// in these hash tables is the number of rows/columns)
+const int GRID_HASH_SIZE = 100;
 
+// the minimal distance in pixels the mouse needs to move to start a drag
+// operation
+const int DRAG_SENSITIVITY = 3;
 
-    DECLARE_DYNAMIC_CLASS(wxGridWindow)
-    DECLARE_EVENT_TABLE()
-};
+} // anonymous namespace
 
+#include "wx/arrimpl.cpp"
 
+WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
+WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
-class wxGridCellEditorEvtHandler : public wxEvtHandler
-{
-public:
-    wxGridCellEditorEvtHandler()
-        : m_grid(0), m_editor(0)
-        { }
-    wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
-        : m_grid(grid), m_editor(editor)
-        { }
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
 
-    void OnKeyDown(wxKeyEvent& event);
-    void OnChar(wxKeyEvent& event);
+wxDEFINE_EVENT( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_RIGHT_DCLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_ROW_SIZE, wxGridSizeEvent );
+wxDEFINE_EVENT( wxEVT_GRID_COL_SIZE, wxGridSizeEvent );
+wxDEFINE_EVENT( wxEVT_GRID_COL_MOVE, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_COL_SORT, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_CHANGING, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_CELL_CHANGED, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_SELECT_CELL, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_EDITOR_SHOWN, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent );
+wxDEFINE_EVENT( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent );
 
-private:
-    wxGrid*             m_grid;
-    wxGridCellEditor*   m_editor;
-    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
-    DECLARE_EVENT_TABLE()
-};
+// ============================================================================
+// implementation
+// ============================================================================
 
+IMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler)
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler )
 BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
+    EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus )
     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
 END_EVENT_TABLE()
 
+BEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
+    EVT_HEADER_CLICK(wxID_ANY, wxGridHeaderCtrl::OnClick)
+    EVT_HEADER_DCLICK(wxID_ANY, wxGridHeaderCtrl::OnDoubleClick)
+    EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxGridHeaderCtrl::OnRightClick)
 
+    EVT_HEADER_BEGIN_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnBeginResize)
+    EVT_HEADER_RESIZING(wxID_ANY, wxGridHeaderCtrl::OnResizing)
+    EVT_HEADER_END_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnEndResize)
 
-// ----------------------------------------------------------------------------
-// the internal data representation used by wxGridCellAttrProvider
-// ----------------------------------------------------------------------------
+    EVT_HEADER_BEGIN_REORDER(wxID_ANY, wxGridHeaderCtrl::OnBeginReorder)
+    EVT_HEADER_END_REORDER(wxID_ANY, wxGridHeaderCtrl::OnEndReorder)
+END_EVENT_TABLE()
 
-// this class stores attributes set for cells
-class WXDLLEXPORT wxGridCellAttrData
+wxGridOperations& wxGridRowOperations::Dual() const
 {
-public:
-    void SetAttr(wxGridCellAttr *attr, int row, int col);
-    wxGridCellAttr *GetAttr(int row, int col) const;
-    void UpdateAttrRows( size_t pos, int numRows );
-    void UpdateAttrCols( size_t pos, int numCols );
-
-private:
-    // searches for the attr for given cell, returns wxNOT_FOUND if not found
-    int FindIndex(int row, int col) const;
+    static wxGridColumnOperations s_colOper;
 
-    wxGridCellWithAttrArray m_attrs;
-};
+    return s_colOper;
+}
 
-// this class stores attributes set for rows or columns
-class WXDLLEXPORT wxGridRowOrColAttrData
+wxGridOperations& wxGridColumnOperations::Dual() const
 {
-public:
-    // empty ctor to suppress warnings
-    wxGridRowOrColAttrData() { }
-    ~wxGridRowOrColAttrData();
+    static wxGridRowOperations s_rowOper;
 
-    void SetAttr(wxGridCellAttr *attr, int rowOrCol);
-    wxGridCellAttr *GetAttr(int rowOrCol) const;
-    void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols );
+    return s_rowOper;
+}
 
-private:
-    wxArrayInt m_rowsOrCols;
-    wxArrayAttrs m_attrs;
-};
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
 
-// NB: this is just a wrapper around 3 objects: one which stores cell
-//     attributes, and 2 others for row/col ones
-class WXDLLEXPORT wxGridCellAttrProviderData
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
 {
-public:
-    wxGridCellAttrData m_cellAttrs;
-    wxGridRowOrColAttrData m_rowAttrs,
-                           m_colAttrs;
-};
+    // nothing to do
+}
 
+wxGridCellWorker::~wxGridCellWorker()
+{
+}
 
 // ----------------------------------------------------------------------------
-// data structures used for the data type registry
+// wxGridHeaderLabelsRenderer and related classes
 // ----------------------------------------------------------------------------
 
-struct wxGridDataTypeInfo
+void wxGridHeaderLabelsRenderer::DrawLabel(const wxGrid& grid,
+                                           wxDC& dc,
+                                           const wxString& value,
+                                           const wxRect& rect,
+                                           int horizAlign,
+                                           int vertAlign,
+                                           int textOrientation) const
 {
-    wxGridDataTypeInfo(const wxString& typeName,
-                       wxGridCellRenderer* renderer,
-                       wxGridCellEditor* editor)
-        : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
-        { }
-
-    ~wxGridDataTypeInfo()
-    {
-        wxSafeDecRef(m_renderer);
-        wxSafeDecRef(m_editor);
-    }
-
-    wxString            m_typeName;
-    wxGridCellRenderer* m_renderer;
-    wxGridCellEditor*   m_editor;
-};
-
-
-WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc.SetTextForeground(grid.GetLabelTextColour());
+    dc.SetFont(grid.GetLabelFont());
+    grid.DrawTextRectangle(dc, value, rect, horizAlign, vertAlign, textOrientation);
+}
 
 
-class WXDLLEXPORT wxGridTypeRegistry
+void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
+                                                wxDC& dc,
+                                                wxRect& rect) const
 {
-public:
-  wxGridTypeRegistry() {}
-    ~wxGridTypeRegistry();
-
-    void RegisterDataType(const wxString& typeName,
-                     wxGridCellRenderer* renderer,
-                     wxGridCellEditor* editor);
+    dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
+    dc.DrawLine(rect.GetRight(), rect.GetTop(),
+                rect.GetRight(), rect.GetBottom());
+    dc.DrawLine(rect.GetLeft(), rect.GetTop(),
+                rect.GetLeft(), rect.GetBottom());
+    dc.DrawLine(rect.GetLeft(), rect.GetBottom(),
+                rect.GetRight() + 1, rect.GetBottom());
 
-    // find one of already registered data types
-    int FindRegisteredDataType(const wxString& typeName);
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(),
+                rect.GetLeft() + 1, rect.GetBottom());
+    dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(),
+                rect.GetRight(), rect.GetTop());
 
-    // try to FindRegisteredDataType(), if this fails and typeName is one of
-    // standard typenames, register it and return its index
-    int FindDataType(const wxString& typeName);
-
-    // try to FindDataType(), if it fails see if it is not one of already
-    // registered data types with some params in which case clone the
-    // registered data type and set params for it
-    int FindOrCloneDataType(const wxString& typeName);
+    rect.Deflate(2);
+}
 
-    wxGridCellRenderer* GetRenderer(int index);
-    wxGridCellEditor*   GetEditor(int index);
+void wxGridColumnHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
+                                                   wxDC& dc,
+                                                   wxRect& rect) const
+{
+    dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
+    dc.DrawLine(rect.GetRight(), rect.GetTop(),
+                rect.GetRight(), rect.GetBottom());
+    dc.DrawLine(rect.GetLeft(), rect.GetTop(),
+                rect.GetRight(), rect.GetTop());
+    dc.DrawLine(rect.GetLeft(), rect.GetBottom(),
+                rect.GetRight() + 1, rect.GetBottom());
 
-private:
-    wxGridDataTypeInfoArray m_typeinfo;
-};
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1,
+                rect.GetLeft(), rect.GetBottom());
+    dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1,
+                rect.GetRight(), rect.GetTop() + 1);
 
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
+    rect.Deflate(2);
+}
 
-#ifndef WXGRID_DRAW_LINES
-#define WXGRID_DRAW_LINES 1
-#endif
+void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
+                                                   wxDC& dc,
+                                                   wxRect& rect) const
+{
+    dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
+    dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1,
+                rect.GetRight() - 1, rect.GetTop());
+    dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1,
+                rect.GetLeft(), rect.GetBottom() - 1);
+    dc.DrawLine(rect.GetLeft(), rect.GetTop(),
+                rect.GetRight(), rect.GetTop());
+    dc.DrawLine(rect.GetLeft(), rect.GetTop(),
+                rect.GetLeft(), rect.GetBottom());
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1,
+                rect.GetRight() - 1, rect.GetTop() + 1);
+    dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1,
+                rect.GetLeft() + 1, rect.GetBottom() - 1);
 
-//#define DEBUG_ATTR_CACHE
-#ifdef DEBUG_ATTR_CACHE
-    static size_t gs_nAttrCacheHits = 0;
-    static size_t gs_nAttrCacheMisses = 0;
-#endif // DEBUG_ATTR_CACHE
+    rect.Deflate(2);
+}
 
 // ----------------------------------------------------------------------------
-// constants
+// wxGridCellAttr
 // ----------------------------------------------------------------------------
 
-wxGridCellCoords wxGridNoCellCoords( -1, -1 );
-wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
+void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
+{
+    m_isReadOnly = Unset;
 
-// scroll line size
-// TODO: this doesn't work at all, grid cells have different sizes and approx
-//       calculations don't work as because of the size mismatch scrollbars
-//       sometimes fail to be shown when they should be or vice versa
-//
-//       The scroll bars may be a little flakey once in a while, but that is
-//       surely much less horrible than having scroll lines of only 1!!!
-//       -- Robin
-//
-//       Well, it's still seriously broken so it might be better but needs
-//       fixing anyhow
-//       -- Vadim
-static const size_t GRID_SCROLL_LINE_X = 15;  // 1;
-static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
+    m_renderer = NULL;
+    m_editor = NULL;
 
-// the size of hash tables used a bit everywhere (the max number of elements
-// in these hash tables is the number of rows/columns)
-static const int GRID_HASH_SIZE = 100;
+    m_attrkind = wxGridCellAttr::Cell;
 
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+    m_sizeRows = m_sizeCols = 1;
+    m_overflow = UnsetOverflow;
 
-static inline int GetScrollX(int x)
-{
-    return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X;
+    SetDefAttr(attrDefault);
 }
 
-static inline int GetScrollY(int y)
+wxGridCellAttr *wxGridCellAttr::Clone() const
 {
-    return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
-}
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxGridCellEditor
-// ----------------------------------------------------------------------------
+    wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr);
 
-wxGridCellEditor::wxGridCellEditor()
-{
-    m_control = NULL;
-    m_attr = NULL;
-}
+    if ( HasTextColour() )
+        attr->SetTextColour(GetTextColour());
+    if ( HasBackgroundColour() )
+        attr->SetBackgroundColour(GetBackgroundColour());
+    if ( HasFont() )
+        attr->SetFont(GetFont());
+    if ( HasAlignment() )
+        attr->SetAlignment(m_hAlign, m_vAlign);
 
+    attr->SetSize( m_sizeRows, m_sizeCols );
 
-wxGridCellEditor::~wxGridCellEditor()
-{
-    Destroy();
-}
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
+    }
+    if ( m_editor )
+    {
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
 
-void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
-                              wxWindowID WXUNUSED(id),
-                              wxEvtHandler* evtHandler)
-{
-    if ( evtHandler )
-        m_control->PushEventHandler(evtHandler);
-}
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
 
-void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
-                                       wxGridCellAttr *attr)
-{
-    // erase the background because we might not fill the cell
-    wxClientDC dc(m_control->GetParent());
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-    dc.DrawRectangle(rectCell);
+    attr->SetOverflow( m_overflow == Overflow );
+    attr->SetKind( m_attrkind );
 
-    // redraw the control we just painted over
-    m_control->Refresh();
+    return attr;
 }
 
-void wxGridCellEditor::Destroy()
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
 {
-    if (m_control)
+    if ( !HasTextColour() && mergefrom->HasTextColour() )
+        SetTextColour(mergefrom->GetTextColour());
+    if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() )
+        SetBackgroundColour(mergefrom->GetBackgroundColour());
+    if ( !HasFont() && mergefrom->HasFont() )
+        SetFont(mergefrom->GetFont());
+    if ( !HasAlignment() && mergefrom->HasAlignment() )
     {
-        m_control->PopEventHandler(TRUE /* delete it*/);
-
-        m_control->Destroy();
-        m_control = NULL;
+        int hAlign, vAlign;
+        mergefrom->GetAlignment( &hAlign, &vAlign);
+        SetAlignment(hAlign, vAlign);
     }
-}
-
-void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-    m_control->Show(show);
+    if ( !HasSize() && mergefrom->HasSize() )
+        mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
 
-    if ( show )
+    // Directly access member functions as GetRender/Editor don't just return
+    // m_renderer/m_editor
+    //
+    // Maybe add support for merge of Render and Editor?
+    if (!HasRenderer() && mergefrom->HasRenderer() )
     {
-        // set the colours/fonts if we have any
-        if ( attr )
-        {
-            m_colFgOld = m_control->GetForegroundColour();
-            m_control->SetForegroundColour(attr->GetTextColour());
-
-            m_colBgOld = m_control->GetBackgroundColour();
-            m_control->SetBackgroundColour(attr->GetBackgroundColour());
-
-            m_fontOld = m_control->GetFont();
-            m_control->SetFont(attr->GetFont());
-
-            // can't do anything more in the base class version, the other
-            // attributes may only be used by the derived classes
-        }
+        m_renderer = mergefrom->m_renderer;
+        m_renderer->IncRef();
     }
-    else
+    if ( !HasEditor() && mergefrom->HasEditor() )
     {
-        // restore the standard colours fonts
-        if ( m_colFgOld.Ok() )
-        {
-            m_control->SetForegroundColour(m_colFgOld);
-            m_colFgOld = wxNullColour;
-        }
-
-        if ( m_colBgOld.Ok() )
-        {
-            m_control->SetBackgroundColour(m_colBgOld);
-            m_colBgOld = wxNullColour;
-        }
-
-        if ( m_fontOld.Ok() )
-        {
-            m_control->SetFont(m_fontOld);
-            m_fontOld = wxNullFont;
-        }
+        m_editor =  mergefrom->m_editor;
+        m_editor->IncRef();
     }
-}
-
-void wxGridCellEditor::SetSize(const wxRect& rect)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-    m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
-}
-
-void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
-{
-    event.Skip();
-}
+    if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
+        SetReadOnly(mergefrom->IsReadOnly());
 
-bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
-{
-    // accept the simple key presses, not anything with Ctrl/Alt/Meta
-    return !(event.ControlDown() || event.AltDown());
-}
+    if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
+        SetOverflow(mergefrom->GetOverflow());
 
-void wxGridCellEditor::StartingKey(wxKeyEvent& event)
-{
-    event.Skip();
+    SetDefAttr(mergefrom->m_defGridAttr);
 }
 
-void wxGridCellEditor::StartingClick()
+void wxGridCellAttr::SetSize(int num_rows, int num_cols)
 {
-}
-
-#if wxUSE_TEXTCTRL
-
-// ----------------------------------------------------------------------------
-// wxGridCellTextEditor
-// ----------------------------------------------------------------------------
+    // The size of a cell is normally 1,1
 
-wxGridCellTextEditor::wxGridCellTextEditor()
-{
-    m_maxChars = 0;
-}
+    // If this cell is larger (2,2) then this is the top left cell
+    // the other cells that will be covered (lower right cells) must be
+    // set to negative or zero values such that
+    // row + num_rows of the covered cell points to the larger cell (this cell)
+    // same goes for the col + num_cols.
 
-void wxGridCellTextEditor::Create(wxWindow* parent,
-                                  wxWindowID id,
-                                  wxEvtHandler* evtHandler)
-{
-    m_control = new wxTextCtrl(parent, id, wxEmptyString,
-                               wxDefaultPosition, wxDefaultSize
-#if defined(__WXMSW__)
-                               , wxTE_PROCESS_TAB | wxTE_MULTILINE |
-                                 wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
-#endif
-                              );
+    // Size of 0,0 is NOT valid, neither is <=0 and any positive value
 
-    // TODO: use m_maxChars
+    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"));
 
-    wxGridCellEditor::Create(parent, id, evtHandler);
+    m_sizeRows = num_rows;
+    m_sizeCols = num_cols;
 }
 
-void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
-                                           wxGridCellAttr * WXUNUSED(attr))
+const wxColour& wxGridCellAttr::GetTextColour() const
 {
-    // as we fill the entire client area, don't do anything here to minimize
-    // flicker
+    if (HasTextColour())
+    {
+        return m_colText;
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
+        return m_defGridAttr->GetTextColour();
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
+    }
 }
 
-void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
+const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
-    wxRect rect(rectOrig);
-
-    // Make the edit control large enough to allow for internal
-    // margins
-    //
-    // TODO: remove this if the text ctrl sizing is improved esp. for
-    // unix
-    //
-#if defined(__WXGTK__)
-    if (rect.x != 0)
+    if (HasBackgroundColour())
     {
-        rect.x += 1;
-        rect.y += 1;
-        rect.width -= 1;
-        rect.height -= 1;
+        return m_colBack;
     }
-#else // !GTK
-    int extra_x = ( rect.x > 2 )? 2 : 1;
-
-// MB: treat MSW separately here otherwise the caret doesn't show
-// when the editor is in the first row.
-#if defined(__WXMSW__)
-    int extra_y = 2;
-#else
-    int extra_y = ( rect.y > 2 )? 2 : 1;
-#endif // MSW
-
-#if defined(__WXMOTIF__)
-    extra_x *= 2;
-    extra_y *= 2;
-#endif
-    rect.SetLeft( wxMax(0, rect.x - extra_x) );
-    rect.SetTop( wxMax(0, rect.y - extra_y) );
-    rect.SetRight( rect.GetRight() + 2*extra_x );
-    rect.SetBottom( rect.GetBottom() + 2*extra_y );
-#endif // GTK/!GTK
-
-    wxGridCellEditor::SetSize(rect);
-}
-
-void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    m_startValue = grid->GetTable()->GetValue(row, col);
-
-    DoBeginEdit(m_startValue);
-}
-
-void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
-{
-    Text()->SetValue(startValue);
-    Text()->SetInsertionPointEnd();
-    Text()->SetSelection(-1,-1);
-    Text()->SetFocus();
-}
-
-bool wxGridCellTextEditor::EndEdit(int row, int col,
-                                   wxGrid* grid)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    bool changed = FALSE;
-    wxString value = Text()->GetValue();
-    if (value != m_startValue)
-        changed = TRUE;
-
-    if (changed)
-        grid->GetTable()->SetValue(row, col, value);
-
-    m_startValue = wxEmptyString;
-    Text()->SetValue(m_startValue);
-
-    return changed;
-}
-
-
-void wxGridCellTextEditor::Reset()
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    DoReset(m_startValue);
-}
-
-void wxGridCellTextEditor::DoReset(const wxString& startValue)
-{
-    Text()->SetValue(startValue);
-    Text()->SetInsertionPointEnd();
-}
-
-bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
-{
-    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    else if (m_defGridAttr && m_defGridAttr != this)
     {
-        int keycode = event.GetKeyCode();
-        switch ( keycode )
-        {
-            case WXK_NUMPAD0:
-            case WXK_NUMPAD1:
-            case WXK_NUMPAD2:
-            case WXK_NUMPAD3:
-            case WXK_NUMPAD4:
-            case WXK_NUMPAD5:
-            case WXK_NUMPAD6:
-            case WXK_NUMPAD7:
-            case WXK_NUMPAD8:
-            case WXK_NUMPAD9:
-            case WXK_MULTIPLY:
-            case WXK_NUMPAD_MULTIPLY:
-            case WXK_ADD:
-            case WXK_NUMPAD_ADD:
-            case WXK_SUBTRACT:
-            case WXK_NUMPAD_SUBTRACT:
-            case WXK_DECIMAL:
-            case WXK_NUMPAD_DECIMAL:
-            case WXK_DIVIDE:
-            case WXK_NUMPAD_DIVIDE:
-                return TRUE;
-
-            default:
-                // accept 8 bit chars too if isprint() agrees
-                if ( (keycode < 255) && (isprint(keycode)) )
-                    return TRUE;
-        }
+        return m_defGridAttr->GetBackgroundColour();
     }
-
-    return FALSE;
-}
-
-void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
-{
-    if ( !Text()->EmulateKeyPress(event) )
+    else
     {
-        event.Skip();
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
     }
 }
 
-void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
-                                         WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
-{
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
-    // wxMotif needs a little extra help...
-    size_t pos = (size_t)( Text()->GetInsertionPoint() );
-    wxString s( Text()->GetValue() );
-    s = s.Left(pos) + wxT("\n") + s.Mid(pos);
-    Text()->SetValue(s);
-    Text()->SetInsertionPoint( pos );
-#else
-    // the other ports can handle a Return key press
-    //
-    event.Skip();
-#endif
-}
-
-void wxGridCellTextEditor::SetParameters(const wxString& params)
+const wxFont& wxGridCellAttr::GetFont() const
 {
-    if ( !params )
-    {
-        // reset to default
-        m_maxChars = 0;
-    }
-    else
+    if (HasFont())
     {
-        long tmp;
-        if ( !params.ToLong(&tmp) )
-        {
-            wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str());
-        }
-        else
-        {
-            m_maxChars = (size_t)tmp;
-        }
+        return m_font;
     }
-}
-
-// return the value in the text control
-wxString wxGridCellTextEditor::GetValue() const
-{
-  return Text()->GetValue();
-}
-
-// ----------------------------------------------------------------------------
-// wxGridCellNumberEditor
-// ----------------------------------------------------------------------------
-
-wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max)
-{
-    m_min = min;
-    m_max = max;
-}
-
-void wxGridCellNumberEditor::Create(wxWindow* parent,
-                                    wxWindowID id,
-                                    wxEvtHandler* evtHandler)
-{
-    if ( HasRange() )
+    else if (m_defGridAttr && m_defGridAttr != this)
     {
-        // create a spin ctrl
-        m_control = new wxSpinCtrl(parent, -1, wxEmptyString,
-                                   wxDefaultPosition, wxDefaultSize,
-                                   wxSP_ARROW_KEYS,
-                                   m_min, m_max);
-
-        wxGridCellEditor::Create(parent, id, evtHandler);
+        return m_defGridAttr->GetFont();
     }
     else
     {
-        // just a text control
-        wxGridCellTextEditor::Create(parent, id, evtHandler);
-
-#if wxUSE_VALIDATORS
-        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullFont;
     }
 }
 
-void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
+void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 {
-    // first get the value
-    wxGridTableBase *table = grid->GetTable();
-    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
-    {
-        m_valueOld = table->GetValueAsLong(row, col);
-    }
-    else
+    if (HasAlignment())
     {
-        m_valueOld = 0;
-        wxString sValue = table->GetValue(row, col);
-        if (! sValue.ToLong(&m_valueOld) && ! sValue.IsEmpty())
-        {
-            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
-            return;
-        }
+        if ( hAlign )
+            *hAlign = m_hAlign;
+        if ( vAlign )
+            *vAlign = m_vAlign;
     }
-
-    if ( HasRange() )
+    else if (m_defGridAttr && m_defGridAttr != this)
     {
-        Spin()->SetValue((int)m_valueOld);
-        Spin()->SetFocus();
+        m_defGridAttr->GetAlignment(hAlign, vAlign);
     }
     else
     {
-        DoBeginEdit(GetString());
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
     }
 }
 
-bool wxGridCellNumberEditor::EndEdit(int row, int col,
-                                     wxGrid* grid)
+void wxGridCellAttr::GetNonDefaultAlignment(int *hAlign, int *vAlign) const
 {
-    bool changed;
-    long value = 0;
-    wxString text;
-
-    if ( HasRange() )
-    {
-        value = Spin()->GetValue();
-        changed = value != m_valueOld;
-        if (changed)
-            text = wxString::Format(wxT("%ld"), value);
-    }
-    else
-    {
-        text = Text()->GetValue();
-        changed = (text.IsEmpty() || text.ToLong(&value)) && (value != m_valueOld);
-    }
-
-    if ( changed )
-    {
-        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
-            grid->GetTable()->SetValueAsLong(row, col, value);
-        else
-            grid->GetTable()->SetValue(row, col, text);
-    }
+    if ( hAlign && m_hAlign != wxALIGN_INVALID )
+        *hAlign = m_hAlign;
 
-    return changed;
+    if ( vAlign && m_vAlign != wxALIGN_INVALID )
+        *vAlign = m_vAlign;
 }
 
-void wxGridCellNumberEditor::Reset()
+void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 {
-    if ( HasRange() )
-    {
-        Spin()->SetValue((int)m_valueOld);
-    }
-    else
-    {
-        DoReset(GetString());
-    }
+    if ( num_rows )
+        *num_rows = m_sizeRows;
+    if ( num_cols )
+        *num_cols = m_sizeCols;
 }
 
-bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event)
+// GetRenderer and GetEditor use a slightly different decision path about
+// which attribute to use.  If a non-default attr object has one then it is
+// 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.
+
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const
 {
-    if ( wxGridCellEditor::IsAcceptedKey(event) )
-    {
-        int keycode = event.GetKeyCode();
-        switch ( keycode )
-        {
-            case WXK_NUMPAD0:
-            case WXK_NUMPAD1:
-            case WXK_NUMPAD2:
-            case WXK_NUMPAD3:
-            case WXK_NUMPAD4:
-            case WXK_NUMPAD5:
-            case WXK_NUMPAD6:
-            case WXK_NUMPAD7:
-            case WXK_NUMPAD8:
-            case WXK_NUMPAD9:
-            case WXK_ADD:
-            case WXK_NUMPAD_ADD:
-            case WXK_SUBTRACT:
-            case WXK_NUMPAD_SUBTRACT:
-            case WXK_UP:
-            case WXK_DOWN:
-                return TRUE;
+    wxGridCellRenderer *renderer = NULL;
 
-            default:
-                if ( (keycode < 128) && isdigit(keycode) )
-                    return TRUE;
-        }
+    if ( m_renderer && this != m_defGridAttr )
+    {
+        // use the cells renderer if it has one
+        renderer = m_renderer;
+        renderer->IncRef();
     }
-
-    return FALSE;
-}
-
-void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
-{
-    if ( !HasRange() )
+    else // no non-default cell renderer
     {
-        int keycode = (int) event.KeyCode();
-        if ( isdigit(keycode) || keycode == '+' || keycode == '-'
-            || keycode ==  WXK_NUMPAD0
-            || keycode ==  WXK_NUMPAD1
-            || keycode ==  WXK_NUMPAD2
-            || keycode ==  WXK_NUMPAD3
-            || keycode ==  WXK_NUMPAD4
-            || keycode ==  WXK_NUMPAD5
-            || keycode ==  WXK_NUMPAD6
-            || keycode ==  WXK_NUMPAD7
-            || keycode ==  WXK_NUMPAD8
-            || keycode ==  WXK_NUMPAD9
-            || keycode ==  WXK_ADD
-            || keycode ==  WXK_NUMPAD_ADD
-            || keycode ==  WXK_SUBTRACT
-            || keycode ==  WXK_NUMPAD_SUBTRACT)
+        // get default renderer for the data type
+        if ( grid )
         {
-            wxGridCellTextEditor::StartingKey(event);
+            // GetDefaultRendererForCell() will do IncRef() for us
+            renderer = grid->GetDefaultRendererForCell(row, col);
+        }
 
-            // skip Skip() below
-            return;
+        if ( renderer == NULL )
+        {
+            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)
+                renderer = m_defGridAttr->GetRenderer(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_renderer which we had decided not to use initially
+                renderer = m_renderer;
+                if ( renderer )
+                    renderer->IncRef();
+            }
         }
     }
 
-    event.Skip();
+    // we're supposed to always find something
+    wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));
+
+    return renderer;
 }
 
-void wxGridCellNumberEditor::SetParameters(const wxString& params)
+// same as above, except for s/renderer/editor/g
+wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const
 {
-    if ( !params )
+    wxGridCellEditor *editor = NULL;
+
+    if ( m_editor && this != m_defGridAttr )
     {
-        // reset to default
-        m_min =
-        m_max = -1;
+        // use the cells editor if it has one
+        editor = m_editor;
+        editor->IncRef();
     }
-    else
+    else // no non default cell editor
     {
-        long tmp;
-        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        // get default editor for the data type
+        if ( grid )
         {
-            m_min = (int)tmp;
+            // GetDefaultEditorForCell() will do IncRef() for us
+            editor = grid->GetDefaultEditorForCell(row, col);
+        }
 
-            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+        if ( editor == NULL )
+        {
+            if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
             {
-                m_max = (int)tmp;
-
-                // skip the error message below
-                return;
+                // if we still don't have one then use the grid default
+                // (no need for IncRef() here neither)
+                editor = m_defGridAttr->GetEditor(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_editor which we had decided not to use initially
+                editor = m_editor;
+                if ( editor )
+                    editor->IncRef();
             }
         }
-
-        wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
     }
-}
 
-// return the value in the spin control if it is there (the text control otherwise)
-wxString wxGridCellNumberEditor::GetValue() const
-{
-  wxString s;
+    // we're supposed to always find something
+    wxASSERT_MSG(editor, wxT("Missing default cell editor"));
 
-  if( HasRange() )
-  {
-    long value = Spin()->GetValue();
-    s.Printf(wxT("%ld"), value);
-  }
-  else
-  {
-    s = Text()->GetValue();
-  }
-  return s;
+    return editor;
 }
 
 // ----------------------------------------------------------------------------
-// wxGridCellFloatEditor
+// wxGridCellAttrData
 // ----------------------------------------------------------------------------
 
-wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
-{
-    m_width = width;
-    m_precision = precision;
-}
-
-void wxGridCellFloatEditor::Create(wxWindow* parent,
-                                   wxWindowID id,
-                                   wxEvtHandler* evtHandler)
-{
-    wxGridCellTextEditor::Create(parent, id, evtHandler);
-
-#if wxUSE_VALIDATORS
-    Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
-}
-
-void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
+void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
 {
-    // first get the value
-    wxGridTableBase *table = grid->GetTable();
-    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
-    {
-        m_valueOld = table->GetValueAsDouble(row, col);
-    }
-    else
+    // Note: contrary to wxGridRowOrColAttrData::SetAttr, we must not
+    //       touch attribute's reference counting explicitly, since this
+    //       is managed by class wxGridCellWithAttr
+    int n = FindIndex(row, col);
+    if ( n == wxNOT_FOUND )
     {
-        m_valueOld = 0.0;
-        wxString sValue = table->GetValue(row, col);
-        if (! sValue.ToDouble(&m_valueOld) && ! sValue.IsEmpty())
+        if ( attr )
         {
-            wxFAIL_MSG( _T("this cell doesn't have float value") );
-            return;
+            // add the attribute
+            m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
         }
+        //else: nothing to do
     }
-
-    DoBeginEdit(GetString());
-}
-
-bool wxGridCellFloatEditor::EndEdit(int row, int col,
-                                     wxGrid* grid)
-{
-    double value = 0.0;
-    wxString text(Text()->GetValue());
-
-    if ( (text.IsEmpty() || text.ToDouble(&value)) && (value != m_valueOld) )
+    else // we already have an attribute for this cell
     {
-        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
-            grid->GetTable()->SetValueAsDouble(row, col, value);
+        if ( attr )
+        {
+            // change the attribute
+            m_attrs[(size_t)n].ChangeAttr(attr);
+        }
         else
-            grid->GetTable()->SetValue(row, col, text);
-
-        return TRUE;
+        {
+            // remove this attribute
+            m_attrs.RemoveAt((size_t)n);
+        }
     }
-    return FALSE;
 }
 
-void wxGridCellFloatEditor::Reset()
+wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
 {
-    DoReset(GetString());
-}
+    wxGridCellAttr *attr = NULL;
 
-void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
-{
-    int keycode = (int)event.KeyCode();
-        if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
-            || keycode ==  WXK_NUMPAD0
-            || keycode ==  WXK_NUMPAD1
-            || keycode ==  WXK_NUMPAD2
-            || keycode ==  WXK_NUMPAD3
-            || keycode ==  WXK_NUMPAD4
-            || keycode ==  WXK_NUMPAD5
-            || keycode ==  WXK_NUMPAD6
-            || keycode ==  WXK_NUMPAD7
-            || keycode ==  WXK_NUMPAD8
-            || keycode ==  WXK_NUMPAD9
-            || keycode ==  WXK_ADD
-            || keycode ==  WXK_NUMPAD_ADD
-            || keycode ==  WXK_SUBTRACT
-            || keycode ==  WXK_NUMPAD_SUBTRACT)
+    int n = FindIndex(row, col);
+    if ( n != wxNOT_FOUND )
     {
-        wxGridCellTextEditor::StartingKey(event);
-
-        // skip Skip() below
-        return;
+        attr = m_attrs[(size_t)n].attr;
+        attr->IncRef();
     }
 
-    event.Skip();
+    return attr;
 }
 
-void wxGridCellFloatEditor::SetParameters(const wxString& params)
+void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
 {
-    if ( !params )
-    {
-        // reset to default
-        m_width =
-        m_precision = -1;
-    }
-    else
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        long tmp;
-        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord row = coords.GetRow();
+        if ((size_t)row >= pos)
         {
-            m_width = (int)tmp;
-
-            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            if (numRows > 0)
             {
-                m_precision = (int)tmp;
-
-                // skip the error message below
-                return;
+                // If rows inserted, include row counter where necessary
+                coords.SetRow(row + numRows);
             }
-        }
-
-        wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
-    }
-}
-
-wxString wxGridCellFloatEditor::GetString() const
-{
-    wxString fmt;
-    if ( m_width == -1 )
-    {
-        // default width/precision
-        fmt = _T("%f");
-    }
-    else if ( m_precision == -1 )
-    {
-        // default precision
-        fmt.Printf(_T("%%%d.f"), m_width);
+            else if (numRows < 0)
+            {
+                // If rows deleted ...
+                if ((size_t)row >= pos - numRows)
+                {
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetRow(row + numRows);
+                }
+                else
+                {
+                    // ...or remove the attribute
+                    m_attrs.RemoveAt(n);
+                    n--;
+                    count--;
+                }
+            }
+        }
     }
-    else
+}
+
+void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord col = coords.GetCol();
+        if ( (size_t)col >= pos )
+        {
+            if ( numCols > 0 )
+            {
+                // If rows inserted, include row counter where necessary
+                coords.SetCol(col + numCols);
+            }
+            else if (numCols < 0)
+            {
+                // If rows deleted ...
+                if ((size_t)col >= pos - numCols)
+                {
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetCol(col + numCols);
+                }
+                else
+                {
+                    // ...or remove the attribute
+                    m_attrs.RemoveAt(n);
+                    n--;
+                    count--;
+                }
+            }
+        }
     }
-
-    return wxString::Format(fmt, m_valueOld);
 }
 
-bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
+int wxGridCellAttrData::FindIndex(int row, int col) const
 {
-    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        int keycode = event.GetKeyCode();
-        switch ( keycode )
+        const wxGridCellCoords& coords = m_attrs[n].coords;
+        if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
         {
-            case WXK_NUMPAD0:
-            case WXK_NUMPAD1:
-            case WXK_NUMPAD2:
-            case WXK_NUMPAD3:
-            case WXK_NUMPAD4:
-            case WXK_NUMPAD5:
-            case WXK_NUMPAD6:
-            case WXK_NUMPAD7:
-            case WXK_NUMPAD8:
-            case WXK_NUMPAD9:
-            case WXK_ADD:
-            case WXK_NUMPAD_ADD:
-            case WXK_SUBTRACT:
-            case WXK_NUMPAD_SUBTRACT:
-            case WXK_DECIMAL:
-            case WXK_NUMPAD_DECIMAL:
-                return TRUE;
-
-            default:
-                // additionally accept 'e' as in '1e+6'
-                if ( (keycode < 128) &&
-                     (isdigit(keycode) || tolower(keycode) == 'e') )
-                    return TRUE;
+            return n;
         }
     }
 
-    return FALSE;
+    return wxNOT_FOUND;
 }
 
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_CHECKBOX
-
 // ----------------------------------------------------------------------------
-// wxGridCellBoolEditor
+// wxGridRowOrColAttrData
 // ----------------------------------------------------------------------------
 
-void wxGridCellBoolEditor::Create(wxWindow* parent,
-                                  wxWindowID id,
-                                  wxEvtHandler* evtHandler)
-{
-    m_control = new wxCheckBox(parent, id, wxEmptyString,
-                               wxDefaultPosition, wxDefaultSize,
-                               wxNO_BORDER);
-
-    wxGridCellEditor::Create(parent, id, evtHandler);
-}
-
-void wxGridCellBoolEditor::SetSize(const wxRect& r)
+wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
 {
-    bool resize = FALSE;
-    wxSize size = m_control->GetSize();
-    wxCoord minSize = wxMin(r.width, r.height);
-
-    // check if the checkbox is not too big/small for this cell
-    wxSize sizeBest = m_control->GetBestSize();
-    if ( !(size == sizeBest) )
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        // reset to default size if it had been made smaller
-        size = sizeBest;
-
-        resize = TRUE;
+        m_attrs[n]->DecRef();
     }
+}
 
-    if ( size.x >= minSize || size.y >= minSize )
-    {
-        // leave 1 pixel margin
-        size.x = size.y = minSize - 2;
-
-        resize = TRUE;
-    }
+wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
+{
+    wxGridCellAttr *attr = NULL;
 
-    if ( resize )
+    int n = m_rowsOrCols.Index(rowOrCol);
+    if ( n != wxNOT_FOUND )
     {
-        m_control->SetSize(size);
+        attr = m_attrs[(size_t)n];
+        attr->IncRef();
     }
 
-    // position it in the centre of the rectangle (TODO: support alignment?)
-
-#if defined(__WXGTK__) || defined (__WXMOTIF__)
-    // the checkbox without label still has some space to the right in wxGTK,
-    // so shift it to the right
-    size.x -= 8;
-#elif defined(__WXMSW__)
-    // here too, but in other way
-    size.x += 1;
-    size.y -= 2;
-#endif
+    return attr;
+}
 
-    int hAlign = wxALIGN_CENTRE;
-    int vAlign = wxALIGN_CENTRE;
-    if (GetCellAttr())
-        GetCellAttr()->GetAlignment(& hAlign, & vAlign);
-    
-    int x = 0, y = 0;
-    if (hAlign == wxALIGN_LEFT)
-    {
-        x = r.x + 2;
-#ifdef __WXMSW__
-        x += 2;
-#endif        
-        y = r.y + r.height/2 - size.y/2;
-    }
-    else if (hAlign == wxALIGN_RIGHT)
+void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
+{
+    int i = m_rowsOrCols.Index(rowOrCol);
+    if ( i == wxNOT_FOUND )
     {
-        x = r.x + r.width - size.x - 2;
-        y = r.y + r.height/2 - size.y/2;
+        if ( attr )
+        {
+            // store the new attribute, taking its ownership
+            m_rowsOrCols.Add(rowOrCol);
+            m_attrs.Add(attr);
+        }
+        // nothing to remove
     }
-    else if (hAlign == wxALIGN_CENTRE)
+    else // we have an attribute for this row or column
     {
-        x = r.x + r.width/2 - size.x/2;
-        y = r.y + r.height/2 - size.y/2;
-    }
-    
-    m_control->Move(x, y);
-}
+        size_t n = (size_t)i;
 
-void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
-{
-    m_control->Show(show);
+        // notice that this code works correctly even when the old attribute is
+        // the same as the new one: as we own of it, we must call DecRef() on
+        // it in any case and this won't result in destruction of the new
+        // attribute if it's the same as old one because it must have ref count
+        // of at least 2 to be passed to us while we keep a reference to it too
+        m_attrs[n]->DecRef();
 
-    if ( show )
-    {
-        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
-        CBox()->SetBackgroundColour(colBg);
+        if ( attr )
+        {
+            // replace the attribute with the new one
+            m_attrs[n] = attr;
+        }
+        else // remove the attribute
+        {
+            m_rowsOrCols.RemoveAt(n);
+            m_attrs.RemoveAt(n);
+        }
     }
 }
 
-void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
+void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols )
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
-        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
-    else
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        wxString cellval( grid->GetTable()->GetValue(row, col) );
-        m_startValue = !( !cellval || (cellval == wxT("0")) );
+        int & rowOrCol = m_rowsOrCols[n];
+        if ( (size_t)rowOrCol >= pos )
+        {
+            if ( numRowsOrCols > 0 )
+            {
+                // If rows inserted, include row counter where necessary
+                rowOrCol += numRowsOrCols;
+            }
+            else if ( numRowsOrCols < 0)
+            {
+                // If rows deleted, either decrement row counter (if row still exists)
+                if ((size_t)rowOrCol >= pos - numRowsOrCols)
+                    rowOrCol += numRowsOrCols;
+                else
+                {
+                    m_rowsOrCols.RemoveAt(n);
+                    m_attrs[n]->DecRef();
+                    m_attrs.RemoveAt(n);
+                    n--;
+                    count--;
+                }
+            }
+        }
     }
-    CBox()->SetValue(m_startValue);
-    CBox()->SetFocus();
 }
 
-bool wxGridCellBoolEditor::EndEdit(int row, int col,
-                                   wxGrid* grid)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    bool changed = FALSE;
-    bool value = CBox()->GetValue();
-    if ( value != m_startValue )
-        changed = TRUE;
-
-    if ( changed )
-    {
-        if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
-            grid->GetTable()->SetValueAsBool(row, col, value);
-        else
-            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
-    }
+// ----------------------------------------------------------------------------
+// wxGridCellAttrProvider
+// ----------------------------------------------------------------------------
 
-    return changed;
+wxGridCellAttrProvider::wxGridCellAttrProvider()
+{
+    m_data = NULL;
 }
 
-void wxGridCellBoolEditor::Reset()
+wxGridCellAttrProvider::~wxGridCellAttrProvider()
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    CBox()->SetValue(m_startValue);
+    delete m_data;
 }
 
-void wxGridCellBoolEditor::StartingClick()
+void wxGridCellAttrProvider::InitData()
 {
-    CBox()->SetValue(!CBox()->GetValue());
+    m_data = new wxGridCellAttrProviderData;
 }
 
-bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+                                                wxGridCellAttr::wxAttrKind  kind ) const
 {
-    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    wxGridCellAttr *attr = NULL;
+    if ( m_data )
     {
-        int keycode = event.GetKeyCode();
-        switch ( keycode )
+        switch (kind)
         {
-            case WXK_MULTIPLY:
-            case WXK_NUMPAD_MULTIPLY:
-            case WXK_ADD:
-            case WXK_NUMPAD_ADD:
-            case WXK_SUBTRACT:
-            case WXK_NUMPAD_SUBTRACT:
-            case WXK_SPACE:
-            case '+':
-            case '-':
-                return TRUE;
-        }
-    }
+            case (wxGridCellAttr::Any):
+                // Get cached merge attributes.
+                // Currently not used as no cache implemented as not mutable
+                // attr = m_data->m_mergeAttr.GetAttr(row, col);
+                if (!attr)
+                {
+                    // Basically implement old version.
+                    // Also check merge cache, so we don't have to re-merge every time..
+                    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);
 
-    return FALSE;
-}
+                    if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol))
+                    {
+                        // Two or more are non NULL
+                        attr = new wxGridCellAttr;
+                        attr->SetKind(wxGridCellAttr::Merged);
 
-// return the value as "1" for true and the empty string for false
-wxString wxGridCellBoolEditor::GetValue() const
-{
-  bool bSet = CBox()->GetValue();
-  return bSet ? _T("1") : wxEmptyString;
-}
+                        // Order is important..
+                        if (attrcell)
+                        {
+                            attr->MergeWith(attrcell);
+                            attrcell->DecRef();
+                        }
+                        if (attrcol)
+                        {
+                            attr->MergeWith(attrcol);
+                            attrcol->DecRef();
+                        }
+                        if (attrrow)
+                        {
+                            attr->MergeWith(attrrow);
+                            attrrow->DecRef();
+                        }
 
-#endif // wxUSE_CHECKBOX
+                        // 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.
+                        if (attrrow)
+                            attr = attrrow;
+                        if (attrcol)
+                        {
+                            if (attr)
+                                attr->DecRef();
+                            attr = attrcol;
+                        }
+                        if (attrcell)
+                        {
+                            if (attr)
+                                attr->DecRef();
+                            attr = attrcell;
+                        }
+                    }
+                }
+                break;
 
-#if wxUSE_COMBOBOX
+            case (wxGridCellAttr::Cell):
+                attr = m_data->m_cellAttrs.GetAttr(row, col);
+                break;
 
-// ----------------------------------------------------------------------------
-// wxGridCellChoiceEditor
-// ----------------------------------------------------------------------------
+            case (wxGridCellAttr::Col):
+                attr = m_data->m_colAttrs.GetAttr(col);
+                break;
 
-wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
-                                               const wxString choices[],
-                                               bool allowOthers)
-                      : m_allowOthers(allowOthers)
-{
-    if ( count )
-    {
-        m_choices.Alloc(count);
-        for ( size_t n = 0; n < count; n++ )
-        {
-            m_choices.Add(choices[n]);
+            case (wxGridCellAttr::Row):
+                attr = m_data->m_rowAttrs.GetAttr(row);
+                break;
+
+            default:
+                // unused as yet...
+                // (wxGridCellAttr::Default):
+                // (wxGridCellAttr::Merged):
+                break;
         }
     }
+
+    return attr;
 }
 
-wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
+void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr,
+                                     int row, int col)
 {
-    wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
-    editor->m_allowOthers = m_allowOthers;
-    editor->m_choices = m_choices;
+    if ( !m_data )
+        InitData();
 
-    return editor;
+    m_data->m_cellAttrs.SetAttr(attr, row, col);
 }
 
-void wxGridCellChoiceEditor::Create(wxWindow* parent,
-                                    wxWindowID id,
-                                    wxEvtHandler* evtHandler)
+void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row)
 {
-    size_t count = m_choices.GetCount();
-    wxString *choices = new wxString[count];
-    for ( size_t n = 0; n < count; n++ )
-    {
-        choices[n] = m_choices[n];
-    }
-
-    m_control = new wxComboBox(parent, id, wxEmptyString,
-                               wxDefaultPosition, wxDefaultSize,
-                               count, choices,
-                               m_allowOthers ? 0 : wxCB_READONLY);
-
-    delete [] choices;
+    if ( !m_data )
+        InitData();
 
-    wxGridCellEditor::Create(parent, id, evtHandler);
+    m_data->m_rowAttrs.SetAttr(attr, row);
 }
 
-void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
-                                             wxGridCellAttr * attr)
+void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col)
 {
-    // as we fill the entire client area, don't do anything here to minimize
-    // flicker
+    if ( !m_data )
+        InitData();
 
-    // 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...
-    wxGridCellEditor::PaintBackground(rectCell, attr);
+    m_data->m_colAttrs.SetAttr(attr, col);
 }
 
-void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
+void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows )
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    m_startValue = grid->GetTable()->GetValue(row, col);
-
-    if (m_allowOthers)
-        Combo()->SetValue(m_startValue);
-    else
+    if ( m_data )
     {
-        // find the right position, or default to the first if not found
-        int pos = Combo()->FindString(m_startValue);
-        if (pos == -1)
-            pos = 0;
-        Combo()->SetSelection(pos);
+        m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
+
+        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
     }
-    Combo()->SetInsertionPointEnd();
-    Combo()->SetFocus();
 }
 
-bool wxGridCellChoiceEditor::EndEdit(int row, int col,
-                                     wxGrid* grid)
+void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
 {
-    wxString value = Combo()->GetValue();
-    bool changed = value != m_startValue;
-
-    if ( changed )
-        grid->GetTable()->SetValue(row, col, value);
-
-    m_startValue = wxEmptyString;
-    if (m_allowOthers)
-        Combo()->SetValue(m_startValue);
-    else
-        Combo()->SetSelection(0);
+    if ( m_data )
+    {
+        m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
 
-    return changed;
+        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+    }
 }
 
-void wxGridCellChoiceEditor::Reset()
+const wxGridColumnHeaderRenderer&
+wxGridCellAttrProvider::GetColumnHeaderRenderer(int WXUNUSED(col))
 {
-    Combo()->SetValue(m_startValue);
-    Combo()->SetInsertionPointEnd();
+    return gs_defaultHeaderRenderers.colRenderer;
 }
 
-void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+const wxGridRowHeaderRenderer&
+wxGridCellAttrProvider::GetRowHeaderRenderer(int WXUNUSED(row))
 {
-    if ( !params )
-    {
-        // what can we do?
-        return;
-    }
-
-    m_choices.Empty();
-
-    wxStringTokenizer tk(params, _T(','));
-    while ( tk.HasMoreTokens() )
-    {
-        m_choices.Add(tk.GetNextToken());
-    }
+    return gs_defaultHeaderRenderers.rowRenderer;
 }
 
-// return the value in the text control
-wxString wxGridCellChoiceEditor::GetValue() const
+const wxGridCornerHeaderRenderer& wxGridCellAttrProvider::GetCornerRenderer()
 {
-  return Combo()->GetValue();
+    return gs_defaultHeaderRenderers.cornerRenderer;
 }
 
-#endif // wxUSE_COMBOBOX
-
 // ----------------------------------------------------------------------------
-// wxGridCellEditorEvtHandler
+// wxGridTableBase
 // ----------------------------------------------------------------------------
 
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
-{
-    switch ( event.KeyCode() )
-    {
-        case WXK_ESCAPE:
-            m_editor->Reset();
-            m_grid->DisableCellEditControl();
-            break;
-
-        case WXK_TAB:
-            m_grid->GetEventHandler()->ProcessEvent( event );
-            break;
+IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 
-        case WXK_RETURN:
-        case WXK_NUMPAD_ENTER:
-            if (!m_grid->GetEventHandler()->ProcessEvent(event))
-                m_editor->HandleReturn(event);
-            break;
+wxGridTableBase::wxGridTableBase()
+{
+    m_view = NULL;
+    m_attrProvider = NULL;
+}
 
+wxGridTableBase::~wxGridTableBase()
+{
+    delete m_attrProvider;
+}
 
-        default:
-            event.Skip();
-    }
+void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
+{
+    delete m_attrProvider;
+    m_attrProvider = attrProvider;
 }
 
-void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+bool wxGridTableBase::CanHaveAttributes()
 {
-    switch ( event.KeyCode() )
+    if ( ! GetAttrProvider() )
     {
-        case WXK_ESCAPE:
-        case WXK_TAB:
-        case WXK_RETURN:
-        case WXK_NUMPAD_ENTER:
-            break;
-
-        default:
-            event.Skip();
+        // use the default attr provider by default
+        SetAttrProvider(new wxGridCellAttrProvider);
     }
-}
-
-// ----------------------------------------------------------------------------
-// wxGridCellWorker is an (almost) empty common base class for
-// wxGridCellRenderer and wxGridCellEditor managing ref counting
-// ----------------------------------------------------------------------------
 
-void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
-{
-    // nothing to do
+    return true;
 }
 
-wxGridCellWorker::~wxGridCellWorker()
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)
 {
+    if ( m_attrProvider )
+        return m_attrProvider->GetAttr(row, col, kind);
+    else
+        return NULL;
 }
 
-// ============================================================================
-// renderer classes
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxGridCellRenderer
-// ----------------------------------------------------------------------------
-
-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int WXUNUSED(row), int WXUNUSED(col),
-                              bool isSelected)
+void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
 {
-    dc.SetBackgroundMode( wxSOLID );
-
-    // grey out fields if the grid is disabled
-    if( grid.IsEnabled() )
+    if ( m_attrProvider )
     {
-      if ( isSelected )
-      {
-          dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
-      }
-      else
-      {
-          dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
-      }
-    }  
+        if ( attr )
+            attr->SetKind(wxGridCellAttr::Cell);
+        m_attrProvider->SetAttr(attr, row, col);
+    }
     else
     {
-      dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
     }
-
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle(rect);
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellStringRenderer
-// ----------------------------------------------------------------------------
-
-void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
-                                                     wxGridCellAttr& attr,
-                                                     wxDC& dc,
-                                                     bool isSelected)
+void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
 {
-    dc.SetBackgroundMode( wxTRANSPARENT );
-
-    // TODO some special colours for attr.IsReadOnly() case?
-
-    // different coloured text when the grid is disabled
-    if( grid.IsEnabled() )
+    if ( m_attrProvider )
     {
-      if ( isSelected )
-      {
-          dc.SetTextBackground( grid.GetSelectionBackground() );
-          dc.SetTextForeground( grid.GetSelectionForeground() );
-      }
-      else
-      {
-          dc.SetTextBackground( attr.GetBackgroundColour() );
-          dc.SetTextForeground( attr.GetTextColour() );
-      }
+        attr->SetKind(wxGridCellAttr::Row);
+        m_attrProvider->SetRowAttr(attr, row);
     }
     else
     {
-      dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
-      dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT));
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
     }
-
-    dc.SetFont( attr.GetFont() );
 }
 
-wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
-                                               wxDC& dc,
-                                               const wxString& text)
+void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
 {
-    wxCoord x = 0, y = 0, max_x = 0;
-    dc.SetFont(attr.GetFont());
-    wxStringTokenizer tk(text, _T('\n'));
-    while ( tk.HasMoreTokens() )
+    if ( m_attrProvider )
+    {
+        attr->SetKind(wxGridCellAttr::Col);
+        m_attrProvider->SetColAttr(attr, col);
+    }
+    else
     {
-        dc.GetTextExtent(tk.GetNextToken(), &x, &y);
-        max_x = wxMax(max_x, x);
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
     }
+}
 
-    y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines.
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
 
-    return wxSize(max_x, y);
+    return false;
 }
 
-wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
-                                             wxGridCellAttr& attr,
-                                             wxDC& dc,
-                                             int row, int col)
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
 {
-    return DoGetBestSize(attr, dc, grid.GetCellValue(row, col));
+    wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
+
+    return false;
 }
 
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
-                                    wxGridCellAttr& attr,
-                                    wxDC& dc,
-                                    const wxRect& rectCell,
-                                    int row, int col,
-                                    bool isSelected)
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
 {
-    wxRect rect = rectCell;
-    rect.Inflate(-1);
+    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
 
-    // erase only this cells background, overflow cells should have been erased
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+    return false;
+}
 
-    int hAlign, vAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
 
-    int overflowCols = 0;
+    return false;
+}
 
-    if (attr.GetOverflow())
-    {
-        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
-        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++)
-                {
-                    // 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))
-                    {
-                        is_empty = FALSE;
-                        break;
-                    }
-                }
-                if (is_empty)
-                    rect.width += grid.GetColSize(i);
-                else
-                {
-                    i--;
-                    break;
-                }
-                if (rect.width >= best_width) break;
-            }
-            overflowCols = i - col - cell_cols + 1;
-            if (overflowCols >= cols) overflowCols = cols - 1;
-        }
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
 
-        if (overflowCols > 0) // redraw overflow cells w/ proper hilight
-        {
-            hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
-            wxRect clip = rect;
-            clip.x += rectCell.width;
-            // draw each overflow cell individually
-            int col_end = col+cell_cols+overflowCols;
-            if (col_end >= grid.GetNumberCols())
-                col_end = grid.GetNumberCols() - 1;
-            for (int i = col+cell_cols; i <= col_end; i++)
-            {
-                clip.width = grid.GetColSize(i) - 1;
-                dc.DestroyClippingRegion();
-                dc.SetClippingRegion(clip);
+    return false;
+}
 
-                SetTextColoursAndFont(grid, attr, dc,
-                        grid.IsInSelection(row,i));
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
 
-                grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                        rect, hAlign, vAlign);
-                clip.x += grid.GetColSize(i) - 1;
-            }
+    return false;
+}
 
-            rect = rectCell;
-            rect.Inflate(-1);
-            rect.width++;
-            dc.DestroyClippingRegion();
-        }
-    }
+wxString wxGridTableBase::GetRowLabelValue( int row )
+{
+    wxString s;
 
-    // now we only have to draw the text
-    SetTextColoursAndFont(grid, attr, dc, isSelected);
+    // RD: Starting the rows at zero confuses users,
+    // no matter how much it makes sense to us geeks.
+    s << row + 1;
 
-    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                           rect, hAlign, vAlign);
+    return s;
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellNumberRenderer
-// ----------------------------------------------------------------------------
-
-wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+wxString wxGridTableBase::GetColLabelValue( int col )
 {
-    wxGridTableBase *table = grid.GetTable();
-    wxString text;
-    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+    // default col labels are:
+    //   cols 0 to 25   : A-Z
+    //   cols 26 to 675 : AA-ZZ
+    //   etc.
+
+    wxString s;
+    unsigned int i, n;
+    for ( n = 1; ; n++ )
     {
-        text.Printf(_T("%ld"), table->GetValueAsLong(row, col));
+        s += (wxChar) (wxT('A') + (wxChar)(col % 26));
+        col = col / 26 - 1;
+        if ( col < 0 )
+            break;
     }
-    else
+
+    // reverse the string...
+    wxString s2;
+    for ( i = 0; i < n; i++ )
     {
-        text = table->GetValue(row, col);
+        s2 += s[n - i - 1];
     }
 
-    return text;
+    return s2;
 }
 
-void wxGridCellNumberRenderer::Draw(wxGrid& grid,
-                                    wxGridCellAttr& attr,
-                                    wxDC& dc,
-                                    const wxRect& rectCell,
-                                    int row, int col,
-                                    bool isSelected)
+wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
 {
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
-
-    SetTextColoursAndFont(grid, attr, dc, isSelected);
-
-    // draw the text right aligned by default
-    int hAlign, vAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
-    hAlign = wxALIGN_RIGHT;
-
-    wxRect rect = rectCell;
-    rect.Inflate(-1);
-
-    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+    return wxGRID_VALUE_STRING;
 }
 
-wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid,
-                                             wxGridCellAttr& attr,
-                                             wxDC& dc,
-                                             int row, int col)
+bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
+                                     const wxString& typeName )
 {
-    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+    return typeName == wxGRID_VALUE_STRING;
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellFloatRenderer
-// ----------------------------------------------------------------------------
-
-wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
+bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
 {
-    SetWidth(width);
-    SetPrecision(precision);
+    return CanGetValueAs(row, col, typeName);
 }
 
-wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
+long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) )
 {
-    wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer;
-    renderer->m_width = m_width;
-    renderer->m_precision = m_precision;
-    renderer->m_format = m_format;
-
-    return renderer;
+    return 0;
 }
 
-wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) )
 {
-    wxGridTableBase *table = grid.GetTable();
-
-    bool hasDouble;
-    double val;
-    wxString text;
-    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
-    {
-        val = table->GetValueAsDouble(row, col);
-        hasDouble = TRUE;
-    }
-    else
-    {
-        text = table->GetValue(row, col);
-        hasDouble = text.ToDouble(&val);
-    }
-
-    if ( hasDouble )
-    {
-        if ( !m_format )
-        {
-            if ( m_width == -1 )
-            {
-                if ( m_precision == -1 )
-                {
-                    // default width/precision
-                    m_format = _T("%f");
-                }
-                else
-                {
-                    m_format.Printf(_T("%%.%df"), m_precision);
-                }
-            }
-            else if ( m_precision == -1 )
-            {
-                // default precision
-                m_format.Printf(_T("%%%d.f"), m_width);
-            }
-            else
-            {
-                m_format.Printf(_T("%%%d.%df"), m_width, m_precision);
-            }
-        }
+    return 0.0;
+}
 
-        text.Printf(m_format, val);
+bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return false;
+}
 
-    }
-    //else: text already contains the string
+void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
+                                      long WXUNUSED(value) )
+{
+}
 
-    return text;
+void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col),
+                                        double WXUNUSED(value) )
+{
 }
 
-void wxGridCellFloatRenderer::Draw(wxGrid& grid,
-                                   wxGridCellAttr& attr,
-                                   wxDC& dc,
-                                   const wxRect& rectCell,
-                                   int row, int col,
-                                   bool isSelected)
+void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
+                                      bool WXUNUSED(value) )
 {
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+}
 
-    SetTextColoursAndFont(grid, attr, dc, isSelected);
+void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName) )
+{
+    return NULL;
+}
 
-    // draw the text right aligned by default
-    int hAlign, vAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
-    hAlign = wxALIGN_RIGHT;
+void  wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName),
+                                         void* WXUNUSED(value) )
+{
+}
 
-    wxRect rect = rectCell;
-    rect.Inflate(-1);
+//////////////////////////////////////////////////////////////////////
+//
+// Message class for the grid table to send requests and notifications
+// to the grid view
+//
 
-    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+wxGridTableMessage::wxGridTableMessage()
+{
+    m_table =  NULL;
+    m_id = -1;
+    m_comInt1 = -1;
+    m_comInt2 = -1;
 }
 
-wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
-                                            wxGridCellAttr& attr,
-                                            wxDC& dc,
-                                            int row, int col)
+wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
+                                        int commandInt1, int commandInt2 )
 {
-    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+    m_table = table;
+    m_id = id;
+    m_comInt1 = commandInt1;
+    m_comInt2 = commandInt2;
 }
 
-void wxGridCellFloatRenderer::SetParameters(const wxString& params)
-{
-    if ( !params )
-    {
-        // reset to defaults
-        SetWidth(-1);
-        SetPrecision(-1);
-    }
-    else
-    {
-        wxString tmp = params.BeforeFirst(_T(','));
-        if ( !!tmp )
-        {
-            long width;
-            if ( tmp.ToLong(&width) )
-            {
-                SetWidth((int)width);
-            }
-            else
-            {
-                wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
-            }
-
-        }
-                tmp = params.AfterFirst(_T(','));
-                if ( !!tmp )
-                {
-                    long precision;
-            if ( tmp.ToLong(&precision) )
-                    {
-                SetPrecision((int)precision);
-                    }
-                    else
-                    {
-                wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
-        }
-
-        }
-    }
-}
-
-
-// ----------------------------------------------------------------------------
-// wxGridCellBoolRenderer
-// ----------------------------------------------------------------------------
-
-wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
-
-// FIXME these checkbox size calculations are really ugly...
-
-// between checkmark and box
-static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
-
-wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
-                                           wxGridCellAttr& WXUNUSED(attr),
-                                           wxDC& WXUNUSED(dc),
-                                           int WXUNUSED(row),
-                                           int WXUNUSED(col))
-{
-    // compute it only once (no locks for MT safeness in GUI thread...)
-    if ( !ms_sizeCheckMark.x )
-    {
-        // get checkbox size
-        wxCoord checkSize = 0;
-        wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
-        wxSize size = checkbox->GetBestSize();
-        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
-
-        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-        checkSize -= size.y / 2;
-#endif
-
-        delete checkbox;
-
-        ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
-    }
-
-    return ms_sizeCheckMark;
-}
-
-void wxGridCellBoolRenderer::Draw(wxGrid& grid,
-                                  wxGridCellAttr& attr,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int row, int col,
-                                  bool isSelected)
-{
-    wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
-
-    // draw a check mark in the centre (ignoring alignment - TODO)
-    wxSize size = GetBestSize(grid, attr, dc, row, col);
-
-    // don't draw outside the cell
-    wxCoord minSize = wxMin(rect.width, rect.height);
-    if ( size.x >= minSize || size.y >= minSize )
-    {
-        // and even leave (at least) 1 pixel margin
-        size.x = size.y = minSize - 2;
-    }
-
-    // draw a border around checkmark
-    int vAlign, hAlign;
-    attr.GetAlignment(& hAlign, &vAlign);
-    
-    wxRect rectBorder;
-    if (hAlign == wxALIGN_CENTRE)
-    {
-        rectBorder.x = rect.x + rect.width/2 - size.x/2;
-        rectBorder.y = rect.y + rect.height/2 - size.y/2;
-        rectBorder.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.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.width = size.x;
-        rectBorder.height = size.y;        
-    }
-
-    bool value;
-    if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
-        value = grid.GetTable()->GetValueAsBool(row, col);
-    else
-    {
-        wxString cellval( grid.GetTable()->GetValue(row, col) );
-        value = !( !cellval || (cellval == wxT("0")) );
-    }
-
-    if ( value )
-    {
-        wxRect rectMark = rectBorder;
-#ifdef __WXMSW__
-        // MSW DrawCheckMark() is weird (and should probably be changed...)
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
-        rectMark.x++;
-        rectMark.y++;
-#else // !MSW
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif // MSW/!MSW
-
-        dc.SetTextForeground(attr.GetTextColour());
-        dc.DrawCheckMark(rectMark);
-    }
-
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectBorder);
-}
-
-// ----------------------------------------------------------------------------
-// wxGridCellAttr
-// ----------------------------------------------------------------------------
-
-void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
-{
-    m_nRef = 1;
-
-    m_isReadOnly = Unset;
-
-    m_renderer = NULL;
-    m_editor = NULL;
-
-    m_attrkind = wxGridCellAttr::Cell;
-
-    m_sizeRows = m_sizeCols = 1;
-    m_overflow = TRUE;
-
-    SetDefAttr(attrDefault);
-}
-
-wxGridCellAttr *wxGridCellAttr::Clone() const
-{
-    wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr);
-
-    if ( HasTextColour() )
-        attr->SetTextColour(GetTextColour());
-    if ( HasBackgroundColour() )
-        attr->SetBackgroundColour(GetBackgroundColour());
-    if ( HasFont() )
-        attr->SetFont(GetFont());
-    if ( HasAlignment() )
-        attr->SetAlignment(m_hAlign, m_vAlign);
-
-    attr->SetSize( m_sizeRows, m_sizeCols );
-
-    if ( m_renderer )
-    {
-        attr->SetRenderer(m_renderer);
-        m_renderer->IncRef();
-    }
-    if ( m_editor )
-    {
-        attr->SetEditor(m_editor);
-        m_editor->IncRef();
-    }
-
-    if ( IsReadOnly() )
-        attr->SetReadOnly();
-
-    attr->SetKind( m_attrkind );
-
-    return attr;
-}
-
-void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
-{
-    if ( !HasTextColour() && mergefrom->HasTextColour() )
-        SetTextColour(mergefrom->GetTextColour());
-    if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() )
-        SetBackgroundColour(mergefrom->GetBackgroundColour());
-    if ( !HasFont() && mergefrom->HasFont() )
-        SetFont(mergefrom->GetFont());
-    if ( !HasAlignment() && mergefrom->HasAlignment() ){
-        int hAlign, vAlign;
-        mergefrom->GetAlignment( &hAlign, &vAlign);
-        SetAlignment(hAlign, vAlign);
-    }
-
-    mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
-
-    // Directly access member functions as GetRender/Editor don't just return
-    // m_renderer/m_editor
-    //
-    // Maybe add support for merge of Render and Editor?
-    if (!HasRenderer() && mergefrom->HasRenderer() )
-    {
-        m_renderer = mergefrom->m_renderer;
-        m_renderer->IncRef();
-    }
-    if ( !HasEditor() && mergefrom->HasEditor() )
-    {
-        m_editor =  mergefrom->m_editor;
-        m_editor->IncRef();
-    }
-    if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
-        SetReadOnly(mergefrom->IsReadOnly());
-
-    SetDefAttr(mergefrom->m_defGridAttr);
-}
-
-void wxGridCellAttr::SetSize(int num_rows, int num_cols)
-{
-    // The size of a cell is normally 1,1
-
-    // If this cell is larger (2,2) then this is the top left cell
-    // the other cells that will be covered (lower right cells) must be
-    // set to negative or zero values such that
-    // row + num_rows of the covered cell points to the larger cell (this cell)
-    // same goes for the col + num_cols.
-
-    // Size of 0,0 is NOT valid, neither is <=0 and any positive value
-
-    wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) ||
-                  !((num_rows<=0)&&(num_cols>0)) ||
-                  !((num_rows==0)&&(num_cols==0))),
-                  wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
-
-    m_sizeRows = num_rows;
-    m_sizeCols = num_cols;
-}
-
-const wxColour& wxGridCellAttr::GetTextColour() const
-{
-    if (HasTextColour())
-    {
-        return m_colText;
-    }
-    else if (m_defGridAttr && m_defGridAttr != this)
-    {
-        return m_defGridAttr->GetTextColour();
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullColour;
-    }
-}
-
-
-const wxColour& wxGridCellAttr::GetBackgroundColour() const
-{
-    if (HasBackgroundColour())
-        return m_colBack;
-    else if (m_defGridAttr && m_defGridAttr != this)
-        return m_defGridAttr->GetBackgroundColour();
-    else
-    {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullColour;
-    }
-}
-
-
-const wxFont& wxGridCellAttr::GetFont() const
-{
-    if (HasFont())
-        return m_font;
-    else if (m_defGridAttr && m_defGridAttr != this)
-        return m_defGridAttr->GetFont();
-    else
-    {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullFont;
-    }
-}
-
-
-void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
-{
-    if (HasAlignment())
-    {
-        if ( hAlign ) *hAlign = m_hAlign;
-        if ( vAlign ) *vAlign = m_vAlign;
-    }
-    else if (m_defGridAttr && m_defGridAttr != this)
-        m_defGridAttr->GetAlignment(hAlign, vAlign);
-    else
-    {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-    }
-}
-
-void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
-{
-    if ( num_rows ) *num_rows = m_sizeRows;
-    if ( num_cols ) *num_cols = m_sizeCols;
-}
-
-// GetRenderer and GetEditor use a slightly different decision path about
-// which attribute to use.  If a non-default attr object has one then it is
-// 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.
-
-wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
-{
-    wxGridCellRenderer *renderer;
-
-    if ( m_renderer && this != m_defGridAttr )
-    {
-        // use the cells renderer if it has one
-        renderer = m_renderer;
-        renderer->IncRef();
-    }
-    else // no non default cell renderer
-    {
-        // get default renderer for the data type
-        if ( grid )
-        {
-            // GetDefaultRendererForCell() will do IncRef() for us
-            renderer = grid->GetDefaultRendererForCell(row, col);
-        }
-        else
-        {
-            renderer = NULL;
-        }
-
-        if ( !renderer )
-        {
-            if (m_defGridAttr &&  this != m_defGridAttr )
-            {
-                // if we still don't have one then use the grid default
-                // (no need for IncRef() here neither)
-                renderer = m_defGridAttr->GetRenderer(NULL, 0, 0);
-            }
-            else // default grid attr
-            {
-                // use m_renderer which we had decided not to use initially
-                renderer = m_renderer;
-                if ( renderer )
-                    renderer->IncRef();
-            }
-        }
-    }
-
-    // we're supposed to always find something
-    wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));
-
-    return renderer;
-}
-
-// same as above, except for s/renderer/editor/g
-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
-{
-    wxGridCellEditor *editor;
-
-    if ( m_editor && this != m_defGridAttr )
-    {
-        // use the cells editor if it has one
-        editor = m_editor;
-        editor->IncRef();
-    }
-    else // no non default cell editor
-    {
-        // get default editor for the data type
-        if ( grid )
-        {
-            // GetDefaultEditorForCell() will do IncRef() for us
-            editor = grid->GetDefaultEditorForCell(row, col);
-        }
-        else
-        {
-            editor = NULL;
-        }
-
-        if ( !editor )
-        {
-            if ( m_defGridAttr && this != m_defGridAttr )
-            {
-                // if we still don't have one then use the grid default
-                // (no need for IncRef() here neither)
-                editor = m_defGridAttr->GetEditor(NULL, 0, 0);
-            }
-            else // default grid attr
-            {
-                // use m_editor which we had decided not to use initially
-                editor = m_editor;
-                if ( editor )
-                    editor->IncRef();
-            }
-        }
-    }
-
-    // we're supposed to always find something
-    wxASSERT_MSG(editor, wxT("Missing default cell editor"));
-
-    return editor;
-}
-
-// ----------------------------------------------------------------------------
-// wxGridCellAttrData
-// ----------------------------------------------------------------------------
-
-void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
-{
-    int n = FindIndex(row, col);
-    if ( n == wxNOT_FOUND )
-    {
-        // add the attribute
-        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
-    }
-    else
-    {
-        // free the old attribute
-        m_attrs[(size_t)n].attr->DecRef();
-
-        if ( attr )
-        {
-            // change the attribute
-            m_attrs[(size_t)n].attr = attr;
-        }
-        else
-        {
-            // remove this attribute
-            m_attrs.RemoveAt((size_t)n);
-        }
-    }
-}
-
-wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
-{
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-
-    int n = FindIndex(row, col);
-    if ( n != wxNOT_FOUND )
-    {
-        attr = m_attrs[(size_t)n].attr;
-        attr->IncRef();
-    }
-
-    return attr;
-}
-
-void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
-{
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxGridCellCoords& coords = m_attrs[n].coords;
-        wxCoord row = coords.GetRow();
-        if ((size_t)row >= pos)
-        {
-            if (numRows > 0)
-            {
-                // If rows inserted, include row counter where necessary
-                coords.SetRow(row + numRows);
-            }
-            else if (numRows < 0)
-            {
-                // If rows deleted ...
-                if ((size_t)row >= pos - numRows)
-                {
-                    // ...either decrement row counter (if row still exists)...
-                    coords.SetRow(row + numRows);
-                }
-                else
-                {
-                    // ...or remove the attribute
-                    m_attrs.RemoveAt((size_t)n);
-                    n--; count--;
-                }
-            }
-        }
-    }
-}
-
-void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
-{
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxGridCellCoords& coords = m_attrs[n].coords;
-        wxCoord col = coords.GetCol();
-        if ( (size_t)col >= pos )
-        {
-            if ( numCols > 0 )
-            {
-                // If rows inserted, include row counter where necessary
-                coords.SetCol(col + numCols);
-            }
-            else if (numCols < 0)
-            {
-                // If rows deleted ...
-                if ((size_t)col >= pos - numCols)
-                {
-                    // ...either decrement row counter (if row still exists)...
-                    coords.SetCol(col + numCols);
-                }
-                else
-                {
-                    // ...or remove the attribute
-                    m_attrs.RemoveAt((size_t)n);
-                    n--; count--;
-                }
-            }
-        }
-    }
-}
-
-int wxGridCellAttrData::FindIndex(int row, int col) const
-{
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        const wxGridCellCoords& coords = m_attrs[n].coords;
-        if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
-        {
-            return n;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-// ----------------------------------------------------------------------------
-// wxGridRowOrColAttrData
-// ----------------------------------------------------------------------------
-
-wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
-{
-    size_t count = m_attrs.Count();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        m_attrs[n]->DecRef();
-    }
-}
-
-wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
-{
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-
-    int n = m_rowsOrCols.Index(rowOrCol);
-    if ( n != wxNOT_FOUND )
-    {
-        attr = m_attrs[(size_t)n];
-        attr->IncRef();
-    }
-
-    return attr;
-}
-
-void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
-{
-    int i = m_rowsOrCols.Index(rowOrCol);
-    if ( i == wxNOT_FOUND )
-    {
-        // add the attribute
-        m_rowsOrCols.Add(rowOrCol);
-        m_attrs.Add(attr);
-    }
-    else
-    {
-        size_t n = (size_t)i;
-        if ( attr )
-        {
-            // change the attribute
-            m_attrs[n]->DecRef();
-            m_attrs[n] = attr;
-        }
-        else
-        {
-            // remove this attribute
-            m_attrs[n]->DecRef();
-            m_rowsOrCols.RemoveAt(n);
-            m_attrs.RemoveAt(n);
-        }
-    }
-}
-
-void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols )
-{
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        int & rowOrCol = m_rowsOrCols[n];
-        if ( (size_t)rowOrCol >= pos )
-        {
-            if ( numRowsOrCols > 0 )
-            {
-                // If rows inserted, include row counter where necessary
-                rowOrCol += numRowsOrCols;
-            }
-            else if ( numRowsOrCols < 0)
-            {
-                // If rows deleted, either decrement row counter (if row still exists)
-                if ((size_t)rowOrCol >= pos - numRowsOrCols)
-                    rowOrCol += numRowsOrCols;
-                else
-                {
-                    m_rowsOrCols.RemoveAt((size_t)n);
-                    m_attrs.RemoveAt((size_t)n);
-                    n--; count--;
-                }
-            }
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxGridCellAttrProvider
-// ----------------------------------------------------------------------------
-
-wxGridCellAttrProvider::wxGridCellAttrProvider()
-{
-    m_data = (wxGridCellAttrProviderData *)NULL;
-}
-
-wxGridCellAttrProvider::~wxGridCellAttrProvider()
-{
-    delete m_data;
-}
-
-void wxGridCellAttrProvider::InitData()
-{
-    m_data = new wxGridCellAttrProviderData;
-}
-
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
-                                                wxGridCellAttr::wxAttrKind  kind ) const
-{
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-    if ( m_data )
-    {
-        switch(kind)
-        {
-            case (wxGridCellAttr::Any):
-                //Get cached merge attributes.
-                // Currenlty not used as no cache implemented as not mutiable
-                // attr = m_data->m_mergeAttr.GetAttr(row, col);
-                if(!attr)
-                {
-                    //Basicaly implement old version.
-                    //Also check merge cache, so we don't have to re-merge every time..
-                    wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL,
-                                   *attrrow = (wxGridCellAttr *)NULL,
-                                   *attrcol = (wxGridCellAttr *)NULL;
-
-                    attrcell = m_data->m_cellAttrs.GetAttr(row, col);
-                    attrcol = m_data->m_colAttrs.GetAttr(col);
-                    attrrow = m_data->m_rowAttrs.GetAttr(row);
-
-                    if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){
-                        // Two or move are non NULL
-                        attr = new wxGridCellAttr;
-                        attr->SetKind(wxGridCellAttr::Merged);
-
-                        //Order important..
-                        if(attrcell){
-                            attr->MergeWith(attrcell);
-                            attrcell->DecRef();
-                        }
-                        if(attrcol){
-                            attr->MergeWith(attrcol);
-                            attrcol->DecRef();
-                        }
-                        if(attrrow){
-                            attr->MergeWith(attrrow);
-                            attrrow->DecRef();
-                        }
-                        //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.
-                        if(attrrow) attr = attrrow;
-                        if(attrcol) attr = attrcol;
-                        if(attrcell) attr = attrcell;
-                    }
-                }
-            break;
-            case (wxGridCellAttr::Cell):
-                attr = m_data->m_cellAttrs.GetAttr(row, col);
-            break;
-            case (wxGridCellAttr::Col):
-                 attr = m_data->m_colAttrs.GetAttr(col);
-            break;
-            case (wxGridCellAttr::Row):
-            attr = m_data->m_rowAttrs.GetAttr(row);
-            break;
-            default:
-                // unused as yet...
-                // (wxGridCellAttr::Default):
-                // (wxGridCellAttr::Merged):
-            break;
-        }
-    }
-    return attr;
-}
-
-void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr,
-                                     int row, int col)
-{
-    if ( !m_data )
-        InitData();
-
-    m_data->m_cellAttrs.SetAttr(attr, row, col);
-}
-
-void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row)
-{
-    if ( !m_data )
-        InitData();
-
-    m_data->m_rowAttrs.SetAttr(attr, row);
-}
-
-void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col)
-{
-    if ( !m_data )
-        InitData();
-
-    m_data->m_colAttrs.SetAttr(attr, col);
-}
-
-void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows )
-{
-    if ( m_data )
-    {
-        m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
-
-        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
-    }
-}
-
-void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
-{
-    if ( m_data )
-    {
-        m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
-
-        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxGridTypeRegistry
-// ----------------------------------------------------------------------------
-
-wxGridTypeRegistry::~wxGridTypeRegistry()
-{
-    size_t count = m_typeinfo.Count();
-    for ( size_t i = 0; i < count; i++ )
-        delete m_typeinfo[i];
-}
-
-
-void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
-                                          wxGridCellRenderer* renderer,
-                                          wxGridCellEditor* editor)
-{
-    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
-
-    // is it already registered?
-    int loc = FindRegisteredDataType(typeName);
-    if ( loc != wxNOT_FOUND )
-    {
-        delete m_typeinfo[loc];
-        m_typeinfo[loc] = info;
-    }
-    else
-    {
-        m_typeinfo.Add(info);
-    }
-}
-
-int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)
-{
-    size_t count = m_typeinfo.GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( typeName == m_typeinfo[i]->m_typeName )
-        {
-            return i;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-int wxGridTypeRegistry::FindDataType(const wxString& typeName)
-{
-    int index = FindRegisteredDataType(typeName);
-    if ( index == wxNOT_FOUND )
-    {
-        // check whether this is one of the standard ones, in which case
-        // register it "on the fly"
-#if wxUSE_TEXTCTRL
-        if ( typeName == wxGRID_VALUE_STRING )
-        {
-            RegisterDataType(wxGRID_VALUE_STRING,
-                             new wxGridCellStringRenderer,
-                             new wxGridCellTextEditor);
-        } else
-#endif // wxUSE_TEXTCTRL
-#if wxUSE_CHECKBOX
-        if ( typeName == wxGRID_VALUE_BOOL )
-        {
-            RegisterDataType(wxGRID_VALUE_BOOL,
-                             new wxGridCellBoolRenderer,
-                             new wxGridCellBoolEditor);
-        } else
-#endif // wxUSE_CHECKBOX
-#if wxUSE_TEXTCTRL
-        if ( typeName == wxGRID_VALUE_NUMBER )
-        {
-            RegisterDataType(wxGRID_VALUE_NUMBER,
-                             new wxGridCellNumberRenderer,
-                             new wxGridCellNumberEditor);
-        }
-        else if ( typeName == wxGRID_VALUE_FLOAT )
-        {
-            RegisterDataType(wxGRID_VALUE_FLOAT,
-                             new wxGridCellFloatRenderer,
-                             new wxGridCellFloatEditor);
-        } else
-#endif // wxUSE_TEXTCTRL
-#if wxUSE_COMBOBOX
-        if ( typeName == wxGRID_VALUE_CHOICE )
-        {
-            RegisterDataType(wxGRID_VALUE_CHOICE,
-                             new wxGridCellStringRenderer,
-                             new wxGridCellChoiceEditor);
-        } else
-#endif // wxUSE_COMBOBOX
-        {
-            return wxNOT_FOUND;
-        }
-
-        // we get here only if just added the entry for this type, so return
-        // the last index
-        index = m_typeinfo.GetCount() - 1;
-    }
-
-    return index;
-}
-
-int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
-{
-    int index = FindDataType(typeName);
-    if ( index == wxNOT_FOUND )
-    {
-        // the first part of the typename is the "real" type, anything after ':'
-        // are the parameters for the renderer
-        index = FindDataType(typeName.BeforeFirst(_T(':')));
-        if ( index == wxNOT_FOUND )
-        {
-            return wxNOT_FOUND;
-        }
-
-        wxGridCellRenderer *renderer = GetRenderer(index);
-        wxGridCellRenderer *rendererOld = renderer;
-        renderer = renderer->Clone();
-        rendererOld->DecRef();
-
-        wxGridCellEditor *editor = GetEditor(index);
-        wxGridCellEditor *editorOld = editor;
-        editor = editor->Clone();
-        editorOld->DecRef();
-
-        // do it even if there are no parameters to reset them to defaults
-        wxString params = typeName.AfterFirst(_T(':'));
-        renderer->SetParameters(params);
-        editor->SetParameters(params);
-
-        // register the new typename
-        RegisterDataType(typeName, renderer, editor);
-
-        // we just registered it, it's the last one
-        index = m_typeinfo.GetCount() - 1;
-    }
-
-    return index;
-}
-
-wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
-{
-    wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
-    if (renderer)
-        renderer->IncRef();
-    return renderer;
-}
-
-wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
-{
-    wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
-    if (editor)
-        editor->IncRef();
-    return editor;
-}
-
-// ----------------------------------------------------------------------------
-// wxGridTableBase
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
-
-
-wxGridTableBase::wxGridTableBase()
-{
-    m_view = (wxGrid *) NULL;
-    m_attrProvider = (wxGridCellAttrProvider *) NULL;
-}
-
-wxGridTableBase::~wxGridTableBase()
-{
-    delete m_attrProvider;
-}
-
-void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
-{
-    delete m_attrProvider;
-    m_attrProvider = attrProvider;
-}
-
-bool wxGridTableBase::CanHaveAttributes()
-{
-    if ( ! GetAttrProvider() )
-    {
-        // use the default attr provider by default
-        SetAttrProvider(new wxGridCellAttrProvider);
-    }
-    return TRUE;
-}
-
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)
-{
-    if ( m_attrProvider )
-        return m_attrProvider->GetAttr(row, col, kind);
-    else
-        return (wxGridCellAttr *)NULL;
-}
-
-void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
-{
-    if ( m_attrProvider )
-    {
-        attr->SetKind(wxGridCellAttr::Cell);
-        m_attrProvider->SetAttr(attr, row, col);
-    }
-    else
-    {
-        // as we take ownership of the pointer and don't store it, we must
-        // free it now
-        wxSafeDecRef(attr);
-    }
-}
-
-void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
-{
-    if ( m_attrProvider )
-    {
-        attr->SetKind(wxGridCellAttr::Row);
-        m_attrProvider->SetRowAttr(attr, row);
-    }
-    else
-    {
-        // as we take ownership of the pointer and don't store it, we must
-        // free it now
-        wxSafeDecRef(attr);
-    }
-}
-
-void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
-{
-    if ( m_attrProvider )
-    {
-        attr->SetKind(wxGridCellAttr::Col);
-        m_attrProvider->SetColAttr(attr, col);
-    }
-    else
-    {
-        // as we take ownership of the pointer and don't store it, we must
-        // free it now
-        wxSafeDecRef(attr);
-    }
-}
-
-bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
-                                  size_t WXUNUSED(numRows) )
-{
-    wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
-
-    return FALSE;
-}
-
-bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
-{
-    wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
-
-    return FALSE;
-}
-
-bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
-                                  size_t WXUNUSED(numRows) )
-{
-    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
-
-    return FALSE;
-}
-
-bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
-                                  size_t WXUNUSED(numCols) )
-{
-    wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
-
-    return FALSE;
-}
-
-bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
-{
-    wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
-
-    return FALSE;
-}
-
-bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
-                                  size_t WXUNUSED(numCols) )
-{
-    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
-
-    return FALSE;
-}
-
-
-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.
-    return s;
-}
-
-wxString wxGridTableBase::GetColLabelValue( int col )
-{
-    // default col labels are:
-    //   cols 0 to 25   : A-Z
-    //   cols 26 to 675 : AA-ZZ
-    //   etc.
-
-    wxString s;
-    unsigned int i, n;
-    for ( n = 1; ; n++ )
-    {
-        s += (_T('A') + (wxChar)( col%26 ));
-        col = col/26 - 1;
-        if ( col < 0 ) break;
-    }
-
-    // reverse the string...
-    wxString s2;
-    for ( i = 0;  i < n;  i++ )
-    {
-        s2 += s[n-i-1];
-    }
-
-    return s2;
-}
-
-
-wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
-{
-    return wxGRID_VALUE_STRING;
-}
-
-bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
-                                     const wxString& typeName )
-{
-    return typeName == wxGRID_VALUE_STRING;
-}
-
-bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
-{
-    return CanGetValueAs(row, col, typeName);
-}
-
-long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) )
-{
-    return 0;
-}
-
-double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) )
-{
-    return 0.0;
-}
-
-bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
-{
-    return FALSE;
-}
-
-void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
-                                      long WXUNUSED(value) )
-{
-}
-
-void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col),
-                                        double WXUNUSED(value) )
-{
-}
-
-void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
-                                      bool WXUNUSED(value) )
-{
-}
-
-
-void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
-                                         const wxString& WXUNUSED(typeName) )
-{
-    return NULL;
-}
-
-void  wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
-                                         const wxString& WXUNUSED(typeName),
-                                         void* WXUNUSED(value) )
-{
-}
-
-//////////////////////////////////////////////////////////////////////
-//
-// Message class for the grid table to send requests and notifications
-// to the grid view
-//
-
-wxGridTableMessage::wxGridTableMessage()
-{
-    m_table = (wxGridTableBase *) NULL;
-    m_id = -1;
-    m_comInt1 = -1;
-    m_comInt2 = -1;
-}
-
-wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
-                                        int commandInt1, int commandInt2 )
-{
-    m_table = table;
-    m_id = id;
-    m_comInt1 = commandInt1;
-    m_comInt2 = commandInt2;
-}
-
-
-
 //////////////////////////////////////////////////////////////////////
 //
 // A basic grid table for string data. An object of this class will
@@ -3082,11 +1253,14 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
 wxGridStringTable::wxGridStringTable()
         : wxGridTableBase()
 {
+    m_numCols = 0;
 }
 
 wxGridStringTable::wxGridStringTable( int numRows, int numCols )
         : wxGridTableBase()
 {
+    m_numCols = numCols;
+
     m_data.Alloc( numRows );
 
     wxArrayString sa;
@@ -3096,47 +1270,25 @@ wxGridStringTable::wxGridStringTable( int numRows, int numCols )
     m_data.Add( sa, numRows );
 }
 
-wxGridStringTable::~wxGridStringTable()
-{
-}
-
-int wxGridStringTable::GetNumberRows()
-{
-    return m_data.GetCount();
-}
-
-int wxGridStringTable::GetNumberCols()
-{
-    if ( m_data.GetCount() > 0 )
-        return m_data[0].GetCount();
-    else
-        return 0;
-}
-
 wxString wxGridStringTable::GetValue( int row, int col )
 {
-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
-                  _T("invalid row or column index in wxGridStringTable") );
+    wxCHECK_MSG( (row >= 0 && row < GetNumberRows()) &&
+                 (col >= 0 && col < GetNumberCols()),
+                 wxEmptyString,
+                 wxT("invalid row or column index in wxGridStringTable") );
 
     return m_data[row][col];
 }
 
 void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 {
-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
-                  _T("invalid row or column index in wxGridStringTable") );
+    wxCHECK_RET( (row >= 0 && row < GetNumberRows()) &&
+                 (col >= 0 && col < GetNumberCols()),
+                 wxT("invalid row or column index in wxGridStringTable") );
 
     m_data[row][col] = value;
 }
 
-bool wxGridStringTable::IsEmptyCell( int row, int col )
-{
-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
-                  _T("invalid row or column index in wxGridStringTable") );
-
-    return (m_data[row][col] == wxEmptyString);
-}
-
 void wxGridStringTable::Clear()
 {
     int row, col;
@@ -3147,9 +1299,9 @@ void wxGridStringTable::Clear()
     {
         numCols = m_data[0].GetCount();
 
-        for ( row = 0;  row < numRows;  row++ )
+        for ( row = 0; row < numRows; row++ )
         {
-            for ( col = 0;  col < numCols;  col++ )
+            for ( col = 0; col < numCols; col++ )
             {
                 m_data[row][col] = wxEmptyString;
             }
@@ -3157,7 +1309,6 @@ void wxGridStringTable::Clear()
     }
 }
 
-
 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {
     size_t curNumRows = m_data.GetCount();
@@ -3173,6 +1324,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
     sa.Alloc( curNumCols );
     sa.Add( wxEmptyString, curNumCols );
     m_data.Insert( sa, pos, numRows );
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3183,14 +1335,15 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 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 )
@@ -3210,7 +1363,7 @@ bool wxGridStringTable::AppendRows( size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
@@ -3227,7 +1380,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
                         (unsigned long)curNumRows
                     ) );
 
-        return FALSE;
+        return false;
     }
 
     if ( numRows > curNumRows - pos )
@@ -3243,6 +1396,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
     {
         m_data.RemoveAt( pos, numRows );
     }
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3253,7 +1407,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
@@ -3261,21 +1415,34 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
     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 );
     }
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    if ( !m_colLabels.IsEmpty() )
     {
-        for ( col = pos;  col < pos + numCols;  col++ )
+        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++ )
         {
             m_data[row].Insert( wxEmptyString, col );
         }
     }
+
+    m_numCols += numCols;
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3286,7 +1453,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxGridStringTable::AppendCols( size_t numCols )
@@ -3294,21 +1461,14 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     size_t row;
 
     size_t curNumRows = m_data.GetCount();
-#if 0
-    if ( !curNumRows )
-    {
-        // TODO: something better than this ?
-        //
-        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
-        return FALSE;
-    }
-#endif
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )
     {
         m_data[row].Add( wxEmptyString, numCols );
     }
 
+    m_numCols += numCols;
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3318,7 +1478,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
@@ -3338,25 +1498,49 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
                         (unsigned long)numCols,
                         (unsigned long)curNumCols
                     ) );
-        return FALSE;
+        return false;
+    }
+
+    int colID;
+    if ( GetView() )
+        colID = GetView()->GetColAt( pos );
+    else
+        colID = pos;
+
+    if ( numCols > curNumCols - colID )
+    {
+        numCols = curNumCols - colID;
     }
 
-    if ( numCols > curNumCols - pos )
+    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++ )
+    if ( numCols >= curNumCols )
     {
-        if ( numCols >= curNumCols )
+        for ( row = 0; row < curNumRows; row++ )
         {
             m_data[row].Clear();
         }
-        else
+
+        m_numCols = 0;
+    }
+    else // something will be left
+    {
+        for ( row = 0; row < curNumRows; row++ )
         {
-            m_data[row].RemoveAt( pos, numCols );
+            m_data[row].RemoveAt( colID, numCols );
         }
+
+        m_numCols -= numCols;
     }
+
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -3367,7 +1551,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
-    return TRUE;
+    return true;
 }
 
 wxString wxGridStringTable::GetRowLabelValue( int row )
@@ -3380,7 +1564,7 @@ wxString wxGridStringTable::GetRowLabelValue( int row )
     }
     else
     {
-        return m_rowLabels[ row ];
+        return m_rowLabels[row];
     }
 }
 
@@ -3394,7 +1578,7 @@ wxString wxGridStringTable::GetColLabelValue( int col )
     }
     else
     {
-        return m_colLabels[ col ];
+        return m_colLabels[col];
     }
 }
 
@@ -3404,7 +1588,8 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
     {
         int n = m_rowLabels.GetCount();
         int i;
-        for ( i = n;  i <= row;  i++ )
+
+        for ( i = n; i <= row; i++ )
         {
             m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
         }
@@ -3419,7 +1604,8 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
     {
         int n = m_colLabels.GetCount();
         int i;
-        for ( i = n;  i <= col;  i++ )
+
+        for ( i = n; i <= col; i++ )
         {
             m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
         }
@@ -3429,28 +1615,24 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
 }
 
 
-
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
-    EVT_PAINT( wxGridRowLabelWindow::OnPaint )
-    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
-    EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
-    EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
+BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+    EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
 END_EVENT_TABLE()
 
-wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
 {
-    m_owner = parent;
+    m_owner->CancelMouseCapture();
 }
 
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
+    EVT_PAINT( wxGridRowLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
+    EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
+END_EVENT_TABLE()
+
 void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
@@ -3463,60 +1645,32 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
-    dc.SetDeviceOrigin( 0, -y );
-
-    wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawRowLabels( dc , rows );
-}
-
-
-void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
-{
-    m_owner->ProcessRowLabelMouseEvent( event );
-}
-
-
-void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
-{
-    m_owner->GetEventHandler()->ProcessEvent(event);
-}
+    wxPoint pt = dc.GetDeviceOrigin();
+    dc.SetDeviceOrigin( pt.x, pt.y-y );
 
+    wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawRowLabels( dc, rows );
+}
 
-// 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 )
+void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    m_owner->ProcessRowLabelMouseEvent( event );
 }
 
-void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+        event.Skip();
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
     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 )
 END_EVENT_TABLE()
 
-wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
-{
-    m_owner = parent;
-}
-
 void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
@@ -3529,13 +1683,16 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     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() );
-    m_owner->DrawColLabels( dc , cols );
+    m_owner->DrawColLabels( dc, cols );
 }
 
-
 void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessColLabelMouseEvent( event );
@@ -3543,157 +1700,84 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 
 void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& 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 )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
-}
-
-void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+        event.Skip();
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 
-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_PAINT( wxGridCornerLabelWindow::OnPaint)
-    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
-    EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
 END_EVENT_TABLE()
 
-wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
-                                                  wxWindowID id,
-                                                  const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
-{
-    m_owner = parent;
-}
-
 void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 
-    int client_height = 0;
-    int client_width = 0;
-    GetClientSize( &client_width, &client_height );
-
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
-    dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
-    dc.DrawLine( 0, 0, client_width, 0 );
-    dc.DrawLine( 0, 0, 0, client_height );
-
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 1, 1, client_width-1, 1 );
-    dc.DrawLine( 1, 1, 1, client_height-1 );
+    m_owner->DrawCornerLabel(dc);
 }
 
-
 void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 {
     m_owner->ProcessCornerLabelMouseEvent( event );
 }
 
-
 void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& 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 wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
-}
-
-void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if (!m_owner->GetEventHandler()->ProcessEvent(event))
+        event.Skip();
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
     EVT_PAINT( wxGridWindow::OnPaint )
-    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
+    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
     EVT_KEY_UP( wxGridWindow::OnKeyUp )
+    EVT_CHAR( wxGridWindow::OnChar )
+    EVT_SET_FOCUS( wxGridWindow::OnFocus )
+    EVT_KILL_FOCUS( wxGridWindow::OnFocus )
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
-wxGridWindow::wxGridWindow( wxGrid *parent,
-                            wxGridRowLabelWindow *rowLblWin,
-                            wxGridColLabelWindow *colLblWin,
-                            wxWindowID id,
-                            const wxPoint &pos,
-                            const wxSize &size )
-            : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxCLIP_CHILDREN,
-                        wxT("grid window") )
-
-{
-    m_owner = parent;
-    m_rowLabelWin = rowLblWin;
-    m_colLabelWin = colLblWin;
-    SetBackgroundColour(_T("WHITE"));
-}
-
-
-wxGridWindow::~wxGridWindow()
-{
-}
-
-
 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);
-#if WXGRID_DRAW_LINES
-    m_owner->DrawAllGridLines( dc, reg );
-#endif
+    wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc, dirtyCells );
+
     m_owner->DrawGridSpace( dc );
-    m_owner->DrawHighlight( dc , DirtyCells );
-}
 
+    m_owner->DrawAllGridLines( dc, reg );
+
+    m_owner->DrawHighlight( dc, dirtyCells );
+}
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {
     wxWindow::ScrollWindow( dx, dy, rect );
-    m_rowLabelWin->ScrollWindow( 0, dy, rect );
-    m_colLabelWin->ScrollWindow( dx, 0, rect );
+    m_owner->GetGridRowLabelWindow()->ScrollWindow( 0, dy, rect );
+    m_owner->GetGridColLabelWindow()->ScrollWindow( dx, 0, rect );
 }
 
-
 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->GetEventHandler()->ProcessEvent(event);
+    if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+        event.Skip();
 }
 
 // This seems to be required for wxMotif/wxGTK otherwise the mouse
@@ -3701,66 +1785,149 @@ void wxGridWindow::OnMouseWheel( wxMouseEvent& 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 )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
-void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
+void wxGridWindow::OnChar( wxKeyEvent& event )
 {
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
 }
 
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
+{
+}
 
-//////////////////////////////////////////////////////////////////////
+void wxGridWindow::OnFocus(wxFocusEvent& event)
+{
+    // and if we have any selection, it has to be repainted, because it
+    // uses different colour when the grid is not focused:
+    if ( m_owner->IsSelection() )
+    {
+        Refresh();
+    }
+    else
+    {
+        // NB: Note that this code is in "else" branch only because the other
+        //     branch refreshes everything and so there's no point in calling
+        //     Refresh() again, *not* because it should only be done if
+        //     !IsSelection(). If the above code is ever optimized to refresh
+        //     only selected area, this needs to be moved out of the "else"
+        //     branch so that it's always executed.
 
-// Internal Helper function for computing row or column from some
-// (unscrolled) coordinate value, using either
-// m_defaultRowHeight/m_defaultColWidth or binary search on array
-// of m_rowBottoms/m_ColRights to speed up the search!
+        // current cell cursor {dis,re}appears on focus change:
+        const wxGridCellCoords cursorCoords(m_owner->GetGridCursorRow(),
+                                            m_owner->GetGridCursorCol());
+        const wxRect cursor =
+            m_owner->BlockToDeviceRect(cursorCoords, cursorCoords);
+        Refresh(true, &cursor);
+    }
 
-// Internal helper macros for simpler use of that function
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
+}
 
-static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
-                           const wxArrayInt& BorderArray, int nMax,
-                           bool maxOnOverflow);
+#define internalXToCol(x) XToCol(x, true)
+#define internalYToRow(y) YToRow(y, true)
 
-#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
-                                          WXGRID_MIN_COL_WIDTH, \
-                                          m_colRights, m_numCols, TRUE)
-#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
-                                          WXGRID_MIN_ROW_HEIGHT, \
-                                          m_rowBottoms, m_numRows, TRUE)
 /////////////////////////////////////////////////////////////////////
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGridStyle )
+
+wxBEGIN_FLAGS( wxGridStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB)
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxGridStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGrid)
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGrid)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+/*
+ TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo)
+*/
+#else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
+#endif
 
 BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )
     EVT_SIZE( wxGrid::OnSize )
     EVT_KEY_DOWN( wxGrid::OnKeyDown )
     EVT_KEY_UP( wxGrid::OnKeyUp )
+    EVT_CHAR ( wxGrid::OnChar )
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
 END_EVENT_TABLE()
 
-wxGrid::wxGrid( wxWindow *parent,
-                 wxWindowID id,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxString& name )
-  : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
-    m_colMinWidths(GRID_HASH_SIZE),
-    m_rowMinHeights(GRID_HASH_SIZE)
+bool wxGrid::Create(wxWindow *parent, wxWindowID id,
+                          const wxPoint& pos, const wxSize& size,
+                          long style, const wxString& name)
 {
+    if (!wxScrolledWindow::Create(parent, id, pos, size,
+                                  style | wxWANTS_CHARS, name))
+        return false;
+
+    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE);
+    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE);
+
     Create();
-}
+    SetInitialSize(size);
+    CalcDimensions();
 
+    return true;
+}
 
 wxGrid::~wxGrid()
 {
+    if ( m_winCapture )
+        m_winCapture->ReleaseMouse();
+
+    // Ensure that the editor control is destroyed before the grid is,
+    // otherwise we crash later when the editor tries to do something with the
+    // half destroyed grid
+    HideCellEditControl();
+
     // Must do this or ~wxScrollHelper will pop the wrong event handler
     SetTargetWindow(this);
     ClearAttrCache();
@@ -3768,32 +1935,40 @@ wxGrid::~wxGrid()
 
 #ifdef DEBUG_ATTR_CACHE
     size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
-    wxPrintf(_T("wxGrid attribute cache statistics: "
+    wxPrintf(wxT("wxGrid attribute cache statistics: "
                 "total: %u, hits: %u (%u%%)\n"),
              total, gs_nAttrCacheHits,
              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;
+    else if ( m_table && m_table->GetView() == this )
+        m_table->SetView(NULL);
 
     delete m_typeRegistry;
     delete m_selection;
-}
 
+    delete m_setFixedRows;
+    delete m_setFixedCols;
+}
 
 //
 // ----- internal init and update functions
 //
 
+// NOTE: If using the default visual attributes works everywhere then this can
+// be removed as well as the #else cases below.
+#define _USE_VISATTR 0
+
 void wxGrid::Create()
 {
-    m_created = FALSE;    // set to TRUE by CreateGrid
-
-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = FALSE;
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
 
-    m_cellEditCtrlEnabled = FALSE;
+    m_cellEditCtrlEnabled = false;
 
     m_defaultCellAttr = new wxGridCellAttr();
 
@@ -3802,77 +1977,96 @@ void wxGrid::Create()
     m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
     m_defaultCellAttr->SetFont(GetFont());
     m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
+    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
+    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
+
+#if _USE_VISATTR
+    wxVisualAttributes gva = wxListBox::GetClassDefaultAttributes();
+    wxVisualAttributes lva = wxPanel::GetClassDefaultAttributes();
+
+    m_defaultCellAttr->SetTextColour(gva.colFg);
+    m_defaultCellAttr->SetBackgroundColour(gva.colBg);
+
+#else
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
     m_defaultCellAttr->SetBackgroundColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
-    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
-
+#endif
 
     m_numRows = 0;
     m_numCols = 0;
     m_currentCellCoords = wxGridNoCellCoords;
 
-    m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
-
-    // create the type registry
-    m_typeRegistry = new wxGridTypeRegistry;
-    m_selection = NULL;
-
     // subwindow components that make up the wxGrid
-    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-                                                    -1,
-                                                    wxDefaultPosition,
-                                                    wxDefaultSize );
-
-    m_rowLabelWin = new wxGridRowLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
-
-    m_colLabelWin = new wxGridColLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
-
-    m_gridWin = new wxGridWindow( this,
-                                  m_rowLabelWin,
-                                  m_colLabelWin,
-                                  -1,
-                                  wxDefaultPosition,
-                                  wxDefaultSize );
+    m_rowLabelWin = new wxGridRowLabelWindow(this);
+    CreateColumnWindow();
+    m_cornerLabelWin = new wxGridCornerLabelWindow(this);
+    m_gridWin = new wxGridWindow( this );
 
     SetTargetWindow( m_gridWin );
 
-    Init();
+#if _USE_VISATTR
+    wxColour gfg = gva.colFg;
+    wxColour gbg = gva.colBg;
+    wxColour lfg = lva.colFg;
+    wxColour lbg = lva.colBg;
+#else
+    wxColour gfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    wxColour gbg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
+    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_rowLabelWin->SetOwnBackgroundColour(lbg);
+    m_colWindow->SetOwnForegroundColour(lfg);
+    m_colWindow->SetOwnBackgroundColour(lbg);
+
+    m_gridWin->SetOwnForegroundColour(gfg);
+    m_gridWin->SetOwnBackgroundColour(gbg);
+
+    m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
+    m_labelTextColour = m_rowLabelWin->GetForegroundColour();
+
+    // now that we have the grid window, use its font to compute the default
+    // row height
+    m_defaultRowHeight = m_gridWin->GetCharHeight();
+#if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
+    m_defaultRowHeight += 8;
+#else
+    m_defaultRowHeight += 4;
+#endif
+
 }
 
+void wxGrid::CreateColumnWindow()
+{
+    if ( m_useNativeHeader )
+    {
+        m_colWindow = new wxGridHeaderCtrl(this);
+        m_colLabelHeight = m_colWindow->GetBestSize().y;
+    }
+    else // draw labels ourselves
+    {
+        m_colWindow = new wxGridColLabelWindow(this);
+        m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+    }
+}
 
 bool wxGrid::CreateGrid( int numRows, int numCols,
-                         wxGrid::wxGridSelectionModes selmode )
+                         wxGridSelectionModes selmode )
 {
     wxCHECK_MSG( !m_created,
-                 FALSE,
+                 false,
                  wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
 
-    m_numRows = numRows;
-    m_numCols = numCols;
-
-    m_table = new wxGridStringTable( m_numRows, m_numCols );
-    m_table->SetView( this );
-    m_ownTable = TRUE;
-    m_selection = new wxGridSelection( this, selmode );
-
-    CalcDimensions();
-
-    m_created = TRUE;
-
-    return m_created;
+    return SetTable(new wxGridStringTable(numRows, numCols), true, selmode);
 }
 
-void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+void wxGrid::SetSelectionMode(wxGridSelectionModes selmode)
 {
     wxCHECK_RET( m_created,
                  wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
@@ -3882,125 +2076,185 @@ void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
 
 wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
 {
-    wxCHECK_MSG( m_created, wxGrid::wxGridSelectCells,
+    wxCHECK_MSG( m_created, wxGridSelectCells,
                  wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
 
     return m_selection->GetSelectionMode();
 }
 
-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 )
     {
-        // RD: Actually, this should probably be allowed.  I think it would be
-        //     nice to be able to switch multiple Tables in and out of a single
-        //     View at runtime.  Is there anything in the implementation that
-        //     would prevent this?
+        // stop all processing
+        m_created = false;
+
+        if (m_table)
+        {
+            m_table->SetView(0);
+            if( m_ownTable )
+                delete m_table;
+            m_table = NULL;
+        }
+
+        wxDELETE(m_selection);
 
-        // At least, you now have to cope with m_selection
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
+        m_ownTable = false;
+        m_numRows = 0;
+        m_numCols = 0;
+        checkSelection = true;
+
+        // kill row and column size arrays
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();
     }
-    else
+
+    if (table)
     {
         m_numRows = table->GetNumberRows();
         m_numCols = table->GetNumberCols();
 
+        if ( m_useNativeHeader )
+            GetGridColHeader()->SetColumnCount(m_numCols);
+
         m_table = table;
         m_table->SetView( this );
-        if (takeOwnership)
-            m_ownTable = TRUE;
+        m_ownTable = takeOwnership;
         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_selectedBlockCorner = wxGridNoCellCoords;
+            m_currentCellCoords =
+              wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+                               wxMin(m_numCols, m_currentCellCoords.GetCol()));
+            if (m_selectedBlockTopLeft.GetRow() >= m_numRows ||
+                m_selectedBlockTopLeft.GetCol() >= m_numCols)
+            {
+                m_selectedBlockTopLeft = wxGridNoCellCoords;
+                m_selectedBlockBottomRight = wxGridNoCellCoords;
+            }
+            else
+                m_selectedBlockBottomRight =
+                  wxGridCellCoords(wxMin(m_numRows,
+                                         m_selectedBlockBottomRight.GetRow()),
+                                   wxMin(m_numCols,
+                                         m_selectedBlockBottomRight.GetCol()));
+        }
         CalcDimensions();
 
-        m_created = TRUE;
+        m_created = true;
     }
 
     return m_created;
 }
 
-
 void wxGrid::Init()
 {
+    m_created = false;
+
+    m_cornerLabelWin = NULL;
+    m_rowLabelWin = NULL;
+    m_colWindow = NULL;
+    m_gridWin = NULL;
+
+    m_table = NULL;
+    m_ownTable = false;
+
+    m_selection = NULL;
+    m_defaultCellAttr = NULL;
+    m_typeRegistry = NULL;
+    m_winCapture = NULL;
+
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
-    if ( m_rowLabelWin )
-    {
-        m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
-    }
-    else
-    {
-        m_labelBackgroundColour = wxColour( _T("WHITE") );
-    }
-
-    m_labelTextColour = wxColour( _T("BLACK") );
+    m_setFixedRows =
+    m_setFixedCols = NULL;
 
     // init attr cache
     m_attrCache.row = -1;
     m_attrCache.col = -1;
     m_attrCache.attr = NULL;
 
-    // TODO: something better than this ?
-    //
-    m_labelFont = this->GetFont();
-//    m_labelFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-//    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+    m_labelFont = GetFont();
+    m_labelFont.SetWeight( wxBOLD );
 
     m_rowLabelHorizAlign = wxALIGN_CENTRE;
     m_rowLabelVertAlign  = wxALIGN_CENTRE;
 
     m_colLabelHorizAlign = wxALIGN_CENTRE;
     m_colLabelVertAlign  = wxALIGN_CENTRE;
+    m_colLabelTextOrientation = wxHORIZONTAL;
 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
-    m_defaultRowHeight = m_gridWin->GetCharHeight();
+    m_defaultRowHeight = 0; // this will be initialized after creation
 
-#if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
-    m_defaultRowHeight += 8;
-#else
-    m_defaultRowHeight += 4;
-#endif
+    m_minAcceptableColWidth  = WXGRID_MIN_COL_WIDTH;
+    m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT;
 
     m_gridLineColour = wxColour( 192,192,192 );
-    m_gridLinesEnabled = TRUE;
+    m_gridLinesEnabled = true;
+    m_gridLinesClipHorz =
+    m_gridLinesClipVert = true;
     m_cellHighlightColour = *wxBLACK;
     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 
+    m_canDragColMove = false;
+
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
-    m_winCapture = (wxWindow *)NULL;
-    m_canDragRowSize = TRUE;
-    m_canDragColSize = TRUE;
-    m_canDragGridSize = TRUE;
+    m_winCapture = NULL;
+    m_canDragRowSize = true;
+    m_canDragColSize = true;
+    m_canDragGridSize = true;
+    m_canDragCell = false;
     m_dragLastPos  = -1;
     m_dragRowOrCol = -1;
-    m_isDragging = FALSE;
+    m_isDragging = false;
     m_startDragPos = wxDefaultPosition;
 
-    m_waitForSlowClick = FALSE;
+    m_sortCol = wxNOT_FOUND;
+    m_sortIsAscending = true;
+
+    m_useNativeHeader =
+    m_nativeColumnLabels = false;
+
+    m_waitForSlowClick = false;
 
     m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
     m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
 
     m_currentCellCoords = wxGridNoCellCoords;
 
-    m_selectingTopLeft = wxGridNoCellCoords;
-    m_selectingBottomRight = wxGridNoCellCoords;
-//  m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
-//  m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-    m_selectionBackground = *wxBLACK; 
-    m_selectionForeground = *wxWHITE; 
+    m_selectedBlockTopLeft =
+    m_selectedBlockBottomRight =
+    m_selectedBlockCorner = wxGridNoCellCoords;
+
+    m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 
-    m_editable = TRUE;  // default for whole grid
+    m_editable = true;  // default for whole grid
 
-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;
     m_batchCount = 0;
 
     m_extraWidth =
     m_extraHeight = 0;
+
+    // we can't call SetScrollRate() as the window isn't created yet but OTOH
+    // we don't need to call it neither as the scroll position is (0, 0) right
+    // now anyhow, so just set the parameters directly
+    m_xScrollPixelsPerLine = GRID_SCROLL_LINE_X;
+    m_yScrollPixelsPerLine = GRID_SCROLL_LINE_Y;
 }
 
 // ----------------------------------------------------------------------------
@@ -4009,8 +2263,9 @@ void wxGrid::Init()
 // 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()
@@ -4021,11 +2276,10 @@ void wxGrid::InitRowHeights()
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 
-    int rowBottom = 0;
-
     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 );
@@ -4039,13 +2293,12 @@ void wxGrid::InitColWidths()
 
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );
-    int colRight = 0;
 
     m_colWidths.Add( m_defaultColWidth, m_numCols );
 
-    for ( int i = 0;  i < m_numCols;  i++ )
+    for ( int i = 0; i < m_numCols; i++ )
     {
-        colRight += m_defaultColWidth;
+        int colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
         m_colRights.Add( colRight );
     }
 }
@@ -4057,13 +2310,13 @@ int wxGrid::GetColWidth(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
 {
-    return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+    return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth
                                  : m_colRights[col];
 }
 
@@ -4086,126 +2339,115 @@ int wxGrid::GetRowBottom(int row) const
 
 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
-    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
     int x, y;
     GetViewStart( &x, &y );
 
-    // maybe we don't need scrollbars at all?
-    //
-    // also adjust the position to be valid for the new scroll rangs
-    if ( w <= cw )
-    {
-        w = x = 0;
-    }
-    else
-    {
-        if ( x >= w )
-            x = w - 1;
-    }
-
-    if ( h <= ch )
-    {
-        h = y = 0;
-    }
-    else
-    {
-        if ( y >= h )
-            y = h - 1;
-    }
+    // ensure the position is valid for the new scroll ranges
+    if ( x >= w )
+        x = wxMax( w - 1, 0 );
+    if ( y >= h )
+        y = wxMax( h - 1, 0 );
 
-    // do set scrollbar parameters
-    SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
-                   GetScrollX(w), GetScrollY(h), x, y,
-                   GetBatchCount() != 0);
+    // update the virtual size and refresh the scrollbars to reflect it
+    m_gridWin->SetVirtualSize(w, h);
+    Scroll(x, y);
+    AdjustScrollbars();
 
     // if our OnSize() hadn't been called (it would if we have scrollbars), we
     // still must reposition the children
     CalcWindowSizes();
 }
 
+wxSize wxGrid::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+    wxSize sizeGridWin(size);
+    sizeGridWin.x -= m_rowLabelWidth;
+    sizeGridWin.y -= m_colLabelHeight;
+
+    return sizeGridWin;
+}
 
 void wxGrid::CalcWindowSizes()
 {
+    // escape if the window is has not been fully created yet
+
+    if ( m_cornerLabelWin == NULL )
+        return;
+
     int cw, ch;
     GetClientSize( &cw, &ch );
 
-    if ( m_cornerLabelWin->IsShown() )
+    // the grid may be too small to have enough space for the labels yet, don't
+    // size the windows to negative sizes in this case
+    int gw = cw - m_rowLabelWidth;
+    int gh = ch - m_colLabelHeight;
+    if (gw < 0)
+        gw = 0;
+    if (gh < 0)
+        gh = 0;
+
+    if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
-    if ( m_colLabelWin->IsShown() )
-        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+    if ( m_colWindow && m_colWindow->IsShown() )
+        m_colWindow->SetSize( m_rowLabelWidth, 0, gw, m_colLabelHeight );
 
-    if ( m_rowLabelWin->IsShown() )
-        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+    if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
+        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, gh );
 
-    if ( m_gridWin->IsShown() )
-        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+    if ( m_gridWin && m_gridWin->IsShown() )
+        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, gw, gh );
 }
 
-
-// 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 )
 {
     int i;
-    bool result = FALSE;
+    bool result = false;
 
     // Clear the attribute cache as the attribute might refer to a different
     // cell than stored in the cache after adding/removing rows/columns.
     ClearAttrCache();
+
     // By the same reasoning, the editor should be dismissed if columns are
     // added or removed. And for consistency, it should IMHO always be
     // removed, not only if the cell "underneath" it actually changes.
     // For now, I intentionally do not save the editor's content as the
     // cell it might want to save that stuff to might no longer exist.
     HideCellEditControl();
-#if 0
-    // if we were using the default widths/heights so far, we must change them
-    // now
-    if ( m_colWidths.IsEmpty() )
-    {
-        InitColWidths();
-    }
-
-    if ( m_rowHeights.IsEmpty() )
-    {
-        InitRowHeights();
-    }
-#endif
 
     switch ( msg.GetId() )
     {
@@ -4222,14 +2464,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Insert( 0, pos, numRows );
 
                 int bottom = 0;
-                if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+                if ( pos > 0 )
+                    bottom = m_rowBottoms[pos - 1];
 
-                for ( i = pos;  i < m_numRows;  i++ )
+                for ( i = pos; i < m_numRows; i++ )
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4250,7 +2494,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowLabelWin->Refresh();
             }
         }
-        result = TRUE;
+        result = true;
         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
@@ -4265,14 +2509,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.Add( 0, numRows );
 
                 int bottom = 0;
-                if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+                if ( oldNumRows > 0 )
+                    bottom = m_rowBottoms[oldNumRows - 1];
 
-                for ( i = oldNumRows;  i < m_numRows;  i++ )
+                for ( i = oldNumRows; i < m_numRows; i++ )
                 {
                     bottom += m_rowHeights[i];
                     m_rowBottoms[i] = bottom;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4280,13 +2526,14 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 //
                 SetCurrentCell( 0, 0 );
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
                 m_rowLabelWin->Refresh();
             }
         }
-        result = TRUE;
+        result = true;
         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
@@ -4301,12 +2548,13 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowBottoms.RemoveAt( pos, numRows );
 
                 int h = 0;
-                for ( i = 0;  i < m_numRows;  i++ )
+                for ( i = 0; i < m_numRows; i++ )
                 {
                     h += m_rowHeights[i];
                     m_rowBottoms[i] = h;
                 }
             }
+
             if ( !m_numRows )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
@@ -4320,8 +2568,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( m_selection )
                 m_selection->UpdateRows( pos, -((int)numRows) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
-            if (attrProvider) {
+            if (attrProvider)
+            {
                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch column attributes, unless we
@@ -4333,13 +2583,14 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
 #endif
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
                 m_rowLabelWin->Refresh();
             }
         }
-        result = TRUE;
+        result = true;
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
@@ -4348,20 +2599,47 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt2();
             m_numCols += numCols;
 
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_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 ( 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;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4378,11 +2656,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
-                m_colLabelWin->Refresh();
+                m_colWindow->Refresh();
             }
-
         }
-        result = TRUE;
+        result = true;
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
@@ -4390,20 +2667,40 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_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 ( 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;
                 }
             }
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -4414,10 +2711,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
-                m_colLabelWin->Refresh();
+                m_colWindow->Refresh();
             }
         }
-        result = TRUE;
+        result = true;
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_DELETED:
@@ -4425,6 +2722,23 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             size_t pos = msg.GetCommandInt();
             int numCols = msg.GetCommandInt2();
             m_numCols -= numCols;
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_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() )
             {
@@ -4432,12 +2746,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 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;
                 }
             }
+
             if ( !m_numCols )
             {
                 m_currentCellCoords = wxGridNoCellCoords;
@@ -4451,8 +2769,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( m_selection )
                 m_selection->UpdateCols( pos, -((int)numCols) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
-            if (attrProvider) {
+            if (attrProvider)
+            {
                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch row attributes, unless we
@@ -4464,23 +2784,24 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
 #endif
             }
+
             if ( !GetBatchCount() )
             {
                 CalcDimensions();
-                m_colLabelWin->Refresh();
+                m_colWindow->Refresh();
             }
         }
-        result = TRUE;
+        result = true;
         break;
     }
 
     if (result && !GetBatchCount() )
         m_gridWin->Refresh();
+
     return result;
 }
 
-
-wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -4500,7 +2821,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetTop() > ch ) r.SetTop( 0 );
+        if ( r.GetTop() > ch )
+            r.SetTop( 0 );
         r.SetBottom( wxMin( r.GetBottom(), ch ) );
 #endif
 
@@ -4513,7 +2835,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
         // find the row labels within these bounds
         //
         int row;
-        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top); row < m_numRows; row++ )
         {
             if ( GetRowBottom(row) < top )
                 continue;
@@ -4524,14 +2846,13 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
             rowlabels.Add( row );
         }
 
-        iter++ ;
+        ++iter;
     }
 
     return rowlabels;
 }
 
-
-wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -4551,7 +2872,8 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 #if defined(__WXMOTIF__)
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+        if ( r.GetLeft() > cw )
+            r.SetLeft( 0 );
         r.SetRight( wxMin( r.GetRight(), cw ) );
 #endif
 
@@ -4564,8 +2886,11 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
         // 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;
 
@@ -4575,13 +2900,13 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
             colLabels.Add( col );
         }
 
-        iter++ ;
+        ++iter;
     }
+
     return colLabels;
 }
 
-
-wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -4613,9 +2938,8 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
         CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
 
         // find the cells within these bounds
-        //
-        int row, col;
-        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        wxArrayInt cols;
+        for ( int row = internalYToRow(top); row < m_numRows; row++ )
         {
             if ( GetRowBottom(row) <= top )
                 continue;
@@ -4623,19 +2947,26 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
             if ( GetRowTop(row) > bottom )
                 break;
 
-            for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+            // add all dirty cells in this row: notice that the columns which
+            // are dirty don't depend on the row so we compute them only once
+            // for the first dirty row and then reuse for all the next ones
+            if ( cols.empty() )
             {
-                if ( GetColRight(col) <= left )
-                    continue;
+                // do determine the dirty columns
+                for ( int pos = XToPos(left); pos <= XToPos(right); pos++ )
+                    cols.push_back(GetColAt(pos));
 
-                if ( GetColLeft(col) > right )
+                // if there are no dirty columns at all, nothing to do
+                if ( cols.empty() )
                     break;
-
-                cellsExposed.Add( wxGridCellCoords( row, col ) );
             }
+
+            const size_t count = cols.size();
+            for ( size_t n = 0; n < count; n++ )
+                cellsExposed.Add(wxGridCellCoords(row, cols[n]));
         }
 
-        iter++;
+        ++iter;
     }
 
     return cellsExposed;
@@ -4652,13 +2983,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     {
         if (!m_isDragging)
         {
-            m_isDragging = TRUE;
+            m_isDragging = true;
             m_rowLabelWin->CaptureMouse();
         }
 
         if ( event.LeftIsDown() )
         {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
             {
                 case WXGRID_CURSOR_RESIZE_ROW:
                 {
@@ -4682,17 +3013,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:
+                {
                     if ( (row = YToRow( y )) >= 0 )
                     {
                         if ( m_selection )
-                        {
-                            m_selection->SelectRow( row,
-                                                    event.ControlDown(),
-                                                    event.ShiftDown(),
-                                                    event.AltDown(),
-                                                    event.MetaDown() );
-                        }
+                            m_selection->SelectRow(row, event);
                     }
+                }
+                break;
 
                 // default label to suppress warnings about "enumeration value
                 // 'xxx' not handled in switch
@@ -4708,8 +3036,9 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
-        if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
-        m_isDragging = FALSE;
+        if (m_rowLabelWin->HasCapture())
+            m_rowLabelWin->ReleaseMouse();
+        m_isDragging = false;
     }
 
     // ------------ Entering or leaving the window
@@ -4719,187 +3048,302 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
     }
 
-
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
     {
-        // don't send a label click event for a hit on the
-        // edge of the row label - this is probably the user
-        // wanting to resize the row
-        //
-        if ( YToEdgeOfRow(y) < 0 )
+        row = YToEdgeOfRow(y);
+        if ( row != wxNOT_FOUND && CanDragRowSize(row) )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
+        }
+        else // not a request to start resizing
         {
             row = YToRow(y);
-            if ( row >= 0  &&
+            if ( row >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
-                if ( !event.ShiftDown() && !event.ControlDown() )
+                if ( !event.ShiftDown() && !event.CmdDown() )
                     ClearSelection();
                 if ( m_selection )
                 {
                     if ( event.ShiftDown() )
                     {
-                        m_selection->SelectBlock( m_currentCellCoords.GetRow(),
-                                                  0,
-                                                  row,
-                                                  GetNumberCols() - 1,
-                                                  event.ControlDown(),
-                                                  event.ShiftDown(),
-                                                  event.AltDown(),
-                                                  event.MetaDown() );
+                        m_selection->SelectBlock
+                                     (
+                                        m_currentCellCoords.GetRow(), 0,
+                                        row, GetNumberCols() - 1,
+                                        event
+                                     );
                     }
                     else
                     {
-                        m_selection->SelectRow( row,
-                                                event.ControlDown(),
-                                                event.ShiftDown(),
-                                                event.AltDown(),
-                                                event.MetaDown() );
+                        m_selection->SelectRow(row, event);
                     }
                 }
 
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
             }
         }
-        else
-        {
-            // starting to drag-resize a row
-            //
-            if ( CanDragRowSize() )
-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
-        }
     }
 
-
     // ------------ Left double click
     //
     else if (event.LeftDClick() )
     {
-        if ( YToEdgeOfRow(y) < 0 )
+        row = YToEdgeOfRow(y);
+        if ( row != wxNOT_FOUND && CanDragRowSize(row) )
+        {
+            // adjust row height depending on label text
+            //
+            // TODO: generate RESIZING event, see #10754
+            AutoSizeRowLabelSize( row );
+
+            SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event);
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
+            m_dragLastPos = -1;
+        }
+        else // not on row separator or it's not resizeable
         {
             row = YToRow(y);
-            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+            if ( row >=0 &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+            {
+                // no default action at the moment
+            }
         }
     }
 
-
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     {
         if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
-        {
-            DoEndDragResizeRow();
-
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
-        }
+            DoEndDragResizeRow(event);
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
         m_dragLastPos = -1;
     }
 
-
     // ------------ Right button down
     //
     else if ( event.RightDown() )
     {
         row = YToRow(y);
-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+        if ( row >=0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
         {
             // no default action at the moment
         }
     }
 
-
     // ------------ Right double click
     //
     else if ( event.RightDClick() )
     {
         row = YToRow(y);
-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+        if ( row >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
         {
             // no default action at the moment
         }
     }
 
-
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
     {
         m_dragRowOrCol = YToEdgeOfRow( y );
-        if ( m_dragRowOrCol >= 0 )
+        if ( m_dragRowOrCol != wxNOT_FOUND )
         {
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
-                // don't capture the mouse yet
-                if ( CanDragRowSize() )
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+                if ( CanDragRowSize(m_dragRowOrCol) )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false);
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE);
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false);
+        }
+    }
+}
+
+void wxGrid::UpdateColumnSortingIndicator(int col)
+{
+    wxCHECK_RET( col != wxNOT_FOUND, "invalid column index" );
+
+    if ( m_useNativeHeader )
+        GetGridColHeader()->UpdateColumn(col);
+    else if ( m_nativeColumnLabels )
+        m_colWindow->Refresh();
+    //else: sorting indicator display not yet implemented in grid version
+}
+
+void wxGrid::SetSortingColumn(int col, bool ascending)
+{
+    if ( col == m_sortCol )
+    {
+        // we are already using this column for sorting (or not sorting at all)
+        // but we might still change the sorting order, check for it
+        if ( m_sortCol != wxNOT_FOUND && ascending != m_sortIsAscending )
+        {
+            m_sortIsAscending = ascending;
+
+            UpdateColumnSortingIndicator(m_sortCol);
+        }
+    }
+    else // we're changing the column used for sorting
+    {
+        const int sortColOld = m_sortCol;
+
+        // change it before updating the column as we want GetSortingColumn()
+        // to return the correct new value
+        m_sortCol = col;
+
+        if ( sortColOld != wxNOT_FOUND )
+            UpdateColumnSortingIndicator(sortColOld);
+
+        if ( m_sortCol != wxNOT_FOUND )
+        {
+            m_sortIsAscending = ascending;
+            UpdateColumnSortingIndicator(m_sortCol);
         }
     }
 }
 
+void wxGrid::DoColHeaderClick(int col)
+{
+    // we consider that the grid was resorted if this event is processed and
+    // not vetoed
+    if ( SendEvent(wxEVT_GRID_COL_SORT, -1, col) == 1 )
+    {
+        SetSortingColumn(col, IsSortingBy(col) ? !m_sortIsAscending : true);
+        Refresh();
+    }
+}
+
+void wxGrid::DoStartResizeCol(int col)
+{
+    m_dragRowOrCol = col;
+    m_dragLastPos = -1;
+    DoUpdateResizeColWidth(GetColWidth(m_dragRowOrCol));
+}
+
+void wxGrid::DoUpdateResizeCol(int x)
+{
+    int cw, ch, dummy, top;
+    m_gridWin->GetClientSize( &cw, &ch );
+    CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );
+
+    x = wxMax( x, GetColLeft(m_dragRowOrCol) + GetColMinimalWidth(m_dragRowOrCol));
+    dc.SetLogicalFunction(wxINVERT);
+    if ( m_dragLastPos >= 0 )
+    {
+        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
+    }
+    dc.DrawLine( x, top, x, top + ch );
+    m_dragLastPos = x;
+}
+
+void wxGrid::DoUpdateResizeColWidth(int w)
+{
+    DoUpdateResizeCol(GetColLeft(m_dragRowOrCol) + w);
+}
 
 void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 {
-    int x, y, col;
+    int x, y;
     wxPoint pos( event.GetPosition() );
     CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
 
+    int col = XToCol(x);
     if ( event.Dragging() )
     {
         if (!m_isDragging)
         {
-            m_isDragging = TRUE;
-            m_colLabelWin->CaptureMouse();
+            m_isDragging = true;
+            GetColLabelWindow()->CaptureMouse();
+
+            if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
+                DoStartMoveCol(col);
         }
 
         if ( event.LeftIsDown() )
         {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
             {
                 case WXGRID_CURSOR_RESIZE_COL:
-                {
-                    int cw, ch, dummy, top;
-                    m_gridWin->GetClientSize( &cw, &ch );
-                    CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
-                    wxClientDC dc( m_gridWin );
-                    PrepareDC( dc );
+                DoUpdateResizeCol(x);
+                break;
 
-                    x = wxMax( x, GetColLeft(m_dragRowOrCol) +
-                                  GetColMinimalWidth(m_dragRowOrCol));
-                    dc.SetLogicalFunction(wxINVERT);
-                    if ( m_dragLastPos >= 0 )
+                case WXGRID_CURSOR_SELECT_COL:
+                {
+                    if ( col != -1 )
                     {
-                        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+                        if ( m_selection )
+                            m_selection->SelectCol(col, event);
                     }
-                    dc.DrawLine( x, top, x, top+ch );
-                    m_dragLastPos = x;
                 }
                 break;
 
-                case WXGRID_CURSOR_SELECT_COL:
-                    if ( (col = XToCol( x )) >= 0 )
+                case WXGRID_CURSOR_MOVE_COL:
+                {
+                    int posNew = XToPos(x);
+                    int colNew = GetColAt(posNew);
+
+                    // determine the position of the drop marker
+                    int markerX;
+                    if ( x >= GetColLeft(colNew) + (GetColWidth(colNew) / 2) )
+                        markerX = GetColRight(colNew);
+                    else
+                        markerX = GetColLeft(colNew);
+
+                    if ( markerX != m_dragLastPos )
                     {
-                        if ( m_selection )
+                        wxClientDC dc( GetColLabelWindow() );
+                        DoPrepareDC(dc);
+
+                        int cw, ch;
+                        GetColLabelWindow()->GetClientSize( &cw, &ch );
+
+                        markerX++;
+
+                        //Clean up the last indicator
+                        if ( m_dragLastPos >= 0 )
                         {
-                            m_selection->SelectCol( col,
-                                                    event.ControlDown(),
-                                                    event.ShiftDown(),
-                                                    event.AltDown(),
-                                                    event.MetaDown() );
+                            wxPen pen( GetColLabelWindow()->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 ) );
                         }
+
+                        const wxColour *color;
+                        //Moving to the same place? Don't draw a marker
+                        if ( colNew == m_dragRowOrCol )
+                            color = wxLIGHT_GREY;
+                        else
+                            color = wxBLUE;
+
+                        //Draw the marker
+                        wxPen pen( *color, 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
@@ -4915,124 +3359,185 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
     if (m_isDragging)
     {
-        if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
-        m_isDragging = FALSE;
+        if (GetColLabelWindow()->HasCapture())
+            GetColLabelWindow()->ReleaseMouse();
+        m_isDragging = false;
     }
 
     // ------------ Entering or leaving the window
     //
     if ( event.Entering() || event.Leaving() )
     {
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
     }
 
-
     // ------------ Left button pressed
     //
     else if ( event.LeftDown() )
     {
-        // don't send a label click event for a hit on the
-        // edge of the col label - this is probably the user
-        // wanting to resize the col
-        //
-        if ( XToEdgeOfCol(x) < 0 )
+        int col = XToEdgeOfCol(x);
+        if ( col != wxNOT_FOUND && CanDragColSize(col) )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow());
+        }
+        else // not a request to start resizing
         {
             col = XToCol(x);
-            if ( col >= 0  &&
+            if ( col >= 0 &&
                  !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( GetColLabelWindow() );
+                    int colLeft = GetColLeft( col );
+                    int colRight = GetColRight( col ) - 1;
+                    dc.SetPen( wxPen( GetColLabelWindow()->GetBackgroundColour(), 1 ) );
+                    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+                    dc.DrawLine( colLeft, 1, colRight, 1 );
+
+                    ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, GetColLabelWindow());
+                }
+                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
+                                         );
+                        }
+                        else
+                        {
+                            m_selection->SelectCol(col, event);
+                        }
                     }
-                }
 
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+                    ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, GetColLabelWindow());
+                }
             }
         }
-        else
-        {
-            // starting to drag-resize a col
-            //
-            if ( CanDragColSize() )
-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
-        }
     }
 
-
     // ------------ Left double click
     //
     if ( event.LeftDClick() )
     {
-        if ( XToEdgeOfCol(x) < 0 )
+        const int colEdge = XToEdgeOfCol(x);
+        if ( colEdge == -1 )
         {
-            col = XToCol(x);
-            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
+            if ( col >= 0 &&
+                 ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
+            {
+                // no default action at the moment
+            }
         }
-    }
+        else
+        {
+            // adjust column width depending on label text
+            //
+            // TODO: generate RESIZING event, see #10754
+            AutoSizeColLabelSize( colEdge );
 
+            SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event);
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
+            m_dragLastPos = -1;
+        }
+    }
 
     // ------------ Left button released
     //
     else if ( event.LeftUp() )
     {
-        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        switch ( m_cursorMode )
         {
-            DoEndDragResizeCol();
+            case WXGRID_CURSOR_RESIZE_COL:
+                DoEndDragResizeCol(event);
+                break;
 
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+            case WXGRID_CURSOR_MOVE_COL:
+                if ( m_dragLastPos == -1 || col == m_dragRowOrCol )
+                {
+                    // the column didn't actually move anywhere
+                    if ( col != -1 )
+                        DoColHeaderClick(col);
+                    m_colWindow->Refresh();   // "unpress" the column
+                }
+                else
+                {
+                    // get the position of the column we're over
+                    int pos = XToPos(x);
+
+                    // we may need to adjust the drop position but don't bother
+                    // checking for it if we can't anyhow
+                    if ( pos > 1 )
+                    {
+                        // also find the index of the column we're over: notice
+                        // that the existing "col" variable may be invalid but
+                        // we need a valid one here
+                        const int colValid = GetColAt(pos);
+
+                        // if we're on the "near" (usually left but right in
+                        // RTL case) part of the column, the actual position we
+                        // should be placed in is actually the one before it
+                        bool onNearPart;
+                        const int middle = GetColLeft(colValid) +
+                                                GetColWidth(colValid)/2;
+                        if ( GetLayoutDirection() == wxLayout_LeftToRight )
+                            onNearPart = (x <= middle);
+                        else // wxLayout_RightToLeft
+                            onNearPart = (x > middle);
+
+                        if ( onNearPart )
+                            pos--;
+                    }
+
+                    DoEndMoveCol(pos);
+                }
+                break;
+
+            case WXGRID_CURSOR_SELECT_COL:
+            case WXGRID_CURSOR_SELECT_CELL:
+            case WXGRID_CURSOR_RESIZE_ROW:
+            case WXGRID_CURSOR_SELECT_ROW:
+                if ( col != -1 )
+                    DoColHeaderClick(col);
+                break;
         }
 
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
-        m_dragLastPos  = -1;
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
+        m_dragLastPos = -1;
     }
 
-
     // ------------ Right button down
     //
     else if ( event.RightDown() )
     {
-        col = XToCol(x);
-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
         {
             // no default action at the moment
         }
     }
 
-
     // ------------ Right double click
     //
     else if ( event.RightDClick() )
     {
-        col = XToCol(x);
-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
         {
             // no default action at the moment
         }
     }
 
-
     // ------------ No buttons down and mouse moving
     //
     else if ( event.Moving() )
@@ -5042,19 +3547,17 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         {
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
-                // don't capture the cursor yet
-                if ( CanDragColSize() )
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+                if ( CanDragColSize(m_dragRowOrCol) )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow(), false);
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE);
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow(), false);
         }
     }
 }
 
-
 void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
 {
     if ( event.LeftDown() )
@@ -5067,12 +3570,10 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             SelectAll();
         }
     }
-
     else if ( event.LeftDClick() )
     {
         SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
     }
-
     else if ( event.RightDown() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
@@ -5080,7 +3581,6 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
             // no default action at the moment
         }
     }
-
     else if ( event.RightDClick() )
     {
         if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
@@ -5090,27 +3590,45 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
+void wxGrid::CancelMouseCapture()
+{
+    // cancel operation currently in progress, whatever it is
+    if ( m_winCapture )
+    {
+        m_isDragging = false;
+        m_startDragPos = wxDefaultPosition;
+
+        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)
 {
-#ifdef __WXDEBUG__
-    static const wxChar *cursorModes[] =
+#if wxUSE_LOG_TRACE
+    static const wxChar *const cursorModes[] =
     {
-        _T("SELECT_CELL"),
-        _T("RESIZE_ROW"),
-        _T("RESIZE_COL"),
-        _T("SELECT_ROW"),
-        _T("SELECT_COL")
+        wxT("SELECT_CELL"),
+        wxT("RESIZE_ROW"),
+        wxT("RESIZE_COL"),
+        wxT("SELECT_ROW"),
+        wxT("SELECT_COL"),
+        wxT("MOVE_COL"),
     };
 
-    wxLogTrace(_T("grid"),
-               _T("wxGrid cursor mode (mouse capture for %s): %s -> %s"),
-               win == m_colLabelWin ? _T("colLabelWin")
-                                    : win ? _T("rowLabelWin")
-                                          : _T("gridWin"),
+    wxLogTrace(wxT("grid"),
+               wxT("wxGrid cursor mode (mouse capture for %s): %s -> %s"),
+               win == m_colWindow ? wxT("colLabelWin")
+                                  : win ? wxT("rowLabelWin")
+                                        : wxT("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);
-#endif // __WXDEBUG__
+#endif // wxUSE_LOG_TRACE
 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&
@@ -5125,8 +3643,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
 
     if ( m_winCapture )
     {
-        if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
-        m_winCapture = (wxWindow *)NULL;
+        m_winCapture->ReleaseMouse();
+        m_winCapture = NULL;
     }
 
     m_cursorMode = mode;
@@ -5141,522 +3659,623 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
             win->SetCursor( m_colResizeCursor );
             break;
 
+        case WXGRID_CURSOR_MOVE_COL:
+            win->SetCursor( wxCursor(wxCURSOR_HAND) );
+            break;
+
         default:
             win->SetCursor( *wxSTANDARD_CURSOR );
+            break;
     }
 
     // we need to capture mouse when resizing
     bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ||
                   m_cursorMode == WXGRID_CURSOR_RESIZE_COL;
 
-    if ( captureMouse && resize )
+    if ( captureMouse && resize )
+    {
+        win->CaptureMouse();
+        m_winCapture = win;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// grid mouse event processing
+// ----------------------------------------------------------------------------
+
+void
+wxGrid::DoGridCellDrag(wxMouseEvent& event,
+                       const wxGridCellCoords& coords,
+                       bool isFirstDrag)
+{
+    if ( coords == wxGridNoCellCoords )
+        return; // we're outside any valid cell
+
+    // Hide the edit control, so it won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
+    {
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
+
+    switch ( event.GetModifiers() )
+    {
+        case wxMOD_CMD:
+            if ( m_selectedBlockCorner == wxGridNoCellCoords)
+                m_selectedBlockCorner = coords;
+            UpdateBlockBeingSelected(m_selectedBlockCorner, coords);
+            break;
+
+        case wxMOD_NONE:
+            if ( CanDragCell() )
+            {
+                if ( isFirstDrag )
+                {
+                    if ( m_selectedBlockCorner == wxGridNoCellCoords)
+                        m_selectedBlockCorner = coords;
+
+                    SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event);
+                    return;
+                }
+            }
+
+            UpdateBlockBeingSelected(m_currentCellCoords, coords);
+            break;
+
+        default:
+            // we don't handle the other key modifiers
+            event.Skip();
+    }
+}
+
+void wxGrid::DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper)
+{
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
+    dc.SetLogicalFunction(wxINVERT);
+
+    const wxRect rectWin(CalcUnscrolledPosition(wxPoint(0, 0)),
+                         m_gridWin->GetClientSize());
+
+    // erase the previously drawn line, if any
+    if ( m_dragLastPos >= 0 )
+        oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos);
+
+    // we need the vertical position for rows and horizontal for columns here
+    m_dragLastPos = oper.Dual().Select(CalcUnscrolledPosition(event.GetPosition()));
+
+    // don't allow resizing beneath the minimal size
+    const int posMin = oper.GetLineStartPos(this, m_dragRowOrCol) +
+                        oper.GetMinimalLineSize(this, m_dragRowOrCol);
+    if ( m_dragLastPos < posMin )
+        m_dragLastPos = posMin;
+
+    // and draw it at the new position
+    oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos);
+}
+
+void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords)
+{
+    if ( !m_isDragging )
+    {
+        // Don't start doing anything until the mouse has been dragged far
+        // enough
+        const wxPoint& pt = event.GetPosition();
+        if ( m_startDragPos == wxDefaultPosition )
+        {
+            m_startDragPos = pt;
+            return;
+        }
+
+        if ( abs(m_startDragPos.x - pt.x) <= DRAG_SENSITIVITY &&
+                abs(m_startDragPos.y - pt.y) <= DRAG_SENSITIVITY )
+            return;
+    }
+
+    const bool isFirstDrag = !m_isDragging;
+    m_isDragging = true;
+
+    switch ( m_cursorMode )
+    {
+        case WXGRID_CURSOR_SELECT_CELL:
+            DoGridCellDrag(event, coords, isFirstDrag);
+            break;
+
+        case WXGRID_CURSOR_RESIZE_ROW:
+            DoGridLineDrag(event, wxGridRowOperations());
+            break;
+
+        case WXGRID_CURSOR_RESIZE_COL:
+            DoGridLineDrag(event, wxGridColumnOperations());
+            break;
+
+        default:
+            event.Skip();
+    }
+
+    if ( isFirstDrag )
     {
-        win->CaptureMouse();
-        m_winCapture = win;
+        wxASSERT_MSG( !m_winCapture, "shouldn't capture the mouse twice" );
+
+        m_winCapture = m_gridWin;
+        m_winCapture->CaptureMouse();
     }
 }
 
-void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
+void
+wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                           const wxGridCellCoords& coords,
+                           const wxPoint& pos)
 {
-    int x, y;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
-
-    wxGridCellCoords coords;
-    XYToCell( x, y, coords );
-
-    int cell_rows, cell_cols;
-    GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
-    if ((cell_rows < 0) || (cell_cols < 0))
+    if ( SendEvent(wxEVT_GRID_CELL_LEFT_CLICK, coords, event) )
     {
-        coords.SetRow(coords.GetRow() + cell_rows);
-        coords.SetCol(coords.GetCol() + cell_cols);
+        // event handled by user code, no need to do anything here
+        return;
     }
 
-    if ( event.Dragging() )
-    {
-        //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
+    if ( !event.CmdDown() )
+        ClearSelection();
 
-        // Don't start doing anything until the mouse has been drug at
-        // least 3 pixels in any direction...
-        if (! m_isDragging)
+    if ( event.ShiftDown() )
+    {
+        if ( m_selection )
         {
-            if (m_startDragPos == wxDefaultPosition)
-            {
-                m_startDragPos = pos;
-                return;
-            }
-            if (abs(m_startDragPos.x - pos.x) < 4 && abs(m_startDragPos.y - pos.y) < 4)
-                return;
+            m_selection->SelectBlock(m_currentCellCoords, coords, event);
+            m_selectedBlockCorner = coords;
         }
+    }
+    else if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 )
+    {
+        DisableCellEditControl();
+        MakeCellVisible( coords );
 
-        m_isDragging = TRUE;
-        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+        if ( event.CmdDown() )
         {
-            // Hide the edit control, so it
-            // won't interfer with drag-shrinking.
-            if ( IsCellEditControlShown() )
-            {
-                HideCellEditControl();
-                SaveEditControlValue();
-            }
-
-            // Have we captured the mouse yet?
-            if (! m_winCapture)
+            if ( m_selection )
             {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
+                m_selection->ToggleCellSelection(coords, event);
             }
 
-            if ( coords != wxGridNoCellCoords )
+            m_selectedBlockTopLeft = wxGridNoCellCoords;
+            m_selectedBlockBottomRight = wxGridNoCellCoords;
+            m_selectedBlockCorner = coords;
+        }
+        else
+        {
+            if ( m_selection )
             {
-                if ( event.ControlDown() )
-                {
-                    if ( m_selectingKeyboard == wxGridNoCellCoords)
-                        m_selectingKeyboard = coords;
-                    HighlightBlock ( m_selectingKeyboard, coords );
-                }
-                else
+                // In row or column selection mode just clicking on the cell
+                // should select the row or column containing it: this is more
+                // convenient for the kinds of controls that use such selection
+                // mode and is compatible with 2.8 behaviour (see #12062).
+                switch ( m_selection->GetSelectionMode() )
                 {
-                    if ( !IsSelection() )
-                    {
-                        HighlightBlock( coords, coords );
-                    }
-                    else
-                    {
-                        HighlightBlock( m_currentCellCoords, coords );
-                    }
-                }
+                    case wxGridSelectCells:
+                    case wxGridSelectRowsOrColumns:
+                        // nothing to do in these cases
+                        break;
 
-                if (! IsVisible(coords))
-                {
-                    MakeCellVisible(coords);
-                    // TODO: need to introduce a delay or something here.  The
-                    // scrolling is way to fast, at least on MSW - also on GTK.
+                    case wxGridSelectRows:
+                        m_selection->SelectRow(coords.GetRow());
+                        break;
+
+                    case wxGridSelectColumns:
+                        m_selection->SelectCol(coords.GetCol());
+                        break;
                 }
             }
+
+            m_waitForSlowClick = m_currentCellCoords == coords &&
+                                        coords != wxGridNoCellCoords;
+            SetCurrentCell( coords );
         }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+    }
+}
+
+void
+wxGrid::DoGridCellLeftDClick(wxMouseEvent& event,
+                             const wxGridCellCoords& coords,
+                             const wxPoint& pos)
+{
+    if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 )
+    {
+        if ( !SendEvent(wxEVT_GRID_CELL_LEFT_DCLICK, coords, event) )
         {
-            int cw, ch, left, dummy;
-            m_gridWin->GetClientSize( &cw, &ch );
-            CalcUnscrolledPosition( 0, 0, &left, &dummy );
+            // we want double click to select a cell and start editing
+            // (i.e. to behave in same way as sequence of two slow clicks):
+            m_waitForSlowClick = true;
+        }
+    }
+}
 
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            y = wxMax( y, GetRowTop(m_dragRowOrCol) +
-                          GetRowMinimalHeight(m_dragRowOrCol) );
-            dc.SetLogicalFunction(wxINVERT);
-            if ( m_dragLastPos >= 0 )
-            {
-                dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
-            }
-            dc.DrawLine( left, y, left+cw, y );
-            m_dragLastPos = y;
+void
+wxGrid::DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords)
+{
+    if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+    {
+        if (m_winCapture)
+        {
+            m_winCapture->ReleaseMouse();
+            m_winCapture = NULL;
         }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+
+        if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
         {
-            int cw, ch, dummy, top;
-            m_gridWin->GetClientSize( &cw, &ch );
-            CalcUnscrolledPosition( 0, 0, &dummy, &top );
+            ClearSelection();
+            EnableCellEditControl();
 
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            x = wxMax( x, GetColLeft(m_dragRowOrCol) +
-                          GetColMinimalWidth(m_dragRowOrCol) );
-            dc.SetLogicalFunction(wxINVERT);
-            if ( m_dragLastPos >= 0 )
+            wxGridCellAttr *attr = GetCellAttr(coords);
+            wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+            editor->StartingClick();
+            editor->DecRef();
+            attr->DecRef();
+
+            m_waitForSlowClick = false;
+        }
+        else if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+             m_selectedBlockBottomRight != wxGridNoCellCoords )
+        {
+            if ( m_selection )
             {
-                dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+                m_selection->SelectBlock( m_selectedBlockTopLeft,
+                                          m_selectedBlockBottomRight,
+                                          event );
             }
-            dc.DrawLine( x, top, x, top+ch );
-            m_dragLastPos = x;
-        }
-
-        return;
-    }
 
-    m_isDragging = FALSE;
-    m_startDragPos = wxDefaultPosition;
+            m_selectedBlockTopLeft = wxGridNoCellCoords;
+            m_selectedBlockBottomRight = wxGridNoCellCoords;
 
-    // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
-    //     immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
-    //     wxGTK
-#if 0
-    if ( event.Entering() || event.Leaving() )
+            // Show the edit control, if it has been hidden for
+            // drag-shrinking.
+            ShowCellEditControl();
+        }
+    }
+    else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
     {
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-        m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+        DoEndDragResizeRow(event);
     }
-    else
-#endif // 0
-
-    // ------------ Left button pressed
-    //
-    if ( event.LeftDown() && coords != wxGridNoCellCoords )
+    else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
     {
-        if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
-                       coords.GetRow(),
-                       coords.GetCol(),
-                       event ) )
-        {
-            if ( !event.ControlDown() )
-                ClearSelection();
-            if ( event.ShiftDown() )
-            {
-                if ( m_selection )
-                {
-                    m_selection->SelectBlock( m_currentCellCoords.GetRow(),
-                                              m_currentCellCoords.GetCol(),
-                                              coords.GetRow(),
-                                              coords.GetCol(),
-                                              event.ControlDown(),
-                                              event.ShiftDown(),
-                                              event.AltDown(),
-                                              event.MetaDown() );
-                }
-            }
-            else if ( XToEdgeOfCol(x) < 0  &&
-                      YToEdgeOfRow(y) < 0 )
-            {
-                DisableCellEditControl();
-                MakeCellVisible( coords );
-
-                if ( event.ControlDown() )
-                {
-                    if ( m_selection )
-                    {
-                        m_selection->ToggleCellSelection( coords.GetRow(),
-                                                          coords.GetCol(),
-                                                          event.ControlDown(),
-                                                          event.ShiftDown(),
-                                                          event.AltDown(),
-                                                          event.MetaDown() );
-                    }
-                    m_selectingTopLeft = wxGridNoCellCoords;
-                    m_selectingBottomRight = wxGridNoCellCoords;
-                    m_selectingKeyboard = coords;
-                }
-                else
-                {
-                    m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
-                    SetCurrentCell( coords );
-                    if ( m_selection )
-                    {
-                        if ( m_selection->GetSelectionMode() !=
-                                wxGrid::wxGridSelectCells )
-                        {
-                            HighlightBlock( coords, coords );
-                        }
-                    }
-                }
-            }
-        }
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        DoEndDragResizeCol(event);
     }
 
+    m_dragLastPos = -1;
+}
 
-    // ------------ Left double click
-    //
-    else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+void
+wxGrid::DoGridMouseMoveEvent(wxMouseEvent& WXUNUSED(event),
+                             const wxGridCellCoords& coords,
+                             const wxPoint& pos)
+{
+    if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
     {
-        DisableCellEditControl();
-
-        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
-        {
-            SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
-                       coords.GetRow(),
-                       coords.GetCol(),
-                       event );
-        }
+        // out of grid cell area
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        return;
     }
 
+    int dragRow = YToEdgeOfRow( pos.y );
+    int dragCol = XToEdgeOfCol( pos.x );
 
-    // ------------ Left button released
+    // Dragging on the corner of a cell to resize in both
+    // directions is not implemented yet...
     //
-    else if ( event.LeftUp() )
+    if ( dragRow >= 0 && dragCol >= 0 )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        return;
+    }
+
+    if ( dragRow >= 0 && CanDragGridSize() && CanDragRowSize(dragRow) )
     {
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
-            if ( m_selectingTopLeft != wxGridNoCellCoords &&
-                 m_selectingBottomRight != wxGridNoCellCoords )
-            {
-                if (m_winCapture)
-                {
-                    if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
-                    m_winCapture = NULL;
-                }
-
-                if ( m_selection )
-                {
-                    m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
-                                              m_selectingTopLeft.GetCol(),
-                                              m_selectingBottomRight.GetRow(),
-                                              m_selectingBottomRight.GetCol(),
-                                              event.ControlDown(),
-                                              event.ShiftDown(),
-                                              event.AltDown(),
-                                              event.MetaDown() );
-                }
-
-                m_selectingTopLeft = wxGridNoCellCoords;
-                m_selectingBottomRight = wxGridNoCellCoords;
-
-                // Show the edit control, if it has been hidden for
-                // drag-shrinking.
-                ShowCellEditControl();
-            }
-            else
-            {
-              if( m_waitForSlowClick && CanEnableCellControl())
-              {
-                EnableCellEditControl();
-
-                wxGridCellAttr* attr = GetCellAttr(coords);
-                wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
-                editor->StartingClick();
-                editor->DecRef();
-                attr->DecRef();
-
-                m_waitForSlowClick = FALSE;
-              }
-            }
+            m_dragRowOrCol = dragRow;
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);
         }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+    }
+    // When using the native header window we can only resize the columns by
+    // dragging the dividers in it because we can't make it enter into the
+    // column resizing mode programmatically
+    else if ( dragCol >= 0 && !m_useNativeHeader &&
+                CanDragGridSize() && CanDragColSize(dragCol) )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            DoEndDragResizeRow();
-
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+            m_dragRowOrCol = dragCol;
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);
         }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+    }
+    else // Neither on a row or col edge
+    {
+        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            DoEndDragResizeCol();
-
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
         }
+    }
+}
 
-        m_dragLastPos = -1;
+void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
+{
+    if ( event.Entering() || event.Leaving() )
+    {
+        // we don't care about these events but we must not reset m_isDragging
+        // if they happen so return before anything else is done
+        event.Skip();
+        return;
     }
 
+    const wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
 
-    // ------------ Right button down
-    //
-    else if ( event.RightDown() && coords != wxGridNoCellCoords )
+    // coordinates of the cell under mouse
+    wxGridCellCoords coords = XYToCell(pos);
+
+    int cell_rows, cell_cols;
+    GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
+    if ( (cell_rows < 0) || (cell_cols < 0) )
     {
-        DisableCellEditControl();
-        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
-                         coords.GetRow(),
-                         coords.GetCol(),
-                         event ) )
-        {
-            // no default action at the moment
-        }
+        coords.SetRow(coords.GetRow() + cell_rows);
+        coords.SetCol(coords.GetCol() + cell_cols);
     }
 
-
-    // ------------ Right double click
-    //
-    else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+    if ( event.Dragging() )
     {
-        DisableCellEditControl();
-        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
-                         coords.GetRow(),
-                         coords.GetCol(),
-                         event ) )
-        {
-            // no default action at the moment
-        }
+        if ( event.LeftIsDown() )
+            DoGridDragEvent(event, coords);
+        else
+            event.Skip();
+        return;
     }
 
-    // ------------ Moving and no button action
-    //
-    else if ( event.Moving() && !event.IsButton() )
+    m_isDragging = false;
+    m_startDragPos = wxDefaultPosition;
+
+    // deal with various button presses
+    if ( event.IsButton() )
     {
-        if( coords.GetRow() < 0 || coords.GetCol() < 0 )
+        if ( coords != wxGridNoCellCoords )
         {
-            // out of grid cell area
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            return;
-        }
+            DisableCellEditControl();
 
-        int dragRow = YToEdgeOfRow( y );
-        int dragCol = XToEdgeOfCol( x );
+            if ( event.LeftDown() )
+                DoGridCellLeftDown(event, coords, pos);
+            else if ( event.LeftDClick() )
+                DoGridCellLeftDClick(event, coords, pos);
+            else if ( event.RightDown() )
+                SendEvent(wxEVT_GRID_CELL_RIGHT_CLICK, coords, event);
+            else if ( event.RightDClick() )
+                SendEvent(wxEVT_GRID_CELL_RIGHT_DCLICK, coords, event);
+        }
 
-        // Dragging on the corner of a cell to resize in both
-        // directions is not implemented yet...
-        //
-        if ( dragRow >= 0  &&  dragCol >= 0 )
+        // this one should be called even if we're not over any cell
+        if ( event.LeftUp() )
         {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            return;
+            DoGridCellLeftUp(event, coords);
         }
+    }
+    else if ( event.Moving() )
+    {
+        DoGridMouseMoveEvent(event, coords, pos);
+    }
+    else // unknown mouse event?
+    {
+        event.Skip();
+    }
+}
 
-        if ( dragRow >= 0 )
-        {
-            m_dragRowOrCol = dragRow;
+// this function returns true only if the size really changed
+bool wxGrid::DoEndDragResizeLine(const wxGridOperations& oper)
+{
+    if ( m_dragLastPos == -1 )
+        return false;
 
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-            {
-                if ( CanDragRowSize() && CanDragGridSize() )
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
-            }
+    const wxGridOperations& doper = oper.Dual();
 
-            if ( dragCol >= 0 )
-            {
-                m_dragRowOrCol = dragCol;
-            }
+    const wxSize size = m_gridWin->GetClientSize();
 
-            return;
-        }
+    const wxPoint ptOrigin = CalcUnscrolledPosition(wxPoint(0, 0));
 
-        if ( dragCol >= 0 )
+    // erase the last line we drew
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
+    dc.SetLogicalFunction(wxINVERT);
+
+    const int posLineStart = oper.Select(ptOrigin);
+    const int posLineEnd = oper.Select(ptOrigin) + oper.Select(size);
+
+    oper.DrawParallelLine(dc, posLineStart, posLineEnd, m_dragLastPos);
+
+    // temporarily hide the edit control before resizing
+    HideCellEditControl();
+    SaveEditControlValue();
+
+    // do resize the line
+    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+    const int lineSizeOld = oper.GetLineSize(this, m_dragRowOrCol);
+    oper.SetLineSize(this, m_dragRowOrCol,
+                     wxMax(m_dragLastPos - lineStart,
+                           oper.GetMinimalLineSize(this, m_dragRowOrCol)));
+    const bool
+        sizeChanged = oper.GetLineSize(this, m_dragRowOrCol) != lineSizeOld;
+
+    m_dragLastPos = -1;
+
+    // refresh now if we're not frozen
+    if ( !GetBatchCount() )
+    {
+        // we need to refresh everything beyond the resized line in the header
+        // window
+
+        // get the position from which to refresh in the other direction
+        wxRect rect(CellToRect(oper.MakeCoords(m_dragRowOrCol, 0)));
+        rect.SetPosition(CalcScrolledPosition(rect.GetPosition()));
+
+        // we only need the ordinate (for rows) or abscissa (for columns) here,
+        // and need to cover the entire window in the other direction
+        oper.Select(rect) = 0;
+
+        wxRect rectHeader(rect.GetPosition(),
+                          oper.MakeSize
+                               (
+                                    oper.GetHeaderWindowSize(this),
+                                    doper.Select(size) - doper.Select(rect)
+                               ));
+
+        oper.GetHeaderWindow(this)->Refresh(true, &rectHeader);
+
+
+        // also refresh the grid window: extend the rectangle
+        if ( m_table )
         {
-            m_dragRowOrCol = dragCol;
+            oper.SelectSize(rect) = oper.Select(size);
 
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            int subtractLines = 0;
+            const int lineStart = doper.PosToLine(this, posLineStart);
+            if ( lineStart >= 0 )
             {
-                if ( CanDragColSize() && CanDragGridSize() )
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
+                // ensure that if we have a multi-cell block we redraw all of
+                // it by increasing the refresh area to cover it entirely if a
+                // part of it is affected
+                const int lineEnd = doper.PosToLine(this, posLineEnd, true);
+                for ( int line = lineStart; line < lineEnd; line++ )
+                {
+                    int cellLines = oper.Select(
+                        GetCellSize(oper.MakeCoords(m_dragRowOrCol, line)));
+                    if ( cellLines < subtractLines )
+                        subtractLines = cellLines;
+                }
             }
 
-            return;
+            int startPos =
+                oper.GetLineStartPos(this, m_dragRowOrCol + subtractLines);
+            startPos = doper.CalcScrolledPosition(this, startPos);
+
+            doper.Select(rect) = startPos;
+            doper.SelectSize(rect) = doper.Select(size) - startPos;
+
+            m_gridWin->Refresh(false, &rect);
         }
+    }
+
+    // show the edit control back again
+    ShowCellEditControl();
+
+    return sizeChanged;
+}
+
+void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event)
+{
+    // TODO: generate RESIZING event, see #10754
+
+    if ( DoEndDragResizeLine(wxGridRowOperations()) )
+        SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event);
+}
 
-        // Neither on a row or col edge
-        //
-        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-        {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-        }
-    }
+void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event)
+{
+    // TODO: generate RESIZING event, see #10754
+
+    if ( DoEndDragResizeLine(wxGridColumnOperations()) )
+        SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event);
 }
 
+void wxGrid::DoStartMoveCol(int col)
+{
+    m_dragRowOrCol = col;
+}
 
-void wxGrid::DoEndDragResizeRow()
+void wxGrid::DoEndMoveCol(int pos)
 {
-    if ( m_dragLastPos >= 0 )
-    {
-        // erase the last line and resize the row
-        //
-        int cw, ch, left, dummy;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &left, &dummy );
+    wxASSERT_MSG( m_dragRowOrCol != -1, "no matching DoStartMoveCol?" );
 
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
-        HideCellEditControl();
-        SaveEditControlValue();
+    if ( SendEvent(wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol) != -1 )
+        SetColPos(m_dragRowOrCol, pos);
+    //else: vetoed by user
 
-        int rowTop = GetRowTop(m_dragRowOrCol);
-        SetRowSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+    m_dragRowOrCol = -1;
+}
 
-        if ( !GetBatchCount() )
+void wxGrid::RefreshAfterColPosChange()
+{
+    // recalculate the column rights as the column positions have changed,
+    // unless we calculate them dynamically because all columns widths are the
+    // same and it's easy to do
+    if ( !m_colWidths.empty() )
+    {
+        int colRight = 0;
+        for ( int colPos = 0; colPos < m_numCols; colPos++ )
         {
-            // Only needed to get the correct rect.y:
-            wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
-            rect.x = 0;
-            CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
-            rect.width = m_rowLabelWidth;
-            rect.height = ch - rect.y;
-            m_rowLabelWin->Refresh( TRUE, &rect );
-            rect.width = cw;
-            // if there is a multicell block, paint all of it
-            if (m_table)
-            {
-                int i, cell_rows, cell_cols, subtract_rows = 0;
-                int leftCol = XToCol(left);
-                int rightCol = XToCol(left+cw);
-                if (leftCol >= 0)
-                {
-                    if (rightCol < 0) rightCol = m_numCols;
-                    for (i=leftCol; i<rightCol; i++)
-                    {
-                        GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
-                        if (cell_rows < subtract_rows)
-                            subtract_rows = cell_rows;
-                    }
-                    rect.y = GetRowTop(m_dragRowOrCol + subtract_rows);
-                    CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
-                    rect.height = ch - rect.y;
-                }
-            }
-            m_gridWin->Refresh( FALSE, &rect );
+            int colID = GetColAt( colPos );
+
+            colRight += m_colWidths[colID];
+            m_colRights[colID] = colRight;
         }
+    }
 
-        ShowCellEditControl();
+    // and make the changes visible
+    if ( m_useNativeHeader )
+    {
+        if ( m_colAt.empty() )
+            GetGridColHeader()->ResetColumnsOrder();
+        else
+            GetGridColHeader()->SetColumnsOrder(m_colAt);
+    }
+    else
+    {
+        m_colWindow->Refresh();
     }
+    m_gridWin->Refresh();
 }
 
+void wxGrid::SetColumnsOrder(const wxArrayInt& order)
+{
+    m_colAt = order;
+
+    RefreshAfterColPosChange();
+}
 
-void wxGrid::DoEndDragResizeCol()
+void wxGrid::SetColPos(int idx, int pos)
 {
-    if ( m_dragLastPos >= 0 )
+    // we're going to need m_colAt now, initialize it if needed
+    if ( m_colAt.empty() )
     {
-        // erase the last line and resize the col
-        //
-        int cw, ch, dummy, top;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &dummy, &top );
+        m_colAt.reserve(m_numCols);
+        for ( int i = 0; i < m_numCols; i++ )
+            m_colAt.push_back(i);
+    }
 
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
-        HideCellEditControl();
-        SaveEditControlValue();
+    wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);
 
-        int colLeft = GetColLeft(m_dragRowOrCol);
-        SetColSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - colLeft,
-                           GetColMinimalWidth(m_dragRowOrCol) ) );
+    RefreshAfterColPosChange();
+}
 
-        if ( !GetBatchCount() )
-        {
-            // Only needed to get the correct rect.x:
-            wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
-            rect.y = 0;
-            CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
-            rect.width = cw - rect.x;
-            rect.height = m_colLabelHeight;
-            m_colLabelWin->Refresh( TRUE, &rect );
-            rect.height = ch;
-            // if there is a multicell block, paint all of it
-            if (m_table)
-            {
-                int i, cell_rows, cell_cols, subtract_cols = 0;
-                int topRow = YToRow(top);
-                int bottomRow = YToRow(top+cw);
-                if (topRow >= 0)
-                {
-                    if (bottomRow < 0) bottomRow = m_numRows;
-                    for (i=topRow; i<bottomRow; i++)
-                    {
-                        GetCellSize(i, m_dragRowOrCol, &cell_rows, &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;
-                }
-            }
-            m_gridWin->Refresh( FALSE, &rect );
-        }
+void wxGrid::ResetColPos()
+{
+    m_colAt.clear();
 
-        ShowCellEditControl();
-    }
+    RefreshAfterColPosChange();
 }
 
+void wxGrid::EnableDragColMove( bool enable )
+{
+    if ( m_canDragColMove == enable )
+        return;
+
+    if ( m_useNativeHeader )
+    {
+        // update all columns to make them [not] reorderable
+        GetGridColHeader()->SetColumnCount(m_numCols);
+    }
+
+    m_canDragColMove = enable;
+
+    // we use to call ResetColPos() from here if !enable but this doesn't seem
+    // right as it would mean there would be no way to "freeze" the current
+    // columns order by disabling moving them after putting them in the desired
+    // order, whereas now you can always call ResetColPos() manually if needed
+}
 
 
 //
@@ -5681,15 +4300,13 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
             return Redimension( msg );
 
         default:
-            return FALSE;
+            return false;
     }
 }
 
-
-
 // The behaviour of this function depends on the grid table class
-// Clear() function.  For the default wxGridStringTable class the
-// behavious is to replace all cell contents with wxEmptyString but
+// Clear() function. For the default wxGridStringTable class the
+// behaviour is to replace all cell contents with wxEmptyString but
 // not to change the number of rows or cols.
 //
 void wxGrid::ClearGrid()
@@ -5700,183 +4317,108 @@ void wxGrid::ClearGrid()
             DisableCellEditControl();
 
         m_table->Clear();
-        if ( !GetBatchCount() ) m_gridWin->Refresh();
+        if (!GetBatchCount())
+            m_gridWin->Refresh();
     }
 }
 
-
-bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+bool
+wxGrid::DoModifyLines(bool (wxGridTableBase::*funcModify)(size_t, size_t),
+                      int pos, int num, bool WXUNUSED(updateLabels) )
 {
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            DisableCellEditControl();
-
-        return m_table->InsertRows( pos, numRows );
-
-        // the table will have sent the results of the insert row
-        // operation to this view object as a grid table message
-    }
-    return FALSE;
-}
+    wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
 
+    if ( !m_table )
+        return false;
 
-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
+    if ( IsCellEditControlEnabled() )
+        DisableCellEditControl();
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
-        return FALSE;
-    }
+    return (m_table->*funcModify)(pos, num);
 
-    return ( m_table && m_table->AppendRows( numRows ) );
-    // the table will have sent the results of the append row
+    // the table will have sent the results of the insert row
     // operation to this view object as a grid table message
 }
 
-
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            DisableCellEditControl();
-
-        return (m_table->DeleteRows( pos, numRows ));
-        // the table will have sent the results of the delete row
-        // operation to this view object as a grid table message
-    }
-    return FALSE;
-}
-
-
-bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            DisableCellEditControl();
-
-        return m_table->InsertCols( pos, numCols );
-        // the table will have sent the results of the insert col
-        // operation to this view object as a grid table message
-    }
-    return FALSE;
-}
-
-
-bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+bool
+wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t),
+                      int num, bool WXUNUSED(updateLabels))
 {
-    // TODO: something with updateLabels flag
+    wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
-        return FALSE;
-    }
+    if ( !m_table )
+        return false;
 
-    return ( m_table && m_table->AppendCols( numCols ) );
-    // the table will have sent the results of the append col
-    // operation to this view object as a grid table message
+    return (m_table->*funcAppend)(num);
 }
 
+// ----------------------------------------------------------------------------
+// event generation helpers
+// ----------------------------------------------------------------------------
 
-bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+void
+wxGrid::SendGridSizeEvent(wxEventType type,
+                      int row, int col,
+                      const wxMouseEvent& mouseEv)
 {
-    // TODO: something with updateLabels flag
+   int rowOrCol = row == -1 ? col : row;
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            DisableCellEditControl();
+   wxGridSizeEvent gridEvt( GetId(),
+           type,
+           this,
+           rowOrCol,
+           mouseEv.GetX() + GetRowLabelSize(),
+           mouseEv.GetY() + GetColLabelSize(),
+           mouseEv);
 
-        return ( m_table->DeleteCols( pos, numCols ) );
-        // the table will have sent the results of the delete col
-        // operation to this view object as a grid table message
-    }
-    return FALSE;
+   GetEventHandler()->ProcessEvent(gridEvt);
 }
 
-
-
-//
-// ----- event handlers
-//
-
-// Generate a grid event based on a mouse event and
-// return the result of ProcessEvent()
-//
-int wxGrid::SendEvent( const wxEventType type,
-                        int row, int col,
-                        wxMouseEvent& mouseEv )
+// Generate a grid event based on a mouse event and return:
+//  -1 if the event was vetoed
+//  +1 if the event was processed (but not vetoed)
+//   0 if the event wasn't handled
+int
+wxGrid::SendEvent(const wxEventType type,
+                  int row, int col,
+                  const wxMouseEvent& mouseEv)
 {
-   bool claimed;
-   bool vetoed= FALSE;
+   bool claimed, vetoed;
 
-   if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
+   if ( type == wxEVT_GRID_RANGE_SELECT )
    {
-       int rowOrCol = (row == -1 ? col : row);
-
-       wxGridSizeEvent gridEvt( GetId(),
+       // Right now, it should _never_ end up here!
+       wxGridRangeSelectEvent gridEvt( GetId(),
                type,
                this,
-               rowOrCol,
-               mouseEv.GetX() + GetRowLabelSize(),
-               mouseEv.GetY() + GetColLabelSize(),
-               mouseEv.ControlDown(),
-               mouseEv.ShiftDown(),
-               mouseEv.AltDown(),
-               mouseEv.MetaDown() );
+               m_selectedBlockTopLeft,
+               m_selectedBlockBottomRight,
+               true,
+               mouseEv);
 
        claimed = GetEventHandler()->ProcessEvent(gridEvt);
        vetoed = !gridEvt.IsAllowed();
    }
-   else if ( type == wxEVT_GRID_RANGE_SELECT )
+   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 )
    {
-       // Right now, it should _never_ end up here!
-       wxGridRangeSelectEvent gridEvt( GetId(),
+       wxPoint pos = mouseEv.GetPosition();
+
+       if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() )
+           pos.y += GetColLabelSize();
+       if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
+           pos.x += GetRowLabelSize();
+
+       wxGridEvent gridEvt( GetId(),
                type,
                this,
-               m_selectingTopLeft,
-               m_selectingBottomRight,
-               TRUE,
-               mouseEv.ControlDown(),
-               mouseEv.ShiftDown(),
-               mouseEv.AltDown(),
-               mouseEv.MetaDown() );
-
+               row, col,
+               pos.x,
+               pos.y,
+               false,
+               mouseEv);
        claimed = GetEventHandler()->ProcessEvent(gridEvt);
        vetoed = !gridEvt.IsAllowed();
    }
@@ -5888,72 +4430,50 @@ int wxGrid::SendEvent( const wxEventType type,
                row, col,
                mouseEv.GetX() + GetRowLabelSize(),
                mouseEv.GetY() + GetColLabelSize(),
-               FALSE,
-               mouseEv.ControlDown(),
-               mouseEv.ShiftDown(),
-               mouseEv.AltDown(),
-               mouseEv.MetaDown() );
+               false,
+               mouseEv);
        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;
 }
 
-
-// Generate a grid event of specified type and return the result
-// of ProcessEvent().
+// Generate a grid event of specified type, return value same as above
 //
-int wxGrid::SendEvent( const wxEventType type,
-                        int row, int col )
+int
+wxGrid::SendEvent(const wxEventType type, int row, int col, const wxString& s)
 {
-   bool claimed;
-   bool vetoed= FALSE;
-
-    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
-
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol );
-
-        claimed = GetEventHandler()->ProcessEvent(gridEvt);
-        vetoed  = !gridEvt.IsAllowed();
-    }
-    else
-    {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col );
+    wxGridEvent gridEvt( GetId(), type, this, row, col );
+    gridEvt.SetString(s);
 
-        claimed = GetEventHandler()->ProcessEvent(gridEvt);
-        vetoed  = !gridEvt.IsAllowed();
-     }
+    const bool claimed = GetEventHandler()->ProcessEvent(gridEvt);
 
     // A Veto'd event may not be `claimed' so test this first
-    if (vetoed) return -1;
+    if ( !gridEvt.IsAllowed() )
+        return -1;
+
     return claimed ? 1 : 0;
 }
 
-
 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)
 {
     // Don't do anything if between Begin/EndBatch...
     // EndBatch() will do all this on the last nested one anyway.
-    if (! GetBatchCount())
+    if ( m_created && !GetBatchCount() )
     {
         // Refresh to get correct scrolled position:
-        wxScrolledWindow::Refresh(eraseb,rect);
+        wxScrolledWindow::Refresh(eraseb, rect);
 
         if (rect)
         {
@@ -5961,17 +4481,19 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
             int width_label, width_cell, height_label, height_cell;
             int x, y;
 
-            //Copy rectangle can get scroll offsets..
+            // Copy rectangle can get scroll offsets..
             rect_x = rect->GetX();
             rect_y = rect->GetY();
             rectWidth = rect->GetWidth();
             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;
-            if (height_label > rectHeight) height_label = rectHeight;
+            if (height_label > rectHeight)
+                height_label = rectHeight;
 
             if (rect_x > m_rowLabelWidth)
             {
@@ -6006,7 +4528,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
             if ( width_cell > 0 && height_label > 0 )
             {
                 wxRect anotherrect(x, rect_y, width_cell, height_label);
-                m_colLabelWin->Refresh(eraseb, &anotherrect);
+                m_colWindow->Refresh(eraseb, &anotherrect);
             }
 
             // Paint row labels part intersecting rect.
@@ -6026,24 +4548,22 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
         else
         {
             m_cornerLabelWin->Refresh(eraseb, NULL);
-            m_colLabelWin->Refresh(eraseb, NULL);
+            m_colWindow->Refresh(eraseb, NULL);
             m_rowLabelWin->Refresh(eraseb, NULL);
             m_gridWin->Refresh(eraseb, NULL);
         }
     }
 }
 
-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();
+    if (m_targetWindow != this) // check whether initialisation has been done
+    {
+        // reposition our children windows
+        CalcWindowSizes();
+    }
 }
 
-
 void wxGrid::OnKeyDown( wxKeyEvent& event )
 {
     if ( m_inOnKeyDown )
@@ -6053,63 +4573,52 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
         wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
     }
 
-    m_inOnKeyDown = TRUE;
+    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 ) )
     {
+        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
-        //
-        switch ( event.KeyCode() )
+        switch ( event.GetKeyCode() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )
-                {
                     MoveCursorUpBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorUp( event.ShiftDown() );
-                }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
-                {
                     MoveCursorDownBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorDown( event.ShiftDown() );
-                }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
-                {
                     MoveCursorLeftBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorLeft( event.ShiftDown() );
-                }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
-                {
                     MoveCursorRightBlock( event.ShiftDown() );
-                }
                 else
-                {
                     MoveCursorRight( event.ShiftDown() );
-                }
                 break;
 
             case WXK_RETURN:
@@ -6127,8 +4636,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                     else
                     {
                         // at the bottom of a column
-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();
                     }
                 }
                 break;
@@ -6142,154 +4650,150 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( GetGridCursorCol() > 0 )
                     {
-                        MoveCursorLeft( FALSE );
+                        MoveCursorLeft( false );
                     }
                     else
                     {
                         // at left of grid
-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();
                     }
                 }
                 else
                 {
-                    if ( GetGridCursorCol() < GetNumberCols()-1 )
+                    if ( GetGridCursorCol() < GetNumberCols() - 1 )
                     {
-                        MoveCursorRight( FALSE );
+                        MoveCursorRight( false );
                     }
                     else
                     {
                         // at right of grid
-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();
                     }
                 }
                 break;
 
             case WXK_HOME:
-                if ( event.ControlDown() )
-                {
-                    MakeCellVisible( 0, 0 );
-                    SetCurrentCell( 0, 0 );
-                }
-                else
-                {
-                    event.Skip();
-                }
+                GoToCell(event.ControlDown() ? 0
+                                             : m_currentCellCoords.GetRow(),
+                         0);
                 break;
 
             case WXK_END:
-                if ( event.ControlDown() )
-                {
-                    MakeCellVisible( m_numRows-1, m_numCols-1 );
-                    SetCurrentCell( m_numRows-1, m_numCols-1 );
-                }
-                else
-                {
-                    event.Skip();
-                }
+                GoToCell(event.ControlDown() ? m_numRows - 1
+                                             : m_currentCellCoords.GetRow(),
+                         m_numCols - 1);
                 break;
 
-            case WXK_PRIOR:
+            case WXK_PAGEUP:
                 MovePageUp();
                 break;
 
-            case WXK_NEXT:
+            case WXK_PAGEDOWN:
                 MovePageDown();
                 break;
 
             case WXK_SPACE:
-                if ( event.ControlDown() )
-                {
-                    if ( m_selection )
-                    {
-                        m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
-                                                          m_currentCellCoords.GetCol(),
-                                                          event.ControlDown(),
-                                                          event.ShiftDown(),
-                                                          event.AltDown(),
-                                                          event.MetaDown() );
-                    }
-                    break;
-                }
-                if ( !IsEditable() )
+                // Ctrl-Space selects the current column, Shift-Space -- the
+                // current row and Ctrl-Shift-Space -- everything
+                switch ( m_selection ? event.GetModifiers() : wxMOD_NONE )
                 {
-                    MoveCursorRight( FALSE );
-                    break;
-                }
-                // Otherwise fall through to default
+                    case wxMOD_CONTROL:
+                        m_selection->SelectCol(m_currentCellCoords.GetCol());
+                        break;
 
-            default:
-                // is it possible to edit the current cell at all?
-                if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
-                {
-                    // 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);
-                    wxGridCellEditor *editor = attr->GetEditor(this, row, col);
-
-                    // <F2> is special and will always start editing, for
-                    // other keys - ask the editor itself
-                    if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
-                         || editor->IsAcceptedKey(event) )
-                    {
-                        // ensure cell is visble
-                        MakeCellVisible(row, col);
-                        EnableCellEditControl();
-
-                        // a problem can arise if the cell is not completely
-                        // visible (even after calling MakeCellVisible the
-                        // control is not created and calling StartingKey will
-                        // crash the app
-                        if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event);
-                    }
-                    else
-                    {
-                        event.Skip();
-                    }
+                    case wxMOD_SHIFT:
+                        m_selection->SelectRow(m_currentCellCoords.GetRow());
+                        break;
 
-                    editor->DecRef();
-                    attr->DecRef();
-                }
-                else
-                {
-                    // let others process char events with modifiers or all
-                    // char events for readonly cells
-                    event.Skip();
+                    case wxMOD_CONTROL | wxMOD_SHIFT:
+                        m_selection->SelectBlock(0, 0,
+                                                 m_numRows - 1, m_numCols - 1);
+                        break;
+
+                    case wxMOD_NONE:
+                        if ( !IsEditable() )
+                        {
+                            MoveCursorRight(false);
+                            break;
+                        }
+                        //else: fall through
+
+                    default:
+                        event.Skip();
                 }
                 break;
+
+            default:
+                event.Skip();
+                break;
         }
     }
 
-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;
 }
 
 void wxGrid::OnKeyUp( wxKeyEvent& event )
 {
     // try local handlers
     //
-    if ( event.KeyCode() == WXK_SHIFT )
+    if ( event.GetKeyCode() == WXK_SHIFT )
     {
-        if ( m_selectingTopLeft != wxGridNoCellCoords &&
-             m_selectingBottomRight != wxGridNoCellCoords )
+        if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+             m_selectedBlockBottomRight != wxGridNoCellCoords )
         {
             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_selectedBlockTopLeft,
+                    m_selectedBlockBottomRight,
+                    event);
             }
         }
 
-        m_selectingTopLeft = wxGridNoCellCoords;
-        m_selectingBottomRight = wxGridNoCellCoords;
-        m_selectingKeyboard = wxGridNoCellCoords;
+        m_selectedBlockTopLeft = wxGridNoCellCoords;
+        m_selectedBlockBottomRight = wxGridNoCellCoords;
+        m_selectedBlockCorner = wxGridNoCellCoords;
+    }
+}
+
+void wxGrid::OnChar( wxKeyEvent& event )
+{
+    // is it possible to edit the current cell at all?
+    if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
+    {
+        // 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);
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+
+        // <F2> is special and will always start editing, for
+        // other keys - ask the editor itself
+        if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers())
+             || editor->IsAcceptedKey(event) )
+        {
+            // ensure cell is visble
+            MakeCellVisible(row, col);
+            EnableCellEditControl();
+
+            // a problem can arise if the cell is not completely
+            // visible (even after calling MakeCellVisible the
+            // control is not created and calling StartingKey will
+            // crash the app
+            if ( event.GetKeyCode() != WXK_F2 && editor->IsCreated() && m_cellEditCtrlEnabled )
+                editor->StartingKey(event);
+        }
+        else
+        {
+            event.Skip();
+        }
+
+        editor->DecRef();
+        attr->DecRef();
+    }
+    else
+    {
+        event.Skip();
     }
 }
 
@@ -6297,26 +4801,27 @@ void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
 
-void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
+bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 {
-    if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
+    if ( SendEvent(wxEVT_GRID_SELECT_CELL, coords) == -1 )
     {
-        // the event has been intercepted - do nothing
-        return;
+        // the event has been vetoed - do nothing
+        return false;
     }
 
-    wxClientDC dc(m_gridWin);
-    PrepareDC(dc);
+#if !defined(__WXMAC__)
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );
+#endif
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {
-        HideCellEditControl();
         DisableCellEditControl();
 
-        if ( IsVisible( m_currentCellCoords, FALSE ) )
+        if ( IsVisible( m_currentCellCoords, false ) )
         {
             wxRect r;
-            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );
             if ( !m_gridLinesEnabled )
             {
                 r.x--;
@@ -6330,67 +4835,88 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
-            DrawGridCellArea(dc,cells);
+#if defined(__WXMAC__)
+            m_gridWin->Refresh(true /*, & r */);
+#else
+            DrawGridCellArea( dc, cells );
             DrawAllGridLines( dc, r );
+#endif
         }
     }
 
     m_currentCellCoords = coords;
 
-    wxGridCellAttr* attr = GetCellAttr(coords);
-    DrawCellHighlight(dc, attr);
+    wxGridCellAttr *attr = GetCellAttr( coords );
+#if !defined(__WXMAC__)
+    DrawCellHighlight( dc, attr );
+#endif
     attr->DecRef();
-}
 
+    return true;
+}
 
-void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void
+wxGrid::UpdateBlockBeingSelected(int topRow, int leftCol,
+                                 int bottomRow, int rightCol)
 {
-    int temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
-
     if ( m_selection )
     {
-        if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
-        {
-            leftCol = 0;
-            rightCol = GetNumberCols() - 1;
-        }
-        else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+        switch ( m_selection->GetSelectionMode() )
         {
-            topRow = 0;
-            bottomRow = GetNumberRows() - 1;
+            default:
+                wxFAIL_MSG( "unknown selection mode" );
+                // fall through
+
+            case wxGridSelectCells:
+                // arbitrary blocks selection allowed so just use the cell
+                // coordinates as is
+                break;
+
+            case wxGridSelectRows:
+                // only full rows selection allowd, ensure that we do select
+                // full rows
+                leftCol = 0;
+                rightCol = GetNumberCols() - 1;
+                break;
+
+            case wxGridSelectColumns:
+                // same as above but for columns
+                topRow = 0;
+                bottomRow = GetNumberRows() - 1;
+                break;
+
+            case wxGridSelectRowsOrColumns:
+                // in this mode we can select only full rows or full columns so
+                // it doesn't make sense to select blocks at all (and we can't
+                // extend the block because there is no preferred direction, we
+                // could only extend it to cover the entire grid but this is
+                // not useful)
+                return;
         }
     }
 
-    if ( topRow > bottomRow )
-    {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
-    }
+    m_selectedBlockCorner = wxGridCellCoords(bottomRow, rightCol);
+    MakeCellVisible(m_selectedBlockCorner);
 
-    if ( leftCol > rightCol )
-    {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
-    }
+    EnsureFirstLessThanSecond(topRow, bottomRow);
+    EnsureFirstLessThanSecond(leftCol, rightCol);
 
-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+    wxGridCellCoords updateTopLeft = wxGridCellCoords(topRow, leftCol),
+                     updateBottomRight = wxGridCellCoords(bottomRow, rightCol);
 
     // First the case that we selected a completely new area
-    if ( m_selectingTopLeft == wxGridNoCellCoords ||
-         m_selectingBottomRight == wxGridNoCellCoords )
+    if ( m_selectedBlockTopLeft == wxGridNoCellCoords ||
+         m_selectedBlockBottomRight == wxGridNoCellCoords )
     {
         wxRect rect;
         rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
                                   wxGridCellCoords ( bottomRow, rightCol ) );
-        m_gridWin->Refresh( FALSE, &rect );
+        m_gridWin->Refresh( false, &rect );
     }
+
     // Now handle changing an existing selection area.
-    else if ( m_selectingTopLeft != updateTopLeft ||
-              m_selectingBottomRight != updateBottomRight )
+    else if ( m_selectedBlockTopLeft != updateTopLeft ||
+              m_selectedBlockBottomRight != updateBottomRight )
     {
         // Compute two optimal update rectangles:
         // Either one rectangle is a real subset of the
@@ -6400,40 +4926,20 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         need_refresh[0] =
         need_refresh[1] =
         need_refresh[2] =
-        need_refresh[3] = FALSE;
+        need_refresh[3] = false;
         int     i;
 
         // Store intermediate values
-        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
-        wxCoord oldTop    = m_selectingTopLeft.GetRow();
-        wxCoord oldRight  = m_selectingBottomRight.GetCol();
-        wxCoord oldBottom = m_selectingBottomRight.GetRow();
+        wxCoord oldLeft = m_selectedBlockTopLeft.GetCol();
+        wxCoord oldTop = m_selectedBlockTopLeft.GetRow();
+        wxCoord oldRight = m_selectedBlockBottomRight.GetCol();
+        wxCoord oldBottom = m_selectedBlockBottomRight.GetRow();
 
         // Determine the outer/inner coordinates.
-        if (oldLeft > leftCol)
-        {
-            temp = oldLeft;
-            oldLeft = leftCol;
-            leftCol = temp;
-        }
-        if (oldTop > topRow )
-        {
-            temp = oldTop;
-            oldTop = topRow;
-            topRow = temp;
-        }
-        if (oldRight < rightCol )
-        {
-            temp = oldRight;
-            oldRight = rightCol;
-            rightCol = temp;
-        }
-        if (oldBottom < bottomRow)
-        {
-            temp = oldBottom;
-            oldBottom = bottomRow;
-            bottomRow = temp;
-        }
+        EnsureFirstLessThanSecond(oldLeft, leftCol);
+        EnsureFirstLessThanSecond(oldTop, topRow);
+        EnsureFirstLessThanSecond(rightCol, oldRight);
+        EnsureFirstLessThanSecond(bottomRow, oldBottom);
 
         // Now, either the stuff marked old is the outer
         // rectangle or we don't have a situation where one
@@ -6443,54 +4949,51 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         {
             // Refresh the newly selected or deselected
             // area to the left of the old or new selection.
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
+            need_refresh[0] = true;
+            rect[0] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop,  oldLeft ),
+                wxGridCellCoords( oldBottom, leftCol - 1 ) );
         }
 
-        if ( oldTop  < topRow )
+        if ( oldTop < topRow )
         {
             // Refresh the newly selected or deselected
             // area above the old or new selection.
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
+            need_refresh[1] = true;
+            rect[1] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop, leftCol ),
+                wxGridCellCoords( topRow - 1, rightCol ) );
         }
 
         if ( oldRight > rightCol )
         {
             // 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 ) );
+            need_refresh[2] = true;
+            rect[2] = BlockToDeviceRect(
+                wxGridCellCoords( oldTop, rightCol + 1 ),
+                wxGridCellCoords( oldBottom, oldRight ) );
         }
 
         if ( oldBottom > bottomRow )
         {
             // 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 ) );
+            need_refresh[3] = true;
+            rect[3] = BlockToDeviceRect(
+                wxGridCellCoords( bottomRow + 1, leftCol ),
+                wxGridCellCoords( oldBottom, rightCol ) );
         }
 
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+                m_gridWin->Refresh( false, &(rect[i]) );
     }
-    // Change Selection
-    m_selectingTopLeft = updateTopLeft;
-    m_selectingBottomRight = updateBottomRight;
+
+    // change selection
+    m_selectedBlockTopLeft = updateTopLeft;
+    m_selectedBlockBottomRight = updateBottomRight;
 }
 
 //
@@ -6507,13 +5010,12 @@ bool wxGrid::GetModelValues()
         // all we need to do is repaint the grid
         //
         m_gridWin->Refresh();
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
-
 bool wxGrid::SetModelValues()
 {
     int row, col;
@@ -6525,35 +5027,34 @@ bool wxGrid::SetModelValues()
 
     if ( m_table )
     {
-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = 0; row < m_numRows; row++ )
         {
-            for ( col = 0;  col < m_numCols;  col++ )
+            for ( col = 0; col < m_numCols; col++ )
             {
                 m_table->SetValue( row, col, GetCellValue(row, col) );
             }
         }
 
-        return TRUE;
+        return true;
     }
 
-    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 )
 {
-    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;
 
-    for ( i = numCells-1; i >= 0;  i-- )
+    for ( i = numCells - 1; i >= 0; i-- )
     {
         row = cells[i].GetRow();
         col = cells[i].GetCol();
@@ -6562,16 +5063,17 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         // If this cell is part of a multicell block, find owner for repaint
         if ( cell_rows <= 0 || cell_cols <= 0 )
         {
-            wxGridCellCoords cell(row+cell_rows, col+cell_cols);
-            bool marked = FALSE;
-            for ( int j = 0;  j < numCells;  j++ )
+            wxGridCellCoords cell( row + cell_rows, col + cell_cols );
+            bool marked = false;
+            for ( int j = 0; j < numCells; j++ )
             {
                 if ( cell == cells[j] )
                 {
-                    marked = TRUE;
+                    marked = true;
                     break;
                 }
             }
+
             if (!marked)
             {
                 int count = redrawCells.GetCount();
@@ -6579,13 +5081,17 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                 {
                     if ( cell == redrawCells[j] )
                     {
-                        marked = TRUE;
+                        marked = true;
                         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
@@ -6593,32 +5099,36 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         {
             for ( int l = 0; l < cell_rows; l++ )
             {
-                // find a cell in this row to left alreay marked for repaint
+                // find a cell in this row to leave already marked for repaint
                 int left = col;
                 for (int k = 0; k < int(redrawCells.GetCount()); k++)
                     if ((redrawCells[k].GetCol() < left) &&
                         (redrawCells[k].GetRow() == row))
-                        left=redrawCells[k].GetCol();
+                    {
+                        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);
-                            bool marked = FALSE;
+                            wxGridCellCoords cell(row + l, j);
+                            bool marked = false;
 
                             for (int k = 0; k < numCells; k++)
                             {
                                 if ( cell == cells[k] )
                                 {
-                                    marked = TRUE;
+                                    marked = true;
                                     break;
                                 }
                             }
+
                             if (!marked)
                             {
                                 int count = redrawCells.GetCount();
@@ -6626,11 +5136,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                                 {
                                     if ( cell == redrawCells[k] )
                                     {
-                                        marked = TRUE;
+                                        marked = true;
                                         break;
                                     }
                                 }
-                                if (!marked) redrawCells.Add( cell );
+                                if (!marked)
+                                    redrawCells.Add( cell );
                             }
                         }
                         break;
@@ -6638,18 +5149,18 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                 }
             }
         }
+
         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] );
     }
 }
 
-
 void wxGrid::DrawGridSpace( wxDC& dc )
 {
   int cw, ch;
@@ -6658,30 +5169,29 @@ void wxGrid::DrawGridSpace( wxDC& dc )
   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 )
   {
       int left, top;
       CalcUnscrolledPosition( 0, 0, &left, &top );
 
-      dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+      dc.SetBrush(GetDefaultCellBackgroundColour());
       dc.SetPen( *wxTRANSPARENT_PEN );
 
       if ( right > rightCol )
       {
-          dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch );
       }
 
       if ( bottom > bottomRow )
       {
-          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow );
       }
   }
 }
 
-
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
@@ -6691,11 +5201,6 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
         return;
 
     // we draw the cell border ourselves
-#if !WXGRID_DRAW_LINES
-    if ( m_gridLinesEnabled )
-        DrawCellBorder( dc, coords );
-#endif
-
     wxGridCellAttr* attr = GetCellAttr(row, col);
 
     bool isCurrent = coords == m_currentCellCoords;
@@ -6706,14 +5211,19 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
     // Note: However, only if it is really _shown_, i.e. not hidden!
     if ( isCurrent && IsCellEditControlShown() )
     {
+        // NB: this "#if..." is temporary and fixes a problem where the
+        // edit control is erased by this code after being rendered.
+        // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
+        // implicitly, causing this out-of order render.
+#if !defined(__WXMAC__)
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();
+#endif
     }
     else
     {
-        // but all the rest is drawn by the cell renderer and hence may be
-        // customized
+        // but all the rest is drawn by the cell renderer and hence may be customized
         wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
         renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
         renderer->DecRef();
@@ -6724,6 +5234,10 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 
 void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 {
+    // don't show highlight when the grid doesn't have focus
+    if ( !HasFocus() )
+        return;
+
     int row = m_currentCellCoords.GetRow();
     int col = m_currentCellCoords.GetCol();
 
@@ -6740,47 +5254,41 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 
     if (penWidth > 0)
     {
-        // The center of th drawn line is where the position/width/height of
-        // the rectangle is actually at, (on wxMSW atr least,) so we will
-        // reduce the size of the rectangle to compensate for the thickness of
-        // the line.  If this is too strange on non wxMSW platforms then
+        // The center of the drawn line is where the position/width/height of
+        // the rectangle is actually at (on wxMSW at least), so the
+        // size of the rectangle is reduced to compensate for the thickness of
+        // the line. If this is too strange on non-wxMSW platforms then
         // please #ifdef this appropriately.
-        rect.x += penWidth/2;
-        rect.y += penWidth/2;
-        rect.width -= penWidth-1;
-        rect.height -= penWidth-1;
-
+        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.
-        dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
+        dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground
+                                               : m_cellHighlightColour,
+                        penWidth));
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
     }
+}
 
-#if 0
-        // VZ: my experiments with 3d borders...
-
-        // 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;
-
-        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 );
+wxPen wxGrid::GetDefaultGridLinePen()
+{
+    return wxPen(GetGridLineColour());
+}
 
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(x1, y2, x2, y2);
-        dc.DrawLine(x2, y1, x2, y2+1);
-#endif // 0
+wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
+{
+    return GetDefaultGridLinePen();
 }
 
+wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col))
+{
+    return GetDefaultGridLinePen();
+}
 
 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {
@@ -6789,27 +5297,26 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
     if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
 
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
     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.y + rect.height,
+    dc.SetPen( GetRowGridLinePen(row) );
+    dc.DrawLine( rect.x, rect.y + rect.height,
                  rect.x + rect.width, rect.y + rect.height);
 }
 
-void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)
+void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells)
 {
     // This if block was previously in wxGrid::OnPaint but that doesn't
     // seem to get called under wxGTK - MB
     //
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
+    if ( m_currentCellCoords == wxGridNoCellCoords &&
          m_numRows && m_numCols )
     {
         m_currentCellCoords.Set(0, 0);
@@ -6826,7 +5333,27 @@ void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)
     size_t count = cells.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        if ( cells[n] == m_currentCellCoords )
+        wxGridCellCoords cell = cells[n];
+
+        // If we are using attributes, then we may have just exposed another
+        // cell in a partially-visible merged cluster of cells. If the "anchor"
+        // (upper left) cell of this merged cluster is the cell indicated by
+        // m_currentCellCoords, then we need to refresh the cell highlight even
+        // though the "anchor" itself is not part of our update segment.
+        if ( CanHaveAttributes() )
+        {
+            int rows = 0,
+                cols = 0;
+            GetCellSize(cell.GetRow(), cell.GetCol(), &rows, &cols);
+
+            if ( rows < 0 )
+                cell.SetRow(cell.GetRow() + rows);
+
+            if ( cols < 0 )
+                cell.SetCol(cell.GetCol() + cols);
+        }
+
+        if ( cell == m_currentCellCoords )
         {
             wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
             DrawCellHighlight(dc, attr);
@@ -6837,327 +5364,401 @@ void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)
     }
 }
 
-// TODO: remove this ???
 // This is used to redraw all grid lines e.g. when the grid line colour
 // has been changed
 //
 void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 {
-#if !WXGRID_DRAW_LINES
-    return;
-#endif
-
-    if ( !m_gridLinesEnabled ||
-         !m_numRows ||
-         !m_numCols ) return;
+    if ( !m_gridLinesEnabled )
+         return;
 
     int top, bottom, left, right;
 
-#if 0  //#ifndef __WXGTK__
-    if (reg.IsEmpty())
+    int cw, ch;
+    m_gridWin->GetClientSize(&cw, &ch);
+    CalcUnscrolledPosition( 0, 0, &left, &top );
+    CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+    // avoid drawing grid lines past the last row and col
+    if ( m_gridLinesClipHorz )
     {
-      int cw, ch;
-      m_gridWin->GetClientSize(&cw, &ch);
+        if ( !m_numCols )
+            return;
 
-      // virtual coords of visible area
-      //
-      CalcUnscrolledPosition( 0, 0, &left, &top );
-      CalcUnscrolledPosition( cw, ch, &right, &bottom );
+        const int lastColRight = GetColRight(GetColAt(m_numCols - 1));
+        if ( right > lastColRight )
+            right = lastColRight;
     }
-    else
+
+    if ( m_gridLinesClipVert )
     {
-      wxCoord x, y, w, h;
-      reg.GetBox(x, y, w, h);
-      CalcUnscrolledPosition( x, y, &left, &top );
-      CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
-    }
-#else
-      int cw, ch;
-      m_gridWin->GetClientSize(&cw, &ch);
-      CalcUnscrolledPosition( 0, 0, &left, &top );
-      CalcUnscrolledPosition( cw, ch, &right, &bottom );
-#endif
+        if ( !m_numRows )
+            return;
 
-    // avoid drawing grid lines past the last row and col
-    //
-    right = wxMin( right, GetColRight(m_numCols - 1) );
-    bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
+        const int lastRowBottom = GetRowBottom(m_numRows - 1);
+        if ( bottom > lastRowBottom )
+            bottom = lastRowBottom;
+    }
 
     // no gridlines inside multicells, clip them out
-    int leftCol   = XToCol(left);
-    int topRow    = YToRow(top);
-    int rightCol  = XToCol(right);
-    int bottomRow = YToRow(bottom);
-    wxRegion clippedcells(0, 0, cw, ch);
+    int leftCol = GetColPos( internalXToCol(left) );
+    int topRow = internalYToRow(top);
+    int rightCol = GetColPos( internalXToCol(right) );
+    int bottomRow = internalYToRow(bottom);
 
-    if ((leftCol >= 0) && (topRow >= 0))
-    {
-        if (rightCol  < 0) rightCol  = m_numCols;
-        if (bottomRow < 0) bottomRow = m_numRows;
+    wxRegion clippedcells(0, 0, cw, ch);
 
-        int i, j, cell_rows, cell_cols;
-        wxRect rect;
+    int cell_rows, cell_cols;
+    wxRect rect;
 
-        for (j=topRow; j<bottomRow; j++)
+    for ( int j = topRow; j <= bottomRow; j++ )
+    {
+        for ( int colPos = leftCol; colPos <= rightCol; colPos++ )
         {
-            for (i=leftCol; i<rightCol; i++)
+            int 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))
-                {
-                    rect = CellToRect(j,i);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
-                else if ((cell_rows < 0) || (cell_cols < 0))
-                {
-                    rect = CellToRect(j+cell_rows, i+cell_cols);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
+                rect = CellToRect(j,i);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);
+            }
+            else if ((cell_rows < 0) || (cell_cols < 0))
+            {
+                rect = CellToRect(j + cell_rows, i + cell_cols);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);
             }
         }
     }
-    dc.SetClippingRegion( clippedcells );
 
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+    dc.SetDeviceClippingRegion( clippedcells );
+
 
     // horizontal grid lines
-    //
-    int i;
-    for ( i = internalYToRow(top); i < m_numRows; i++ )
+    for ( int i = internalYToRow(top); i < m_numRows; i++ )
     {
         int bot = GetRowBottom(i) - 1;
 
         if ( bot > bottom )
-        {
             break;
-        }
 
         if ( bot >= top )
         {
+            dc.SetPen( GetRowGridLinePen(i) );
             dc.DrawLine( left, bot, right, bot );
         }
     }
 
-
     // vertical grid lines
-    //
-    for ( i = internalXToCol(left); i < m_numCols; i++ )
+    for ( int colPos = leftCol; colPos < m_numCols; colPos++ )
     {
-        int colRight = GetColRight(i) - 1;
+        int i = GetColAt( colPos );
+
+        int colRight = GetColRight(i);
+#ifdef __WXGTK__
+        if (GetLayoutDirection() != wxLayout_RightToLeft)
+#endif
+            colRight--;
+
         if ( colRight > right )
-        {
             break;
-        }
 
         if ( colRight >= left )
         {
+            dc.SetPen( GetColGridLinePen(i) );
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
+
     dc.DestroyClippingRegion();
 }
 
-
-void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
+void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
 {
-    if ( !m_numRows ) return;
-
-    size_t i;
-    size_t numLabels = rows.GetCount();
+    if ( !m_numRows )
+        return;
 
-    for ( i = 0;  i < numLabels;  i++ )
+    const size_t numLabels = rows.GetCount();
+    for ( size_t i = 0; i < numLabels; i++ )
     {
         DrawRowLabel( dc, rows[i] );
     }
 }
 
-
 void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
-    if ( GetRowHeight(row) <= 0 )
+    if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
         return;
 
-    int rowTop = GetRowTop(row),
-        rowBottom = GetRowBottom(row) - 1;
+    wxGridCellAttrProvider * const
+        attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
+
+    // notice that an explicit static_cast is needed to avoid a compilation
+    // error with VC7.1 which, for some reason, tries to instantiate (abstract)
+    // wxGridRowHeaderRenderer class without it
+    const wxGridRowHeaderRenderer&
+        rend = attrProvider ? attrProvider->GetRowHeaderRenderer(row)
+                            : static_cast<const wxGridRowHeaderRenderer&>
+                                (gs_defaultHeaderRenderers.rowRenderer);
 
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( m_rowLabelWidth-1, rowTop,
-                 m_rowLabelWidth-1, rowBottom );
+    wxRect rect(0, GetRowTop(row), m_rowLabelWidth, GetRowHeight(row));
+    rend.DrawBorder(*this, dc, rect);
 
-    dc.DrawLine( 0, rowTop, 0, rowBottom );
+    int hAlign, vAlign;
+    GetRowLabelAlignment(&hAlign, &vAlign);
 
-    dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
+    rend.DrawLabel(*this, dc, GetRowLabelValue(row),
+                   rect, hAlign, vAlign, wxHORIZONTAL);
+}
 
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 1, rowTop, 1, rowBottom );
-    dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
+void wxGrid::UseNativeColHeader(bool native)
+{
+    if ( native == m_useNativeHeader )
+        return;
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+    delete m_colWindow;
+    m_useNativeHeader = native;
 
-    int hAlign, vAlign;
-    GetRowLabelAlignment( &hAlign, &vAlign );
+    CreateColumnWindow();
 
-    wxRect rect;
-    rect.SetX( 2 );
-    rect.SetY( GetRowTop(row) + 2 );
-    rect.SetWidth( m_rowLabelWidth - 4 );
-    rect.SetHeight( GetRowHeight(row) - 4 );
-    DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
+    if ( m_useNativeHeader )
+        GetGridColHeader()->SetColumnCount(m_numCols);
+    CalcWindowSizes();
 }
 
+void wxGrid::SetUseNativeColLabels( bool native )
+{
+    wxASSERT_MSG( !m_useNativeHeader,
+                  "doesn't make sense when using native header" );
+
+    m_nativeColumnLabels = native;
+    if (native)
+    {
+        int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
+        SetColLabelSize( height );
+    }
+
+    GetColLabelWindow()->Refresh();
+    m_cornerLabelWin->Refresh();
+}
 
 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
-    if ( !m_numCols ) return;
-
-    size_t i;
-    size_t numLabels = cols.GetCount();
+    if ( !m_numCols )
+        return;
 
-    for ( i = 0;  i < numLabels;  i++ )
+    const size_t numLabels = cols.GetCount();
+    for ( size_t i = 0; i < numLabels; i++ )
     {
         DrawColLabel( dc, cols[i] );
     }
 }
 
-
-void wxGrid::DrawColLabel( wxDC& dc, int col )
+void wxGrid::DrawCornerLabel(wxDC& dc)
 {
-    if ( GetColWidth(col) <= 0 )
-        return;
+    wxRect rect(wxSize(m_rowLabelWidth, m_colLabelHeight));
 
-    int colLeft = GetColLeft(col),
-        colRight = GetColRight(col) - 1;
+    if ( m_nativeColumnLabels )
+    {
+        rect.Deflate(1);
 
-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
-    dc.DrawLine( colRight, 0,
-                 colRight, m_colLabelHeight-1 );
+        wxRendererNative::Get().DrawHeaderButton(m_cornerLabelWin, dc, rect, 0);
+    }
+    else
+    {
+        rect.width++;
+        rect.height++;
 
-    dc.DrawLine( colLeft, 0, colRight, 0 );
+        wxGridCellAttrProvider * const
+            attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
+        const wxGridCornerHeaderRenderer&
+            rend = attrProvider ? attrProvider->GetCornerRenderer()
+                                : static_cast<wxGridCornerHeaderRenderer&>
+                                    (gs_defaultHeaderRenderers.cornerRenderer);
 
-    dc.DrawLine( colLeft, m_colLabelHeight-1,
-                 colRight+1, m_colLabelHeight-1 );
+        rend.DrawBorder(*this, dc, rect);
+    }
+}
 
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
-    dc.DrawLine( colLeft, 1, colRight, 1 );
+void wxGrid::DrawColLabel(wxDC& dc, int col)
+{
+    if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )
+        return;
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+    int colLeft = GetColLeft(col);
+
+    wxRect rect(colLeft, 0, GetColWidth(col), m_colLabelHeight);
+    wxGridCellAttrProvider * const
+        attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
+    const wxGridColumnHeaderRenderer&
+        rend = attrProvider ? attrProvider->GetColumnHeaderRenderer(col)
+                            : static_cast<wxGridColumnHeaderRenderer&>
+                                (gs_defaultHeaderRenderers.colRenderer);
+
+    if ( m_nativeColumnLabels )
+    {
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    GetColLabelWindow(),
+                                    dc,
+                                    rect,
+                                    0,
+                                    IsSortingBy(col)
+                                        ? IsSortOrderAscending()
+                                            ? wxHDR_SORT_ICON_UP
+                                            : wxHDR_SORT_ICON_DOWN
+                                        : wxHDR_SORT_ICON_NONE
+                                );
+        rect.Deflate(2);
+    }
+    else
+    {
+        // It is reported that we need to erase the background to avoid display
+        // artefacts, see #12055.
+        wxDCBrushChanger setBrush(dc, m_colWindow->GetBackgroundColour());
+        dc.DrawRectangle(rect);
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+        rend.DrawBorder(*this, dc, rect);
+    }
 
     int hAlign, vAlign;
-    GetColLabelAlignment( &hAlign, &vAlign );
+    GetColLabelAlignment(&hAlign, &vAlign);
+    const int orient = GetColLabelTextOrientation();
 
-    wxRect rect;
-    rect.SetX( colLeft + 2 );
-    rect.SetY( 2 );
-    rect.SetWidth( GetColWidth(col) - 4 );
-    rect.SetHeight( m_colLabelHeight - 4 );
-    DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
+    rend.DrawLabel(*this, dc, GetColLabelValue(col), rect, hAlign, vAlign, orient);
 }
 
+// TODO: these 2 functions should be replaced with wxDC::DrawLabel() to which
+//       we just have to add textOrientation support
 void wxGrid::DrawTextRectangle( wxDC& dc,
                                 const wxString& value,
                                 const wxRect& rect,
                                 int horizAlign,
-                                int vertAlign )
+                                int vertAlign,
+                                int textOrientation ) const
 {
     wxArrayString lines;
 
     StringToLines( value, lines );
 
-
-    //Forward to new API.
-    DrawTextRectangle(  dc,
-                        lines,
-                        rect,
-                        horizAlign,
-                        vertAlign );
-
+    DrawTextRectangle(dc, lines, rect, horizAlign, vertAlign, textOrientation);
 }
 
-void wxGrid::DrawTextRectangle( wxDC& dc,
-                                const wxArrayString& lines,
-                                const wxRect& rect,
-                                int horizAlign,
-                                int vertAlign )
+void wxGrid::DrawTextRectangle(wxDC& dc,
+                               const wxArrayString& lines,
+                               const wxRect& rect,
+                               int horizAlign,
+                               int vertAlign,
+                               int textOrientation) const
 {
-    long textWidth, textHeight;
-    long lineWidth, lineHeight;
-    int nLines;
+    if ( lines.empty() )
+        return;
+
+    wxDCClipper clip(dc, rect);
 
-    dc.SetClippingRegion( rect );
+    long textWidth,
+         textHeight;
+
+    if ( textOrientation == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+    else
+        GetTextBoxSize( dc, lines, &textHeight, &textWidth );
 
-    nLines = lines.GetCount();
-    if( nLines > 0 )
+    int x = 0,
+        y = 0;
+    switch ( vertAlign )
     {
-      int l;
-      float x, y;
-      GetTextBoxSize(dc, lines, &textWidth, &textHeight);
-      switch( vertAlign )
-      {
         case wxALIGN_BOTTOM:
-          y = rect.y + (rect.height - textHeight - 1);
-          break;
+            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)/2);
-          break;
+            if ( textOrientation == wxHORIZONTAL )
+                y = rect.y + ((rect.height - textHeight) / 2);
+            else
+                x = rect.x + ((rect.width - textWidth) / 2);
+            break;
 
         case wxALIGN_TOP:
         default:
-          y = rect.y + 1;
-          break;
-      }
+            if ( textOrientation == wxHORIZONTAL )
+                y = rect.y + 1;
+            else
+                x = rect.x + 1;
+            break;
+    }
 
-      // Align each line of a multi-line label
-      for( l = 0; l < nLines; l++ )
-      {
-        dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+    // 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];
 
-        switch( horizAlign )
+        if ( line.empty() )
         {
-          case wxALIGN_RIGHT:
-            x = rect.x + (rect.width - lineWidth - 1);
-            break;
+            *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+            continue;
+        }
 
-          case wxALIGN_CENTRE:
-            x = rect.x + ((rect.width - lineWidth)/2);
-            break;
+        wxCoord lineWidth = 0,
+             lineHeight = 0;
+        dc.GetTextExtent(line, &lineWidth, &lineHeight);
 
-          case wxALIGN_LEFT:
-          default:
-            x = rect.x + 1;
-            break;
+        switch ( horizAlign )
+        {
+            case wxALIGN_RIGHT:
+                if ( textOrientation == wxHORIZONTAL )
+                    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);
+                else
+                    y = rect.y + rect.height - ((rect.height - lineWidth) / 2);
+                break;
+
+            case wxALIGN_LEFT:
+            default:
+                if ( textOrientation == wxHORIZONTAL )
+                    x = rect.x + 1;
+                else
+                    y = rect.y + rect.height - 1;
+                break;
         }
 
-        dc.DrawText( lines[l], (int)x, (int)y );
-        y += 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 )
+// TODO: refactor wxTextFile::Read() and reuse the same code from here
+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 );
 
-    while ( startPos < (int)tVal.Length() )
+    while ( startPos < (int)tVal.length() )
     {
         pos = tVal.Mid(startPos).Find( eol );
         if ( pos < 0 )
@@ -7170,27 +5771,28 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
         }
         else
         {
-            lines.Add( value.Mid(startPos, pos) );
+            lines.Add( tVal.Mid(startPos, pos) );
         }
-        startPos += pos+1;
+
+        startPos += pos + 1;
     }
-    if ( startPos < (int)value.Length() )
+
+    if ( startPos < (int)tVal.length() )
     {
-        lines.Add( value.Mid( startPos ) );
+        lines.Add( tVal.Mid( startPos ) );
     }
 }
 
-
-void wxGrid::GetTextBoxSize( wxDC& dc,
+void wxGrid::GetTextBoxSize( const wxDC& dc,
                              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;
-    for ( i = 0;  i < lines.GetCount();  i++ )
+    for ( i = 0; i < lines.GetCount(); i++ )
     {
         dc.GetTextExtent( lines[i], &lineW, &lineH );
         w = wxMax( w, lineW );
@@ -7213,7 +5815,7 @@ void wxGrid::EndBatch()
         {
             CalcDimensions();
             m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
+            m_colWindow->Refresh();
             m_cornerLabelWin->Refresh();
             m_gridWin->Refresh();
         }
@@ -7230,42 +5832,45 @@ void wxGrid::ForceRefresh()
     EndBatch();
 }
 
+bool wxGrid::Enable(bool enable)
+{
+    if ( !wxScrolledWindow::Enable(enable) )
+        return false;
+
+    // redraw in the new state
+    m_gridWin->Refresh();
+
+    return true;
+}
 
 //
 // ------ Edit control functions
 //
 
-
 void wxGrid::EnableEditing( bool edit )
 {
-    // TODO: improve this ?
-    //
     if ( edit != m_editable )
     {
-        if(!edit) EnableCellEditControl(edit);
+        if (!edit)
+            EnableCellEditControl(edit);
         m_editable = edit;
     }
 }
 
-
 void wxGrid::EnableCellEditControl( bool enable )
 {
     if (! m_editable)
         return;
 
-    if ( m_currentCellCoords == wxGridNoCellCoords )
-        SetCurrentCell( 0, 0 );
-
     if ( enable != m_cellEditCtrlEnabled )
     {
         if ( enable )
         {
-            if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+            if ( SendEvent(wxEVT_GRID_EDITOR_SHOWN) == -1 )
                 return;
 
             // this should be checked by the caller!
-            wxASSERT_MSG( CanEnableCellControl(),
-                          _T("can't enable editing for this cell!") );
+            wxASSERT_MSG( CanEnableCellControl(), wxT("can't enable editing for this cell!") );
 
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
@@ -7274,8 +5879,7 @@ void wxGrid::EnableCellEditControl( bool enable )
         }
         else
         {
-            //FIXME:add veto support
-            SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
+            SendEvent(wxEVT_GRID_EDITOR_HIDDEN);
 
             HideCellEditControl();
             SaveEditControlValue();
@@ -7298,19 +5902,20 @@ bool wxGrid::IsCurrentCellReadOnly() const
 
 bool wxGrid::CanEnableCellControl() const
 {
-    return m_editable && !IsCurrentCellReadOnly();
+    return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
+        !IsCurrentCellReadOnly();
 }
 
 bool wxGrid::IsCellEditControlEnabled() const
 {
     // the cell edit control might be disable for all cells or just for the
     // current one if it's read only
-    return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
+    return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : false;
 }
 
 bool wxGrid::IsCellEditControlShown() const
 {
-    bool isShown = FALSE;
+    bool isShown = false;
 
     if ( m_cellEditCtrlEnabled )
     {
@@ -7338,9 +5943,9 @@ void wxGrid::ShowCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
-        if ( !IsVisible( m_currentCellCoords ) )
+        if ( !IsVisible( m_currentCellCoords, false ) )
         {
-            m_cellEditCtrlEnabled = FALSE;
+            m_cellEditCtrlEnabled = false;
             return;
         }
         else
@@ -7360,20 +5965,21 @@ void wxGrid::ShowCellEditControl()
                 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 );
-            dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            dc.SetBrush(wxBrush(attr->GetBackgroundColour()));
             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
@@ -7384,11 +5990,10 @@ void wxGrid::ShowCellEditControl()
             if (rect.y > 0)
                 rect.y--;
 
-            wxGridCellAttr* attr = GetCellAttr(row, col);
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {
-                editor->Create(m_gridWin, -1,
+                editor->Create(m_gridWin, wxID_ANY,
                                new wxGridCellEditorEvtHandler(this, editor));
 
                 wxGridEditorCreatedEvent evt(GetId(),
@@ -7400,43 +6005,51 @@ void wxGrid::ShowCellEditControl()
                 GetEventHandler()->ProcessEvent(evt);
             }
 
-
             // resize editor to overflow into righthand cells if allowed
             int maxWidth = rect.width;
             wxString value = GetCellValue(row, col);
             if ( (value != wxEmptyString) && (attr->GetOverflow()) )
             {
                 int y;
-                GetTextExtent(value, &maxWidth, &y,
-                        NULL, NULL, &attr->GetFont());
-                if (maxWidth < rect.width) maxWidth = rect.width;
+                GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont());
+                if (maxWidth < rect.width)
+                    maxWidth = rect.width;
             }
+
             int client_right = m_gridWin->GetClientSize().GetWidth();
-            if (rect.x+maxWidth > client_right)
+            if (rect.x + maxWidth > client_right)
                 maxWidth = client_right - rect.x;
 
             if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
             {
                 GetCellSize( row, col, &cell_rows, &cell_cols );
                 // may have changed earlier
-                for (int i = col+cell_cols; i < m_numCols; i++)
+                for (int i = col + cell_cols; i < m_numCols; i++)
                 {
                     int c_rows, c_cols;
                     GetCellSize( row, i, &c_rows, &c_cols );
+
                     // looks weird going over a multicell
-                    if (m_table->IsEmptyCell(row,i) &&
+                    if (m_table->IsEmptyCell( row, i ) &&
                             (rect.width < maxWidth) && (c_rows == 1))
-                        rect.width += GetColWidth(i);
+                    {
+                        rect.width += GetColWidth( i );
+                    }
                     else
                         break;
                 }
+
                 if (rect.GetRight() > client_right)
-                    rect.SetRight(client_right-1);
+                    rect.SetRight( client_right - 1 );
             }
 
-            editor->SetCellAttr(attr);
+            editor->SetCellAttr( attr );
             editor->SetSize( rect );
-            editor->Show( TRUE, attr );
+            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
             // expand the scrolled window to account for editor
@@ -7451,7 +6064,6 @@ void wxGrid::ShowCellEditControl()
     }
 }
 
-
 void wxGrid::HideCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
@@ -7459,21 +6071,35 @@ void wxGrid::HideCellEditControl()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
-        wxGridCellAttrattr = GetCellAttr(row, col);
+        wxGridCellAttr *attr = GetCellAttr(row, col);
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
-        editor->Show( FALSE );
+        const bool editorHadFocus = editor->GetControl()->HasFocus();
+        editor->Show( false );
         editor->DecRef();
         attr->DecRef();
-        m_gridWin->SetFocus();
+
+        // return the focus to the grid itself if the editor had it
+        //
+        // note that we must not do this unconditionally to avoid stealing
+        // focus from the window which just received it if we are hiding the
+        // editor precisely because we lost focus
+        if ( editorHadFocus )
+            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;
-        m_gridWin->Refresh( FALSE, &rect );
+
+#ifdef __WXMAC__
+        // ensure that the pixels under the focus ring get refreshed as well
+        rect.Inflate(10, 10);
+#endif
+
+        m_gridWin->Refresh( false, &rect );
     }
 }
 
-
 void wxGrid::SaveEditControlValue()
 {
     if ( IsCellEditControlEnabled() )
@@ -7481,29 +6107,33 @@ void wxGrid::SaveEditControlValue()
         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);
-        bool changed = editor->EndEdit(row, col, this);
 
-        editor->DecRef();
-        attr->DecRef();
+        wxString newval;
+        bool changed = editor->EndEdit(row, col, this, oldval, &newval);
 
-        if (changed)
+        if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 )
         {
-            if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
-                       m_currentCellCoords.GetRow(),
-                       m_currentCellCoords.GetCol() ) < 0 ) {
+            editor->ApplyEdit(row, col, this);
 
+            // for compatibility reasons dating back to wx 2.8 when this event
+            // was called wxEVT_GRID_CELL_CHANGE and wxEVT_GRID_CELL_CHANGING
+            // didn't exist we allow vetoing this one too
+            if ( SendEvent(wxEVT_GRID_CELL_CHANGED, oldval) == -1 )
+            {
                 // Event has been vetoed, set the data back.
-                SetCellValue(row,col,oldval);
+                SetCellValue(row, col, oldval);
             }
         }
+
+        editor->DecRef();
+        attr->DecRef();
     }
 }
 
-
 //
 // ------ Grid location functions
 //  Note that all of these functions work with the logical coordinates of
@@ -7511,168 +6141,198 @@ void wxGrid::SaveEditControlValue()
 //  coordinates for mouse events etc.
 //
 
-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+wxGridCellCoords wxGrid::XYToCell(int x, int y) const
 {
     int row = YToRow(y);
     int col = XToCol(x);
-
-    if ( row == -1  ||  col == -1 )
-    {
-        coords = wxGridNoCellCoords;
-    }
-    else
-    {
-        coords.Set( row, col );
-    }
+
+    return row == -1 || col == -1 ? wxGridNoCellCoords
+                                  : wxGridCellCoords(row, col);
 }
 
+// compute row or column from some (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array of
+// m_rowBottoms/m_colRights to do it quickly (linear search shouldn't be used
+// for large grids)
+int wxGrid::PosToLinePos(int coord,
+                         bool clipToMinMax,
+                         const wxGridOperations& oper) const
+{
+    const int numLines = oper.GetNumberOfLines(this);
+
+    if ( coord < 0 )
+        return clipToMinMax && numLines > 0 ? 0 : wxNOT_FOUND;
 
-// Internal Helper function for computing row or column from some
-// (unscrolled) coordinate value, using either
-// m_defaultRowHeight/m_defaultColWidth or binary search on array
-// of m_rowBottoms/m_ColRights to speed up the search!
+    const int defaultLineSize = oper.GetDefaultLineSize(this);
+    wxCHECK_MSG( defaultLineSize, -1, "can't have 0 default line size" );
 
-static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
-                           const wxArrayInt& BorderArray, int nMax,
-                           bool maxOnOverflow)
-{
-    if (!defaultDist)
-        defaultDist = 1;
-    size_t i_max = coord / defaultDist,
-           i_min = 0;
+    int maxPos = coord / defaultLineSize,
+        minPos = 0;
 
-    if (BorderArray.IsEmpty())
+    // check for the simplest case: if we have no explicit line sizes
+    // configured, then we already know the line this position falls in
+    const wxArrayInt& lineEnds = oper.GetLineEnds(this);
+    if ( lineEnds.empty() )
     {
-        if((int) i_max < nMax)
-            return i_max;
-        return maxOnOverflow ? nMax - 1 : -1;
+        if ( maxPos < numLines )
+            return maxPos;
+
+        return clipToMinMax ? numLines - 1 : -1;
     }
 
-    if ( i_max >= BorderArray.GetCount())
-        i_max = BorderArray.GetCount() - 1;
+
+    // adjust maxPos before starting the binary search
+    if ( maxPos >= numLines )
+    {
+        maxPos = numLines  - 1;
+    }
     else
     {
-        if ( coord >= BorderArray[i_max])
+        if ( coord >= lineEnds[oper.GetLineAt(this, maxPos)])
         {
-            i_min = i_max;
-            i_max = coord / minDist;
+            minPos = maxPos;
+            const int minDist = oper.GetMinimalAcceptableLineSize(this);
+            if ( minDist )
+                maxPos = coord / minDist;
+            else
+                maxPos = numLines - 1;
         }
-        if ( i_max >= BorderArray.GetCount())
-            i_max = BorderArray.GetCount() - 1;
+
+        if ( maxPos >= numLines )
+            maxPos = numLines  - 1;
     }
-    if ( coord >= BorderArray[i_max])
-        return maxOnOverflow ? (int)i_max : -1;
-    if ( coord < BorderArray[0] )
+
+    // check if the position is beyond the last column
+    const int lineAtMaxPos = oper.GetLineAt(this, maxPos);
+    if ( coord >= lineEnds[lineAtMaxPos] )
+        return clipToMinMax ? maxPos : -1;
+
+    // or before the first one
+    const int lineAt0 = oper.GetLineAt(this, 0);
+    if ( coord < lineEnds[lineAt0] )
         return 0;
 
-    while ( i_max - i_min > 0 )
+
+    // finally do perform the binary search
+    while ( minPos < maxPos )
     {
-        wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
-                    0, _T("wxGrid: internal error in CoordToRowOrCol"));
-        if (coord >=  BorderArray[ i_max - 1])
-            return i_max;
+        wxCHECK_MSG( lineEnds[oper.GetLineAt(this, minPos)] <= coord &&
+                        coord < lineEnds[oper.GetLineAt(this, maxPos)],
+                     -1,
+                     "wxGrid: internal error in PosToLinePos()" );
+
+        if ( coord >= lineEnds[oper.GetLineAt(this, maxPos - 1)] )
+            return maxPos;
         else
-            i_max--;
-        int median = i_min + (i_max - i_min + 1) / 2;
-        if (coord < BorderArray[median])
-            i_max = median;
+            maxPos--;
+
+        const int median = minPos + (maxPos - minPos + 1) / 2;
+        if ( coord < lineEnds[oper.GetLineAt(this, median)] )
+            maxPos = median;
         else
-            i_min = median;
+            minPos = median;
     }
-    return i_max;
+
+    return maxPos;
 }
 
-int wxGrid::YToRow( int y )
+int
+wxGrid::PosToLine(int coord,
+                  bool clipToMinMax,
+                  const wxGridOperations& oper) const
 {
-    return CoordToRowOrCol(y, m_defaultRowHeight,
-                           WXGRID_MIN_ROW_HEIGHT, m_rowBottoms, m_numRows, FALSE);
+    int pos = PosToLinePos(coord, clipToMinMax, oper);
+
+    return pos == wxNOT_FOUND ? wxNOT_FOUND : oper.GetLineAt(this, pos);
 }
 
+int wxGrid::YToRow(int y, bool clipToMinMax) const
+{
+    return PosToLine(y, clipToMinMax, wxGridRowOperations());
+}
 
-int wxGrid::XToCol( int x )
+int wxGrid::XToCol(int x, bool clipToMinMax) const
 {
-    return CoordToRowOrCol(x, m_defaultColWidth,
-                           WXGRID_MIN_COL_WIDTH, m_colRights, m_numCols, FALSE);
+    return PosToLine(x, clipToMinMax, wxGridColumnOperations());
 }
 
+int wxGrid::XToPos(int x) const
+{
+    return PosToLinePos(x, true /* clip */, wxGridColumnOperations());
+}
 
-// return the row number that that the y coord is near the edge of, or
-// -1 if not near an edge
+// return the row number such that the y coord is near the edge of, or -1 if
+// not near an edge.
 //
-int wxGrid::YToEdgeOfRow( int y )
+// notice that position can only possibly be near an edge if the row/column is
+// large enough to still allow for an "inner" area that is _not_ near the edge
+// (i.e., if the height/width is smaller than WXGRID_LABEL_EDGE_ZONE, pos will
+// _never_ be considered to be near the edge).
+int wxGrid::PosToEdgeOfLine(int pos, const wxGridOperations& oper) const
 {
-    int i;
-    i = internalYToRow(y);
+    const int line = oper.PosToLine(this, pos, true);
 
-    if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
+    if ( oper.GetLineSize(this, line) > WXGRID_LABEL_EDGE_ZONE )
     {
-        // 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 )
-            return i - 1;
+        // We know that we are in this line, test whether we are close enough
+        // to start or end border, respectively.
+        if ( abs(oper.GetLineEndPos(this, line) - pos) < WXGRID_LABEL_EDGE_ZONE )
+            return line;
+        else if ( line > 0 &&
+                    pos - oper.GetLineStartPos(this,
+                                               line) < WXGRID_LABEL_EDGE_ZONE )
+            return line - 1;
     }
 
     return -1;
 }
 
-
-// return the col number that that the x coord is near the edge of, or
-// -1 if not near an edge
-//
-int wxGrid::XToEdgeOfCol( int x )
+int wxGrid::YToEdgeOfRow(int y) const
 {
-    int i;
-    i = internalXToCol(x);
-
-    if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
-    {
-        // 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;
-        else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
-            return i - 1;
-    }
-
-    return -1;
+    return PosToEdgeOfLine(y, wxGridRowOperations());
 }
 
+int wxGrid::XToEdgeOfCol(int x) const
+{
+    return PosToEdgeOfLine(x, wxGridColumnOperations());
+}
 
-wxRect wxGrid::CellToRect( int row, int col )
+wxRect wxGrid::CellToRect( int row, int col ) const
 {
     wxRect rect( -1, -1, -1, -1 );
 
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    if ( row >= 0 && row < m_numRows &&
+         col >= 0 && col < m_numCols )
     {
         int i, cell_rows, cell_cols;
         rect.width = rect.height = 0;
         GetCellSize( row, col, &cell_rows, &cell_cols );
         // if negative then find multicell owner
-        if (cell_rows < 0) row += cell_rows;
-        if (cell_cols < 0) col += cell_cols;
+        if (cell_rows < 0)
+            row += cell_rows;
+        if (cell_cols < 0)
+             col += cell_cols;
         GetCellSize( row, col, &cell_rows, &cell_cols );
 
         rect.x = GetColLeft(col);
         rect.y = GetRowTop(row);
-        for (i=col; i<col+cell_cols; i++)
-            rect.width  += GetColWidth(i);
-        for (i=row; i<row+cell_rows; i++)
+        for (i=col; i < col + cell_cols; i++)
+            rect.width += GetColWidth(i);
+        for (i=row; i < row + cell_rows; i++)
             rect.height += GetRowHeight(i);
-    }
 
-    // if grid lines are enabled, then the area of the cell is a bit smaller
-    if (m_gridLinesEnabled) {
-        rect.width -= 1;
-        rect.height -= 1;
+        // if grid lines are enabled, then the area of the cell is a bit smaller
+        if (m_gridLinesEnabled)
+        {
+            rect.width -= 1;
+            rect.height -= 1;
+        }
     }
+
     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
     //
@@ -7685,45 +6345,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
-    //
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
     if ( wholeCellVisible )
     {
         // is the cell wholly visible ?
-        //
-        return ( left >= 0  &&  right <= cw  &&
-                 top >= 0  &&  bottom <= ch );
+        return ( left >= 0 && right <= cw &&
+                 top >= 0 && bottom <= ch );
     }
     else
     {
         // is the cell partly visible ?
         //
-        return ( ((left >=0 && left < cw) || (right > 0 && right <= cw))  &&
-                 ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+        return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) &&
+                 ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) );
     }
 }
 
-
 // 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;
 
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    if ( row >= 0 && row < m_numRows &&
+         col >= 0 && col < m_numCols )
     {
         // get the cell rectangle in logical coords
-        //
         wxRect r( CellToRect( row, col ) );
 
         // convert to device coords
-        //
         int left, top, right, bottom;
         CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
         CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
@@ -7739,7 +6393,7 @@ void wxGrid::MakeCellVisible( int row, int col )
         {
             int h = r.GetHeight();
             ypos = r.GetTop();
-            for ( i = row-1;  i >= 0;  i-- )
+            for ( i = row - 1; i >= 0; i-- )
             {
                 int rowHeight = GetRowHeight(i);
                 if ( h + rowHeight > ch )
@@ -7750,15 +6404,19 @@ void wxGrid::MakeCellVisible( int row, int col )
             }
 
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
-            // have rounding errors (this is important, because if we do, we
-            // might not scroll at all and some cells won't be redrawn)
+            // have rounding errors (this is important, because if we do,
+            // we might not scroll at all and some cells won't be redrawn)
             //
-            // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
-            // scroll unit...
-            ypos += GRID_SCROLL_LINE_Y;
+            // Sometimes GRID_SCROLL_LINE / 2 is not enough,
+            // so just add a full scroll unit...
+            ypos += m_yScrollPixelsPerLine;
         }
 
-        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();
         }
@@ -7770,496 +6428,244 @@ void wxGrid::MakeCellVisible( int row, int col )
             xpos = x0 + (right - cw);
 
             // see comment for ypos above
-            xpos += GRID_SCROLL_LINE_X;
+            xpos += m_xScrollPixelsPerLine;
         }
 
-        if ( xpos != -1  ||  ypos != -1 )
+        if ( xpos != -1 || ypos != -1 )
         {
             if ( xpos != -1 )
-                xpos /= GRID_SCROLL_LINE_X;
+                xpos /= m_xScrollPixelsPerLine;
             if ( ypos != -1 )
-                ypos /= GRID_SCROLL_LINE_Y;
+                ypos /= m_yScrollPixelsPerLine;
             Scroll( xpos, ypos );
             AdjustScrollbars();
         }
     }
 }
 
-
 //
 // ------ Grid cursor movement functions
 //
 
-bool wxGrid::MoveCursorUp( bool expandSelection )
+bool
+wxGrid::DoMoveCursor(bool expandSelection,
+                     const wxGridDirectionOperations& diroper)
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() >= 0 )
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;
+
+    if ( expandSelection )
     {
-        if ( expandSelection)
-        {
-            if ( m_selectingKeyboard == wxGridNoCellCoords )
-                m_selectingKeyboard = m_currentCellCoords;
-            if ( m_selectingKeyboard.GetRow() > 0 )
-            {
-                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
-                MakeCellVisible( m_selectingKeyboard.GetRow(),
-                                 m_selectingKeyboard.GetCol() );
-                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-            }
-        }
-        else if ( m_currentCellCoords.GetRow() > 0 )
-        {
-            ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                            m_currentCellCoords.GetCol() );
-        }
-        else
-            return FALSE;
-        return TRUE;
-    }
+        wxGridCellCoords coords = m_selectedBlockCorner;
+        if ( coords == wxGridNoCellCoords )
+            coords = m_currentCellCoords;
 
-    return FALSE;
-}
+        if ( diroper.IsAtBoundary(coords) )
+            return false;
 
+        diroper.Advance(coords);
 
-bool wxGrid::MoveCursorDown( bool expandSelection )
-{
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows )
-    {
-        if ( expandSelection )
-        {
-            if ( m_selectingKeyboard == wxGridNoCellCoords )
-                m_selectingKeyboard = m_currentCellCoords;
-            if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
-            {
-                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
-                MakeCellVisible( m_selectingKeyboard.GetRow(),
-                        m_selectingKeyboard.GetCol() );
-                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-            }
-        }
-        else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
-        {
-            ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                             m_currentCellCoords.GetCol() );
-            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                            m_currentCellCoords.GetCol() );
-        }
-        else
-            return FALSE;
-        return TRUE;
+        UpdateBlockBeingSelected(m_currentCellCoords, coords);
     }
+    else // don't expand selection
+    {
+        ClearSelection();
 
-    return FALSE;
-}
+        if ( diroper.IsAtBoundary(m_currentCellCoords) )
+            return false;
 
+        wxGridCellCoords coords = m_currentCellCoords;
+        diroper.Advance(coords);
 
-bool wxGrid::MoveCursorLeft( bool expandSelection )
-{
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() >= 0 )
-    {
-        if ( expandSelection )
-        {
-            if ( m_selectingKeyboard == wxGridNoCellCoords )
-                m_selectingKeyboard = m_currentCellCoords;
-            if ( m_selectingKeyboard.GetCol() > 0 )
-            {
-                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
-                MakeCellVisible( m_selectingKeyboard.GetRow(),
-                        m_selectingKeyboard.GetCol() );
-                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-            }
-        }
-        else if ( m_currentCellCoords.GetCol() > 0 )
-        {
-            ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() - 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() - 1 );
-        }
-        else
-            return FALSE;
-        return TRUE;
+        GoToCell(coords);
     }
 
-    return FALSE;
+    return true;
 }
 
+bool wxGrid::MoveCursorUp(bool expandSelection)
+{
+    return DoMoveCursor(expandSelection,
+                        wxGridBackwardOperations(this, wxGridRowOperations()));
+}
 
-bool wxGrid::MoveCursorRight( bool expandSelection )
+bool wxGrid::MoveCursorDown(bool expandSelection)
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols )
-    {
-        if ( expandSelection )
-        {
-            if ( m_selectingKeyboard == wxGridNoCellCoords )
-                m_selectingKeyboard = m_currentCellCoords;
-            if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
-            {
-                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
-                MakeCellVisible( m_selectingKeyboard.GetRow(),
-                        m_selectingKeyboard.GetCol() );
-                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-            }
-        }
-        else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
-        {
-            ClearSelection();
-            MakeCellVisible( m_currentCellCoords.GetRow(),
-                             m_currentCellCoords.GetCol() + 1 );
-            SetCurrentCell( m_currentCellCoords.GetRow(),
-                            m_currentCellCoords.GetCol() + 1 );
-        }
-        else
-            return FALSE;
-        return TRUE;
-    }
+    return DoMoveCursor(expandSelection,
+                        wxGridForwardOperations(this, wxGridRowOperations()));
+}
 
-    return FALSE;
+bool wxGrid::MoveCursorLeft(bool expandSelection)
+{
+    return DoMoveCursor(expandSelection,
+                        wxGridBackwardOperations(this, wxGridColumnOperations()));
 }
 
+bool wxGrid::MoveCursorRight(bool expandSelection)
+{
+    return DoMoveCursor(expandSelection,
+                        wxGridForwardOperations(this, wxGridColumnOperations()));
+}
 
-bool wxGrid::MovePageUp()
+bool wxGrid::DoMoveCursorByPage(const wxGridDirectionOperations& diroper)
 {
-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;
 
-    int row = m_currentCellCoords.GetRow();
-    if ( row > 0 )
-    {
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
+    if ( diroper.IsAtBoundary(m_currentCellCoords) )
+        return false;
 
-        int y = GetRowTop(row);
-        int newRow = YToRow( y - ch + 1 );
-        if ( newRow == -1 )
-        {
-            newRow = 0;
-        }
-        else if ( newRow == row )
-        {
-            newRow = row - 1;
-        }
+    const int oldRow = m_currentCellCoords.GetRow();
+    int newRow = diroper.MoveByPixelDistance(oldRow, m_gridWin->GetClientSize().y);
+    if ( newRow == oldRow )
+    {
+        wxGridCellCoords coords(m_currentCellCoords);
+        diroper.Advance(coords);
+        newRow = coords.GetRow();
+    }
 
-        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
-        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
+    GoToCell(newRow, m_currentCellCoords.GetCol());
 
-        return TRUE;
-    }
+    return true;
+}
 
-    return FALSE;
+bool wxGrid::MovePageUp()
+{
+    return DoMoveCursorByPage(
+                wxGridBackwardOperations(this, wxGridRowOperations()));
 }
 
 bool wxGrid::MovePageDown()
 {
-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
-
-    int row = m_currentCellCoords.GetRow();
-    if ( row < m_numRows )
-    {
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
-
-        int y = GetRowTop(row);
-        int newRow = YToRow( y + ch );
-        if ( newRow == -1 )
-        {
-            newRow = m_numRows - 1;
-        }
-        else if ( newRow == row )
-        {
-            newRow = row + 1;
-        }
-
-        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
-        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
-
-        return TRUE;
-    }
-
-    return FALSE;
+    return DoMoveCursorByPage(
+                wxGridForwardOperations(this, wxGridRowOperations()));
 }
 
-bool wxGrid::MoveCursorUpBlock( bool expandSelection )
+// helper of DoMoveCursorByBlock(): advance the cell coordinates using diroper
+// until we find a non-empty cell or reach the grid end
+void
+wxGrid::AdvanceToNextNonEmpty(wxGridCellCoords& coords,
+                              const wxGridDirectionOperations& diroper)
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() > 0 )
+    while ( !diroper.IsAtBoundary(coords) )
     {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
-
-        if ( m_table->IsEmptyCell(row, col) )
-        {
-            // starting in an empty cell: find the next block of
-            // non-empty cells
-            //
-            while ( row > 0 )
-            {
-                row-- ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else if ( m_table->IsEmptyCell(row-1, col) )
-        {
-            // starting at the top of a block: find the next block
-            //
-            row--;
-            while ( row > 0 )
-            {
-                row-- ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else
-        {
-            // starting within a block: find the top of the block
-            //
-            while ( row > 0 )
-            {
-                row-- ;
-                if ( m_table->IsEmptyCell(row, col) )
-                {
-                    row++ ;
-                    break;
-                }
-            }
-        }
-
-        MakeCellVisible( row, col );
-        if ( expandSelection )
-        {
-            m_selectingKeyboard = wxGridCellCoords( row, col );
-            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-        }
-        else
-        {
-            ClearSelection();
-            SetCurrentCell( row, col );
-        }
-        return TRUE;
+        diroper.Advance(coords);
+        if ( !m_table->IsEmpty(coords) )
+            break;
     }
-
-    return FALSE;
 }
 
-bool wxGrid::MoveCursorDownBlock( bool expandSelection )
+bool
+wxGrid::DoMoveCursorByBlock(bool expandSelection,
+                            const wxGridDirectionOperations& diroper)
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
-
-        if ( m_table->IsEmptyCell(row, col) )
-        {
-            // starting in an empty cell: find the next block of
-            // non-empty cells
-            //
-            while ( row < m_numRows-1 )
-            {
-                row++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else if ( m_table->IsEmptyCell(row+1, col) )
-        {
-            // starting at the bottom of a block: find the next block
-            //
-            row++;
-            while ( row < m_numRows-1 )
-            {
-                row++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else
-        {
-            // starting within a block: find the bottom of the block
-            //
-            while ( row < m_numRows-1 )
-            {
-                row++ ;
-                if ( m_table->IsEmptyCell(row, col) )
-                {
-                    row-- ;
-                    break;
-                }
-            }
-        }
+    if ( !m_table || m_currentCellCoords == wxGridNoCellCoords )
+        return false;
 
-        MakeCellVisible( row, col );
-        if ( expandSelection )
-        {
-            m_selectingKeyboard = wxGridCellCoords( row, col );
-            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-        }
-        else
-        {
-            ClearSelection();
-            SetCurrentCell( row, col );
-        }
+    if ( diroper.IsAtBoundary(m_currentCellCoords) )
+        return false;
 
-        return TRUE;
+    wxGridCellCoords coords(m_currentCellCoords);
+    if ( m_table->IsEmpty(coords) )
+    {
+        // we are in an empty cell: find the next block of non-empty cells
+        AdvanceToNextNonEmpty(coords, diroper);
     }
-
-    return FALSE;
-}
-
-bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
-{
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
+    else // current cell is not empty
     {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
-
-        if ( m_table->IsEmptyCell(row, col) )
-        {
-            // starting in an empty cell: find the next block of
-            // non-empty cells
-            //
-            while ( col > 0 )
-            {
-                col-- ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else if ( m_table->IsEmptyCell(row, col-1) )
+        diroper.Advance(coords);
+        if ( m_table->IsEmpty(coords) )
         {
-            // starting at the left of a block: find the next block
-            //
-            col--;
-            while ( col > 0 )
-            {
-                col-- ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
+            // we started at the end of a block, find the next one
+            AdvanceToNextNonEmpty(coords, diroper);
         }
-        else
+        else // we're in a middle of a block
         {
-            // starting within a block: find the left of the block
-            //
-            while ( col > 0 )
+            // go to the end of it, i.e. find the last cell before the next
+            // empty one
+            while ( !diroper.IsAtBoundary(coords) )
             {
-                col-- ;
-                if ( m_table->IsEmptyCell(row, col) )
-                {
-                    col++ ;
+                wxGridCellCoords coordsNext(coords);
+                diroper.Advance(coordsNext);
+                if ( m_table->IsEmpty(coordsNext) )
                     break;
-                }
-            }
-        }
 
-        MakeCellVisible( row, col );
-        if ( expandSelection )
-        {
-            m_selectingKeyboard = wxGridCellCoords( row, col );
-            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-        }
-        else
-        {
-            ClearSelection();
-            SetCurrentCell( row, col );
+                coords = coordsNext;
+            }
         }
+    }
 
-        return TRUE;
+    if ( expandSelection )
+    {
+        UpdateBlockBeingSelected(m_currentCellCoords, coords);
+    }
+    else
+    {
+        ClearSelection();
+        GoToCell(coords);
     }
 
-    return FALSE;
+    return true;
 }
 
-bool wxGrid::MoveCursorRightBlock( bool expandSelection )
+bool wxGrid::MoveCursorUpBlock(bool expandSelection)
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols-1 )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
-
-        if ( m_table->IsEmptyCell(row, col) )
-        {
-            // starting in an empty cell: find the next block of
-            // non-empty cells
-            //
-            while ( col < m_numCols-1 )
-            {
-                col++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else if ( m_table->IsEmptyCell(row, col+1) )
-        {
-            // starting at the right of a block: find the next block
-            //
-            col++;
-            while ( col < m_numCols-1 )
-            {
-                col++ ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else
-        {
-            // starting within a block: find the right of the block
-            //
-            while ( col < m_numCols-1 )
-            {
-                col++ ;
-                if ( m_table->IsEmptyCell(row, col) )
-                {
-                    col-- ;
-                    break;
-                }
-            }
-        }
-
-        MakeCellVisible( row, col );
-        if ( expandSelection )
-        {
-            m_selectingKeyboard = wxGridCellCoords( row, col );
-            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
-        }
-        else
-        {
-            ClearSelection();
-            SetCurrentCell( row, col );
-        }
-
-        return TRUE;
-    }
+    return DoMoveCursorByBlock(
+                expandSelection,
+                wxGridBackwardOperations(this, wxGridRowOperations())
+           );
+}
 
-    return FALSE;
+bool wxGrid::MoveCursorDownBlock( bool expandSelection )
+{
+    return DoMoveCursorByBlock(
+                expandSelection,
+                wxGridForwardOperations(this, wxGridRowOperations())
+           );
 }
 
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
+{
+    return DoMoveCursorByBlock(
+                expandSelection,
+                wxGridBackwardOperations(this, wxGridColumnOperations())
+           );
+}
 
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )
+{
+    return DoMoveCursorByBlock(
+                expandSelection,
+                wxGridForwardOperations(this, wxGridColumnOperations())
+           );
+}
 
 //
 // ------ Label values and formatting
 //
 
-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const
+{
+    if ( horiz )
+        *horiz = m_rowLabelHorizAlign;
+    if ( vert )
+        *vert  = m_rowLabelVertAlign;
+}
+
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const
 {
-    *horiz = m_rowLabelHorizAlign;
-    *vert  = m_rowLabelVertAlign;
+    if ( horiz )
+        *horiz = m_colLabelHorizAlign;
+    if ( vert )
+        *vert  = m_colLabelVertAlign;
 }
 
-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+int wxGrid::GetColLabelTextOrientation() const
 {
-    *horiz = m_colLabelHorizAlign;
-    *vert  = m_colLabelVertAlign;
+    return m_colLabelTextOrientation;
 }
 
-wxString wxGrid::GetRowLabelValue( int row )
+wxString wxGrid::GetRowLabelValue( int row ) const
 {
     if ( m_table )
     {
@@ -8273,7 +6679,7 @@ wxString wxGrid::GetRowLabelValue( int row )
     }
 }
 
-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const
 {
     if ( m_table )
     {
@@ -8287,66 +6693,77 @@ wxString wxGrid::GetColLabelValue( int col )
     }
 }
 
-
 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 )
         {
-            m_rowLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_rowLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );
         }
         else if ( m_rowLabelWidth == 0 )
         {
-            m_rowLabelWin->Show( TRUE );
-            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE );
+            m_rowLabelWin->Show( true );
+            if ( m_colLabelHeight > 0 )
+                m_cornerLabelWin->Show( true );
         }
 
         m_rowLabelWidth = width;
         CalcWindowSizes();
-        wxScrolledWindow::Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );
     }
 }
 
-
 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 )
         {
-            m_colLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_colWindow->Show( false );
+            m_cornerLabelWin->Show( false );
         }
         else if ( m_colLabelHeight == 0 )
         {
-            m_colLabelWin->Show( TRUE );
-            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE );
+            m_colWindow->Show( true );
+            if ( m_rowLabelWidth > 0 )
+                m_cornerLabelWin->Show( true );
         }
 
         m_colLabelHeight = height;
         CalcWindowSizes();
-        wxScrolledWindow::Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );
     }
 }
 
-
 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )
     {
         m_labelBackgroundColour = colour;
         m_rowLabelWin->SetBackgroundColour( colour );
-        m_colLabelWin->SetBackgroundColour( colour );
+        m_colWindow->SetBackgroundColour( colour );
         m_cornerLabelWin->SetBackgroundColour( colour );
 
         if ( !GetBatchCount() )
         {
             m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
+            m_colWindow->Refresh();
             m_cornerLabelWin->Refresh();
         }
     }
@@ -8360,7 +6777,7 @@ void wxGrid::SetLabelTextColour( const wxColour& colour )
         if ( !GetBatchCount() )
         {
             m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
+            m_colWindow->Refresh();
         }
     }
 }
@@ -8371,7 +6788,7 @@ void wxGrid::SetLabelFont( const wxFont& font )
     if ( !GetBatchCount() )
     {
         m_rowLabelWin->Refresh();
-        m_colLabelWin->Refresh();
+        m_colWindow->Refresh();
     }
 }
 
@@ -8437,10 +6854,26 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
 
     if ( !GetBatchCount() )
     {
-        m_colLabelWin->Refresh();
+        m_colWindow->Refresh();
     }
 }
 
+// Note: under MSW, the default column label font must be changed because it
+//       does not support vertical printing
+//
+// Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);
+//                      pGrid->SetLabelFont(font);
+//                      pGrid->SetColLabelTextOrientation(wxVERTICAL);
+//
+void wxGrid::SetColLabelTextOrientation( int textOrientation )
+{
+    if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
+        m_colLabelTextOrientation = textOrientation;
+
+    if ( !GetBatchCount() )
+        m_colWindow->Refresh();
+}
+
 void wxGrid::SetRowLabelValue( int row, const wxString& s )
 {
     if ( m_table )
@@ -8448,13 +6881,13 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
         m_table->SetRowLabelValue( row, s );
         if ( !GetBatchCount() )
         {
-            wxRect rect = CellToRect( row, 0);
+            wxRect rect = CellToRect( row, 0 );
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
                 rect.x = 0;
                 rect.width = m_rowLabelWidth;
-                m_rowLabelWin->Refresh( TRUE, &rect );
+                m_rowLabelWin->Refresh( true, &rect );
             }
         }
     }
@@ -8467,13 +6900,20 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
         m_table->SetColLabelValue( col, s );
         if ( !GetBatchCount() )
         {
-            wxRect rect = CellToRect( 0, col );
-            if ( rect.width > 0 )
+            if ( m_useNativeHeader )
             {
-                CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
-                rect.y = 0;
-                rect.height = m_colLabelHeight;
-                m_colLabelWin->Refresh( TRUE, &rect );
+                GetGridColHeader()->UpdateColumn(col);
+            }
+            else
+            {
+                wxRect rect = CellToRect( 0, col );
+                if ( rect.width > 0 )
+                {
+                    CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
+                    rect.y = 0;
+                    rect.height = m_colLabelHeight;
+                    GetColLabelWindow()->Refresh( true, &rect );
+                }
             }
         }
     }
@@ -8485,13 +6925,11 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
     {
         m_gridLineColour = colour;
 
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        DrawAllGridLines( dc, wxRegion() );
+        if ( GridLinesEnabled() )
+            RedrawGridLines();
     }
 }
 
-
 void wxGrid::SetCellHighlightColour( const wxColour& colour )
 {
     if ( m_cellHighlightColour != colour )
@@ -8508,33 +6946,56 @@ void wxGrid::SetCellHighlightColour( const wxColour& colour )
 
 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();
-        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
+
         wxRect rect = CellToRect(row, col);
-        m_gridWin->Refresh(TRUE, &rect);
+        m_gridWin->Refresh(true, &rect);
     }
 }
 
 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
         // 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;
+
         wxRect rect = CellToRect(row, col);
-        m_gridWin->Refresh(TRUE, &rect);
+        m_gridWin->Refresh(true, &rect);
+    }
+}
+
+void wxGrid::RedrawGridLines()
+{
+    // the lines will be redrawn when the window is thawn
+    if ( GetBatchCount() )
+        return;
+
+    if ( GridLinesEnabled() )
+    {
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        DrawAllGridLines( dc, wxRegion() );
+    }
+    else // remove the grid lines
+    {
+        m_gridWin->Refresh();
     }
 }
 
@@ -8544,43 +7005,41 @@ void wxGrid::EnableGridLines( bool enable )
     {
         m_gridLinesEnabled = enable;
 
-        if ( !GetBatchCount() )
-        {
-            if ( enable )
-            {
-                wxClientDC dc( m_gridWin );
-                PrepareDC( dc );
-                DrawAllGridLines( dc, wxRegion() );
-            }
-            else
-            {
-                m_gridWin->Refresh();
-            }
-        }
+        RedrawGridLines();
     }
 }
 
+void wxGrid::DoClipGridLines(bool& var, bool clip)
+{
+    if ( clip != var )
+    {
+        var = clip;
+
+        if ( GridLinesEnabled() )
+            RedrawGridLines();
+    }
+}
 
-int wxGrid::GetDefaultRowSize()
+int wxGrid::GetDefaultRowSize() const
 {
     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") );
+    wxCHECK_MSG( row >= 0 && row < m_numRows, 0, wxT("invalid row index") );
 
     return GetRowHeight(row);
 }
 
-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const
 {
     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, wxT("invalid column index") );
 
     return GetColWidth(col);
 }
@@ -8622,41 +7081,50 @@ void wxGrid::SetDefaultCellFont( const wxFont& font )
     m_defaultCellAttr->SetFont(font);
 }
 
+// For editors and renderers the type registry takes precedence over the
+// default attr, so we need to register the new editor/renderer for the string
+// data type in order to make setting a default editor/renderer appear to
+// work correctly.
+
 void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
 {
-    m_defaultCellAttr->SetRenderer(renderer);
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     renderer,
+                     GetDefaultEditorForType(wxGRID_VALUE_STRING));
 }
 
 void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 {
-    m_defaultCellAttr->SetEditor(editor);
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     GetDefaultRendererForType(wxGRID_VALUE_STRING),
+                     editor);
 }
 
 // ----------------------------------------------------------------------------
-// access to the default attrbiutes
+// access to the default attributes
 // ----------------------------------------------------------------------------
 
-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxColour wxGrid::GetDefaultCellBackgroundColour() const
 {
     return m_defaultCellAttr->GetBackgroundColour();
 }
 
-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const
 {
     return m_defaultCellAttr->GetTextColour();
 }
 
-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const
 {
     return m_defaultCellAttr->GetFont();
 }
 
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const
 {
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 
-bool wxGrid::GetDefaultCellOverflow()
+bool wxGrid::GetDefaultCellOverflow() const
 {
     return m_defaultCellAttr->GetOverflow();
 }
@@ -8668,60 +7136,74 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {
-    return m_defaultCellAttr->GetEditor(NULL,0,0);
+    return m_defaultCellAttr->GetEditor(NULL, 0, 0);
 }
 
 // ----------------------------------------------------------------------------
 // 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();
+
     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();
+
     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();
+
     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();
 }
 
-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();
+
     return allow;
 }
 
-void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+wxGrid::CellSpan
+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();
+
+    if ( *num_rows == 1 && *num_cols == 1 )
+        return CellSpan_None; // just a normal cell
+
+    if ( *num_rows < 0 || *num_cols < 0 )
+        return CellSpan_Inside; // covered by a multi-span cell
+
+    // this cell spans multiple cells to its right/bottom
+    return CellSpan_Main;
 }
 
-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);
@@ -8730,7 +7212,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
     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);
@@ -8744,6 +7226,7 @@ bool wxGrid::IsReadOnly(int row, int col) const
     wxGridCellAttr* attr = GetCellAttr(row, col);
     bool isReadOnly = attr->IsReadOnly();
     attr->DecRef();
+
     return isReadOnly;
 }
 
@@ -8751,11 +7234,11 @@ bool wxGrid::IsReadOnly(int row, int col) const
 // attribute support: cache, automatic provider creation, ...
 // ----------------------------------------------------------------------------
 
-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const
 {
     if ( !m_table )
     {
-        return FALSE;
+        return false;
     }
 
     return m_table->CanHaveAttributes();
@@ -8765,12 +7248,24 @@ void wxGrid::ClearAttrCache()
 {
     if ( m_attrCache.row != -1 )
     {
-        wxSafeDecRef(m_attrCache.attr);
+        wxGridCellAttr *oldAttr = m_attrCache.attr;
         m_attrCache.attr = NULL;
         m_attrCache.row = -1;
+        // wxSafeDecRec(...) might cause event processing that accesses
+        // the cached attribute, if one exists (e.g. by deleting the
+        // editor stored within the attribute). Therefore it is important
+        // to invalidate the cache  before calling wxSafeDecRef!
+        wxSafeDecRef(oldAttr);
     }
 }
 
+void wxGrid::RefreshAttr(int row, int col)
+{
+    if ( m_attrCache.row == row && m_attrCache.col == col )
+        ClearAttrCache();
+}
+
+
 void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {
     if ( attr != NULL )
@@ -8796,14 +7291,15 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
         gs_nAttrCacheHits++;
 #endif
 
-        return TRUE;
+        return true;
     }
     else
     {
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheMisses++;
 #endif
-        return FALSE;
+
+        return false;
     }
 }
 
@@ -8816,11 +7312,12 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
     {
         if ( !LookupAttr(row, col, &attr) )
         {
-            attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any)
-                           : (wxGridCellAttr *)NULL;
+            attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
+                           : NULL;
             CacheAttr(row, col, attr);
         }
     }
+
     if (attr)
     {
         attr->SetDefAttr(m_defaultCellAttr);
@@ -8836,10 +7333,11 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 
 wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    wxGridCellAttr *attr = NULL;
+    bool canHave = ((wxGrid*)this)->CanHaveAttributes();
 
-    wxCHECK_MSG( m_table, attr,
-                  _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
+    wxCHECK_MSG( canHave, attr, wxT("Cell attributes not allowed"));
+    wxCHECK_MSG( m_table, attr, wxT("must have a table") );
 
     attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
     if ( !attr )
@@ -8873,7 +7371,7 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision)
     wxString typeName = wxGRID_VALUE_FLOAT;
     if ( (width != -1) || (precision != -1) )
     {
-        typeName << _T(':') << width << _T(',') << precision;
+        typeName << wxT(':') << width << wxT(',') << precision;
     }
 
     SetColFormatCustom(col, typeName);
@@ -8881,13 +7379,13 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision)
 
 void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-
-    attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
-    if(!attr)
+    wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
+    if (!attr)
         attr = new wxGridCellAttr;
     wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
     attr->SetRenderer(renderer);
+    wxGridCellEditor *editor = GetDefaultEditorForType(typeName);
+    attr->SetEditor(editor);
 
     SetColAttr(col, attr);
 
@@ -9007,12 +7505,12 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
                       wxT("wxGrid::SetCellSize setting cell size to < 1"));
 
         // if this was already a multicell then "turn off" the other cells first
-        if ((cell_rows > 1) || (cell_rows > 1))
+        if ((cell_rows > 1) || (cell_cols > 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))
                     {
@@ -9029,14 +7527,14 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
         if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1))
         {
             int i, j;
-            for (j=row; j<row+num_rows; j++)
+            for (j=row; j < row + num_rows; j++)
             {
-                for (i=col; i<col+num_cols; i++)
+                for (i=col; i < col + num_cols; i++)
                 {
                     if ((i != col) || (j != row))
                     {
                         wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
-                        attr_stub->SetSize( row-j, col-i );
+                        attr_stub->SetSize( row - j, col - i );
                         attr_stub->DecRef();
                     }
                 }
@@ -9087,25 +7585,24 @@ void wxGrid::RegisterDataType(const wxString& typeName,
 }
 
 
-wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const
 {
     wxString typeName = m_table->GetTypeName(row, col);
     return GetDefaultEditorForType(typeName);
 }
 
-wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const
 {
     wxString typeName = m_table->GetTypeName(row, col);
     return GetDefaultRendererForType(typeName);
 }
 
-wxGridCellEditor*
-wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const
 {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
-        wxFAIL_MSG(wxT("Unknown data type name"));
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
 
         return NULL;
     }
@@ -9113,13 +7610,12 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const
     return m_typeRegistry->GetEditor(index);
 }
 
-wxGridCellRenderer*
-wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
-        wxFAIL_MSG(wxT("Unknown data type name"));
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
 
         return NULL;
     }
@@ -9127,17 +7623,31 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const
     return m_typeRegistry->GetRenderer(index);
 }
 
-
 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------
 
+void wxGrid::DoDisableLineResize(int line, wxGridFixedIndicesSet *& setFixed)
+{
+    if ( !setFixed )
+    {
+        setFixed = new wxGridFixedIndicesSet;
+    }
+
+    setFixed->insert(line);
+}
+
+bool
+wxGrid::DoCanResizeLine(int line, const wxGridFixedIndicesSet *setFixed) const
+{
+    return !setFixed || !setFixed->count(line);
+}
+
 void wxGrid::EnableDragRowSize( bool enable )
 {
     m_canDragRowSize = enable;
 }
 
-
 void wxGrid::EnableDragColSize( bool enable )
 {
     m_canDragColSize = enable;
@@ -9148,10 +7658,14 @@ void wxGrid::EnableDragGridSize( bool enable )
     m_canDragGridSize = enable;
 }
 
+void wxGrid::EnableDragCell( bool enable )
+{
+    m_canDragCell = enable;
+}
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
-    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
+    m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight );
 
     if ( resizeExistingRows )
     {
@@ -9168,7 +7682,24 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 
 void wxGrid::SetRowSize( int row, int height )
 {
-    wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+    wxCHECK_RET( row >= 0 && row < m_numRows, wxT("invalid row index") );
+
+    // if < 0 then calculate new height from label
+    if ( height < 0 )
+    {
+        long w, h;
+        wxArrayString lines;
+        wxClientDC dc(m_rowLabelWin);
+        dc.SetFont(GetLabelFont());
+        StringToLines(GetRowLabelValue( row ), lines);
+        GetTextBoxSize( dc, lines, &w, &h );
+        //check that it is not less than the minimal height
+        height = wxMax(h, GetRowMinimalAcceptableHeight());
+    }
+
+    // See comment in SetColSize
+    if ( height < GetRowMinimalAcceptableHeight())
+        return;
 
     if ( m_rowHeights.IsEmpty() )
     {
@@ -9180,18 +7711,19 @@ void wxGrid::SetRowSize( int row, int height )
     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;
     }
+
     if ( !GetBatchCount() )
         CalcDimensions();
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {
-    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+    // we dont allow zero default column width
+    m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );
 
     if ( resizeExistingCols )
     {
@@ -9208,9 +7740,32 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 
 void wxGrid::SetColSize( int col, int width )
 {
-    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
+    wxCHECK_RET( col >= 0 && col < m_numCols, wxT("invalid column index") );
 
-    // should we check that it's bigger than GetColMinimalWidth(col) here?
+    // if < 0 then calculate new width from label
+    if ( width < 0 )
+    {
+        long w, h;
+        wxArrayString lines;
+        wxClientDC dc(m_colWindow);
+        dc.SetFont(GetLabelFont());
+        StringToLines(GetColLabelValue(col), lines);
+        if ( GetColLabelTextOrientation() == wxHORIZONTAL )
+            GetTextBoxSize( dc, lines, &w, &h );
+        else
+            GetTextBoxSize( dc, lines, &h, &w );
+        width = w + 6;
+        //check that it is not less than the minimal width
+        width = wxMax(width, GetColMinimalAcceptableWidth());
+    }
+
+    // we intentionally don't test whether the width is less than
+    // GetColMinimalWidth() here but we do compare it with
+    // GetColMinimalAcceptableWidth() as otherwise things currently break (see
+    // #651) -- and we also always allow the width of 0 as it has the special
+    // sense of hiding the column
+    if ( width > 0 && width < GetColMinimalAcceptableWidth() )
+        return;
 
     if ( m_colWidths.IsEmpty() )
     {
@@ -9218,68 +7773,113 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
-    // if < 0 calc 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;
-    }
-    int w = wxMax( 0, width );
-    int diff = w - m_colWidths[col];
-    m_colWidths[col] = w;
+    const int diff = width - m_colWidths[col];
+    m_colWidths[col] = width;
+    if ( m_useNativeHeader )
+        GetGridColHeader()->UpdateColumn(col);
+    //else: will be refreshed when the header is redrawn
 
-    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();
+        Refresh();
+    }
 }
 
-
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
-    m_colMinWidths.Put(col, width);
+    if (width > GetColMinimalAcceptableWidth())
+    {
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+        m_colMinWidths[key] = width;
+    }
 }
 
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
-    m_rowMinHeights.Put(row, width);
+    if (width > GetRowMinimalAcceptableHeight())
+    {
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+        m_rowMinHeights[key] = width;
+    }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {
-    long value = m_colMinWidths.Get(col);
-    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
+    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;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {
-    long value = m_rowMinHeights.Get(row);
-    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+    wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
+
+    return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
+}
+
+void wxGrid::SetColMinimalAcceptableWidth( int width )
+{
+    // We do allow a width of 0 since this gives us
+    // an easy way to temporarily hiding columns.
+    if ( width >= 0 )
+        m_minAcceptableColWidth = width;
+}
+
+void wxGrid::SetRowMinimalAcceptableHeight( int height )
+{
+    // We do allow a height of 0 since this gives us
+    // an easy way to temporarily hiding rows.
+    if ( height >= 0 )
+        m_minAcceptableRowHeight = height;
+}
+
+int  wxGrid::GetColMinimalAcceptableWidth() const
+{
+    return m_minAcceptableColWidth;
+}
+
+int  wxGrid::GetRowMinimalAcceptableHeight() const
+{
+    return m_minAcceptableRowHeight;
 }
 
 // ----------------------------------------------------------------------------
 // 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);
 
-    // init both of them to avoid compiler warnings, even if weo nly need one
-    int row = -1,
-        col = -1;
+    // cancel editing of cell
+    HideCellEditControl();
+    SaveEditControlValue();
+
+    // initialize both of them just to avoid compiler warnings even if only
+    // really needs to be initialized here
+    int row,
+        col;
     if ( column )
+    {
+        row = -1;
         col = colOrRow;
+    }
     else
+    {
         row = colOrRow;
+        col = -1;
+    }
 
     wxCoord extent, extentMax = 0;
     int max = column ? m_numRows : m_numCols;
@@ -9290,17 +7890,44 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
         else
             col = rowOrCol;
 
-        wxGridCellAttr* attr = GetCellAttr(row, col);
-        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        // we need to account for the cells spanning multiple columns/rows:
+        // while they may need a lot of space, they don't need all of it in
+        // this column/row
+        int numRows, numCols;
+        const CellSpan span = GetCellSize(row, col, &numRows, &numCols);
+        if ( span == CellSpan_Inside )
+        {
+            // we need to get the size of the main cell, not of a cell hidden
+            // by it
+            row += numRows;
+            col += numCols;
+
+            // get the size of the main cell too
+            GetCellSize(row, col, &numRows, &numCols);
+        }
+
+        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 ( span != CellSpan_None )
             {
-                extentMax = extent;
+                // we spread the size of a spanning cell over all the cells it
+                // covers evenly -- this is probably not ideal but we can't
+                // really do much better here
+                //
+                // notice that numCols and numRows are never 0 as they
+                // correspond to the size of the main cell of the span and not
+                // of the cell inside it
+                extent /= column ? numCols : numRows;
             }
 
+            if ( extent > extentMax )
+                extentMax = extent;
+
             renderer->DecRef();
         }
 
@@ -9312,65 +7939,83 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     dc.SetFont( GetLabelFont() );
 
     if ( column )
-        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    {
+        dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );
+        if ( GetColLabelTextOrientation() == wxVERTICAL )
+            w = h;
+    }
     else
-        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+        dc.GetMultiLineTextExtent( GetRowLabelValue(row), &w, &h );
 
     extent = column ? w : h;
     if ( extent > extentMax )
-    {
         extentMax = extent;
-    }
 
     if ( !extentMax )
     {
         // empty column - give default extent (notice that if extentMax is less
-        // than default extent but != 0, it's ok)
+        // than default extent but != 0, it's OK)
         extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
     }
     else
     {
         if ( column )
-        {
             // leave some space around text
             extentMax += 10;
-        }
         else
-        {
             extentMax += 6;
-        }
     }
 
     if ( column )
     {
-        SetColSize(col, extentMax);
+        // Ensure automatic width is not less than minimal width. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetColSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+
+        SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {
-            int cw, ch, dummy;
-            m_gridWin->GetClientSize( &cw, &ch );
-            wxRect rect ( CellToRect( 0, col ) );
-            rect.y = 0;
-            CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
-            rect.width = cw - rect.x;
-            rect.height = m_colLabelHeight;
-            m_colLabelWin->Refresh( TRUE, &rect );
+            if ( m_useNativeHeader )
+            {
+                GetGridColHeader()->UpdateColumn(col);
+            }
+            else
+            {
+                int cw, ch, dummy;
+                m_gridWin->GetClientSize( &cw, &ch );
+                wxRect rect ( CellToRect( 0, col ) );
+                rect.y = 0;
+                CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+                rect.width = cw - rect.x;
+                rect.height = m_colLabelHeight;
+                GetColLabelWindow()->Refresh( true, &rect );
+            }
         }
     }
     else
     {
+        // Ensure automatic width is not less than minimal height. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetRowSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+
         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {
             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.height = ch - rect.y;
-            m_rowLabelWin->Refresh( TRUE, &rect );
+            m_rowLabelWin->Refresh( true, &rect );
         }
     }
+
     if ( setAsMin )
     {
         if ( column )
@@ -9380,26 +8025,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;
 
-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);
 
     for ( int col = 0; col < m_numCols; col++ )
     {
         if ( !calcOnly )
-        {
             AutoSizeColumn(col, setAsMin);
-        }
 
         width += GetColWidth(col);
     }
 
-    if ( !calcOnly )
-        EndBatch();
-
     return width;
 }
 
@@ -9407,112 +8101,83 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
     int height = m_colLabelHeight;
 
-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);
 
     for ( int row = 0; row < m_numRows; row++ )
     {
         if ( !calcOnly )
-        {
             AutoSizeRow(row, setAsMin);
-        }
 
         height += GetRowHeight(row);
     }
 
-    if ( !calcOnly )
-        EndBatch();
-
     return height;
 }
 
 void wxGrid::AutoSize()
 {
-    BeginBatch();
+    wxGridUpdateLocker locker(this);
 
-    wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+    wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
+                SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
 
-    // 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) * GRID_SCROLL_LINE_X,
-                   GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
+    // 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(m_xScrollPixelsPerLine, m_yScrollPixelsPerLine,
+                  0, 0, 0, 0, true);
 
-    // distribute the extra space between the columns/rows to avoid having
-    // extra white space
+    SetClientSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight);
+}
 
-    // Remove the extra m_extraWidth + 1 added above
-    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
-    if ( diff && m_numCols )
+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+    // Hide the edit control, so it
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
     {
-        // try to resize the columns uniformly
-        wxCoord diffPerCol = diff / m_numCols;
-        if ( diffPerCol )
-        {
-            for ( int col = 0; col < m_numCols; col++ )
-            {
-                SetColSize(col, GetColWidth(col) + diffPerCol);
-            }
-        }
-
-        // add remaining amount to the last columns
-        diff -= diffPerCol * m_numCols;
-        if ( diff )
-        {
-            for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- )
-            {
-                SetColSize(col, GetColWidth(col) + 1);
-            }
-        }
+        HideCellEditControl();
+        SaveEditControlValue();
     }
 
-    // same for rows
-    diff = sizeFit.y - size.y - (m_extraHeight + 1);
-    if ( diff && m_numRows )
-    {
-        // try to resize the columns uniformly
-        wxCoord diffPerRow = diff / m_numRows;
-        if ( diffPerRow )
-        {
-            for ( int row = 0; row < m_numRows; row++ )
-            {
-                SetRowSize(row, GetRowHeight(row) + diffPerRow);
-            }
-        }
+    // autosize row height depending on label text
+    SetRowSize(row, -1);
+    ForceRefresh();
+}
 
-        // add remaining amount to the last rows
-        diff -= diffPerRow * m_numRows;
-        if ( diff )
-        {
-            for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- )
-            {
-                SetRowSize(row, GetRowHeight(row) + 1);
-            }
-        }
+void wxGrid::AutoSizeColLabelSize( int col )
+{
+    // Hide the edit control, so it
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
+    {
+        HideCellEditControl();
+        SaveEditControlValue();
     }
 
-    EndBatch();
-
-    SetClientSize(sizeFit);
+    // autosize column width depending on label text
+    SetColSize(col, -1);
+    ForceRefresh();
 }
 
 wxSize wxGrid::DoGetBestSize() const
 {
-    // don't set sizes, only calculate them
     wxGrid *self = (wxGrid *)this;  // const_cast
 
-    int width, height;
-    width = self->SetOrCalcColumnSizes(TRUE);
-    height = self->SetOrCalcRowSizes(TRUE);
-
-    int maxwidth, maxheight;
-    wxDisplaySize( & maxwidth, & maxheight );
+    // 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);
 
-    if ( width > maxwidth ) width = maxwidth;
-    if ( height > maxheight ) height = maxheight;
+    // 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 wxSize( width, height );
+    return wxSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight)
+            + GetWindowBorderSize();
 }
 
 void wxGrid::Fit()
@@ -9520,7 +8185,6 @@ void wxGrid::Fit()
     AutoSize();
 }
 
-
 wxPen& wxGrid::GetDividerPen() const
 {
     return wxNullPen;
@@ -9542,7 +8206,7 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
             rect.x = 0;
             rect.width = m_gridWin->GetClientSize().GetWidth();
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
-            m_gridWin->Refresh( FALSE, &rect );
+            m_gridWin->Refresh( false, &rect );
         }
 
         if ( m_currentCellCoords.GetRow() == row &&
@@ -9558,96 +8222,92 @@ 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 )
 {
-    if ( IsSelection() && !addToSelected )
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
         ClearSelection();
 
-    if ( m_selection )
-        m_selection->SelectRow( row, FALSE, addToSelected );
+    m_selection->SelectRow(row);
 }
 
-
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
-    if ( IsSelection() && !addToSelected )
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
         ClearSelection();
 
-    if ( m_selection )
-        m_selection->SelectCol( col, FALSE, addToSelected );
+    m_selection->SelectCol(col);
 }
 
-
-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)
 {
-    if ( IsSelection() && !addToSelected )
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
         ClearSelection();
 
-    if ( m_selection )
-        m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
-                                  FALSE, addToSelected );
+    m_selection->SelectBlock(topRow, leftCol, bottomRow, rightCol);
 }
 
-
 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::DeselectLine(int line, const wxGridOperations& oper)
 {
     if ( !m_selection )
         return;
 
-    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+    const wxGridSelectionModes mode = m_selection->GetSelectionMode();
+    if ( mode == oper.GetSelectionMode() ||
+            mode == wxGrid::wxGridSelectRowsOrColumns )
     {
-        if ( m_selection->IsInSelection(row, 0 ) )
-            m_selection->ToggleCellSelection( row, 0);
+        const wxGridCellCoords c(oper.MakeCoords(line, 0));
+        if ( m_selection->IsInSelection(c) )
+            m_selection->ToggleCellSelection(c);
     }
-    else
+    else if ( mode != oper.Dual().GetSelectionMode() )
     {
-        int nCols = GetNumberCols();
-        for ( int i = 0; i < nCols ; i++ )
+        const int nOther = oper.Dual().GetNumberOfLines(this);
+        for ( int i = 0; i < nOther; i++ )
         {
-            if ( m_selection->IsInSelection(row, i ) )
-                m_selection->ToggleCellSelection( row, i);
+            const wxGridCellCoords c(oper.MakeCoords(line, i));
+            if ( m_selection->IsInSelection(c) )
+                m_selection->ToggleCellSelection(c);
         }
     }
+    //else: can only select orthogonal lines so no lines in this direction
+    //      could have been selected anyhow
 }
 
-void wxGrid::DeselectCol( int col )
+void wxGrid::DeselectRow(int row)
 {
-    if ( !m_selection )
-        return;
+    DeselectLine(row, wxGridRowOperations());
+}
 
-    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
-    {
-        if ( m_selection->IsInSelection(0, col ) )
-            m_selection->ToggleCellSelection( 0, col);
-    }
-    else
-    {
-        int nRows = GetNumberRows();
-        for ( int i = 0; i < nRows ; i++ )
-        {
-            if ( m_selection->IsInSelection(i, col ) )
-                m_selection->ToggleCellSelection(i, col);
-        }
-    }
+void wxGrid::DeselectCol(int col)
+{
+    DeselectLine(col, wxGridColumnOperations());
 }
 
 void wxGrid::DeselectCell( int row, int col )
@@ -9656,92 +8316,130 @@ void wxGrid::DeselectCell( int row, int col )
         m_selection->ToggleCellSelection(row, col);
 }
 
-bool wxGrid::IsSelection()
+bool wxGrid::IsSelection() const
 {
     return ( m_selection && (m_selection->IsSelection() ||
-             ( m_selectingTopLeft != wxGridNoCellCoords &&
-               m_selectingBottomRight != wxGridNoCellCoords) ) );
+             ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+               m_selectedBlockBottomRight != wxGridNoCellCoords) ) );
 }
 
 bool wxGrid::IsInSelection( int row, int col ) const
 {
     return ( m_selection && (m_selection->IsInSelection( row, col ) ||
-             ( row >= m_selectingTopLeft.GetRow() &&
-               col >= m_selectingTopLeft.GetCol() &&
-               row <= m_selectingBottomRight.GetRow() &&
-               col <= m_selectingBottomRight.GetCol() )) );
+             ( row >= m_selectedBlockTopLeft.GetRow() &&
+               col >= m_selectedBlockTopLeft.GetCol() &&
+               row <= m_selectedBlockBottomRight.GetRow() &&
+               col <= m_selectedBlockBottomRight.GetCol() )) );
 }
 
 wxGridCellCoordsArray wxGrid::GetSelectedCells() const
 {
-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+
     return m_selection->m_cellSelection;
 }
+
 wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
 {
-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+
     return m_selection->m_blockSelectionTopLeft;
 }
+
 wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
 {
-    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
+    }
+
     return m_selection->m_blockSelectionBottomRight;
 }
+
 wxArrayInt wxGrid::GetSelectedRows() const
 {
-    if (!m_selection) { wxArrayInt a; return a; }
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
+
     return m_selection->m_rowSelection;
 }
+
 wxArrayInt wxGrid::GetSelectedCols() const
 {
-    if (!m_selection) { wxArrayInt a; return a; }
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
+
     return m_selection->m_colSelection;
 }
 
-
 void wxGrid::ClearSelection()
 {
-    m_selectingTopLeft = wxGridNoCellCoords;
-    m_selectingBottomRight = wxGridNoCellCoords;
+    wxRect r1 = BlockToDeviceRect(m_selectedBlockTopLeft,
+                                  m_selectedBlockBottomRight);
+    wxRect r2 = BlockToDeviceRect(m_currentCellCoords,
+                                  m_selectedBlockCorner);
+
+    m_selectedBlockTopLeft =
+    m_selectedBlockBottomRight =
+    m_selectedBlockCorner = wxGridNoCellCoords;
+
+    if ( !r1.IsEmpty() )
+        RefreshRect(r1, false);
+    if ( !r2.IsEmpty() )
+        RefreshRect(r2, false);
+
     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,
-                                  const wxGridCellCoords &bottomRight )
+wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoordstopLeft,
+                                  const wxGridCellCoords& bottomRight ) const
 {
-    wxRect rect( wxGridNoCellRect );
-    wxRect cellRect;
-
-    cellRect = CellToRect( topLeft );
-    if ( cellRect != wxGridNoCellRect )
+    wxRect resultRect;
+    wxRect tempCellRect = CellToRect(topLeft);
+    if ( tempCellRect != wxGridNoCellRect )
     {
-        rect = cellRect;
+        resultRect = tempCellRect;
     }
     else
     {
-        rect = wxRect( 0, 0, 0, 0 );
+        resultRect = wxRect(0, 0, 0, 0);
     }
 
-    cellRect = CellToRect( bottomRight );
-    if ( cellRect != wxGridNoCellRect )
+    tempCellRect = CellToRect(bottomRight);
+    if ( tempCellRect != wxGridNoCellRect )
     {
-        rect += cellRect;
+        resultRect += tempCellRect;
     }
     else
     {
+        // If both inputs were "wxGridNoCellRect," then there's nothing to do.
         return wxGridNoCellRect;
     }
 
-    int i, j;
-    int left = rect.GetLeft();
-    int top = rect.GetTop();
-    int right = rect.GetRight();
-    int bottom = rect.GetBottom();
+    // Ensure that left/right and top/bottom pairs are in order.
+    int left = resultRect.GetLeft();
+    int top = resultRect.GetTop();
+    int right = resultRect.GetRight();
+    int bottom = resultRect.GetBottom();
 
     int leftCol = topLeft.GetCol();
     int topRow = topLeft.GetRow();
@@ -9750,106 +8448,173 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 
     if (left > right)
     {
-        i = left;
+        int tmp = left;
         left = right;
-        right = i;
-        i = leftCol;
-        leftCol=rightCol;
-        rightCol = i;
+        right = tmp;
+
+        tmp = leftCol;
+        leftCol = rightCol;
+        rightCol = tmp;
     }
 
     if (top > bottom)
     {
-        i = top;
+        int tmp = top;
         top = bottom;
-        bottom = i;
-        i = topRow;
+        bottom = tmp;
+
+        tmp = topRow;
         topRow = bottomRow;
-        bottomRow = i;
+        bottomRow = tmp;
     }
 
+    // The following loop is ONLY necessary to detect and handle merged cells.
+    int cw, ch;
+    m_gridWin->GetClientSize( &cw, &ch );
+
+    // Get the origin coordinates: notice that they will be negative if the
+    // grid is scrolled downwards/to the right.
+    int gridOriginX = 0;
+    int gridOriginY = 0;
+    CalcScrolledPosition(gridOriginX, gridOriginY, &gridOriginX, &gridOriginY);
 
-    for ( j = topRow; j <= bottomRow; j++ )
+    int onScreenLeftmostCol = internalXToCol(-gridOriginX);
+    int onScreenUppermostRow = internalYToRow(-gridOriginY);
+
+    int onScreenRightmostCol = internalXToCol(-gridOriginX + cw);
+    int onScreenBottommostRow = internalYToRow(-gridOriginY + ch);
+
+    // Bound our loop so that we only examine the portion of the selected block
+    // that is shown on screen. Therefore, we compare the Top-Left block values
+    // to the Top-Left screen values, and the Bottom-Right block values to the
+    // Bottom-Right screen values, choosing appropriately.
+    const int visibleTopRow = wxMax(topRow, onScreenUppermostRow);
+    const int visibleBottomRow = wxMin(bottomRow, onScreenBottommostRow);
+    const int visibleLeftCol = wxMax(leftCol, onScreenLeftmostCol);
+    const int visibleRightCol = wxMin(rightCol, onScreenRightmostCol);
+
+    for ( int j = visibleTopRow; j <= visibleBottomRow; j++ )
     {
-        for ( i = leftCol; i <= rightCol; i++ )
+        for ( int i = visibleLeftCol; i <= visibleRightCol; i++ )
         {
-            if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol))
+            if ( (j == visibleTopRow) || (j == visibleBottomRow) ||
+                    (i == visibleLeftCol) || (i == visibleRightCol) )
+            {
+                tempCellRect = CellToRect( j, i );
+
+                if (tempCellRect.x < left)
+                    left = tempCellRect.x;
+                if (tempCellRect.y < top)
+                    top = tempCellRect.y;
+                if (tempCellRect.x + tempCellRect.width > right)
+                    right = tempCellRect.x + tempCellRect.width;
+                if (tempCellRect.y + tempCellRect.height > bottom)
+                    bottom = tempCellRect.y + tempCellRect.height;
+            }
+            else
             {
-                cellRect = CellToRect( j, i );
-
-                if (cellRect.x < left)
-                    left = cellRect.x;
-                if (cellRect.y < top)
-                    top = cellRect.y;
-                if (cellRect.x + cellRect.width > right)
-                    right = cellRect.x + cellRect.width;
-                if (cellRect.y + cellRect.height > bottom)
-                    bottom = cellRect.y + cellRect.height;
+                i = visibleRightCol; // jump over inner cells.
             }
-            else i = rightCol; // jump over inner cells.
         }
     }
 
-    // convert to scrolled coords
-    //
+    // Convert to scrolled coords
     CalcScrolledPosition( left, top, &left, &top );
     CalcScrolledPosition( right, bottom, &right, &bottom );
 
-    int cw, ch;
-    m_gridWin->GetClientSize( &cw, &ch );
-
     if (right < 0 || bottom < 0 || left > cw || top > ch)
-        return wxRect( 0, 0, 0, 0);
+        return wxRect(0,0,0,0);
 
-    rect.SetLeft( wxMax(0, left) );
-    rect.SetTop( wxMax(0, top) );
-    rect.SetRight( wxMin(cw, right) );
-    rect.SetBottom( wxMin(ch, bottom) );
+    resultRect.SetLeft( wxMax(0, left) );
+    resultRect.SetTop( wxMax(0, top) );
+    resultRect.SetRight( wxMin(cw, right) );
+    resultRect.SetBottom( wxMin(ch, bottom) );
 
-    return rect;
+    return resultRect;
+}
+
+void wxGrid::DoSetSizes(const wxGridSizesInfo& sizeInfo,
+                        const wxGridOperations& oper)
+{
+    BeginBatch();
+    oper.SetDefaultLineSize(this, sizeInfo.m_sizeDefault, true);
+    const int numLines = oper.GetNumberOfLines(this);
+    for ( int i = 0; i < numLines; i++ )
+    {
+        int size = sizeInfo.GetSize(i);
+        if ( size != sizeInfo.m_sizeDefault)
+            oper.SetLineSize(this, i, size);
+    }
+    EndBatch();
 }
 
+void wxGrid::SetColSizes(const wxGridSizesInfo& sizeInfo)
+{
+    DoSetSizes(sizeInfo, wxGridColumnOperations());
+}
 
+void wxGrid::SetRowSizes(const wxGridSizesInfo& sizeInfo)
+{
+    DoSetSizes(sizeInfo, wxGridRowOperations());
+}
 
-//
-// ------ Grid event classes
-//
+wxGridSizesInfo::wxGridSizesInfo(int defSize, const wxArrayInt& allSizes)
+{
+    m_sizeDefault = defSize;
+    for ( size_t i = 0; i < allSizes.size(); i++ )
+    {
+        if ( allSizes[i] != defSize )
+            m_customSizes[i] = allSizes[i];
+    }
+}
+
+int wxGridSizesInfo::GetSize(unsigned pos) const
+{
+    wxUnsignedToIntHashMap::const_iterator it = m_customSizes.find(pos);
+
+    return it == m_customSizes.end() ? m_sizeDefault : it->second;
+}
+
+// ----------------------------------------------------------------------------
+// drop target
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+// this allow setting drop target directly on wxGrid
+void wxGrid::SetDropTarget(wxDropTarget *dropTarget)
+{
+    GetGridWindow()->SetDropTarget(dropTarget);
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+
+// ----------------------------------------------------------------------------
+// grid event classes
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
 
 wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
                           int row, int col, int x, int y, bool sel,
                           bool control, bool shift, bool alt, bool meta )
-        : wxNotifyEvent( type, id )
+        : wxNotifyEvent( type, id ),
+          wxKeyboardState(control, shift, alt, meta)
 {
-    m_row = row;
-    m_col = col;
-    m_x = x;
-    m_y = y;
-    m_selecting = sel;
-    m_control = control;
-    m_shift = shift;
-    m_alt = alt;
-    m_meta = meta;
+    Init(row, col, x, y, sel);
 
     SetEventObject(obj);
 }
 
-
 IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )
 
 wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
                                   int rowOrCol, int x, int y,
                                   bool control, bool shift, bool alt, bool meta )
-        : wxNotifyEvent( type, id )
+        : wxNotifyEvent( type, id ),
+          wxKeyboardState(control, shift, alt, meta)
 {
-    m_rowOrCol = rowOrCol;
-    m_x = x;
-    m_y = y;
-    m_control = control;
-    m_shift = shift;
-    m_alt = alt;
-    m_meta = meta;
+    Init(rowOrCol, x, y);
 
     SetEventObject(obj);
 }
@@ -9862,15 +8627,10 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
                                                const wxGridCellCoords& bottomRight,
                                                bool sel, bool control,
                                                bool shift, bool alt, bool meta )
-        : wxNotifyEvent( type, id )
+        : wxNotifyEvent( type, id ),
+          wxKeyboardState(control, shift, alt, meta)
 {
-    m_topLeft     = topLeft;
-    m_bottomRight = bottomRight;
-    m_selecting   = sel;
-    m_control     = control;
-    m_shift       = shift;
-    m_alt         = alt;
-    m_meta        = meta;
+    Init(topLeft, bottomRight, sel);
 
     SetEventObject(obj);
 }
@@ -9890,6 +8650,165 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
 }
 
 
-#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
+
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+        delete m_typeinfo[i];
+}
+
+void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
+                                          wxGridCellRenderer* renderer,
+                                          wxGridCellEditor* editor)
+{
+    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+
+    // is it already registered?
+    int loc = FindRegisteredDataType(typeName);
+    if ( loc != wxNOT_FOUND )
+    {
+        delete m_typeinfo[loc];
+        m_typeinfo[loc] = info;
+    }
+    else
+    {
+        m_typeinfo.Add(info);
+    }
+}
+
+int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)
+{
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( typeName == m_typeinfo[i]->m_typeName )
+        {
+            return i;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+{
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_STRING )
+        {
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
+        }
+        else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+        if ( typeName == wxGRID_VALUE_BOOL )
+        {
+            RegisterDataType(wxGRID_VALUE_BOOL,
+                             new wxGridCellBoolRenderer,
+                             new wxGridCellBoolEditor);
+        }
+        else
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_NUMBER )
+        {
+            RegisterDataType(wxGRID_VALUE_NUMBER,
+                             new wxGridCellNumberRenderer,
+                             new wxGridCellNumberEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_FLOAT )
+        {
+            RegisterDataType(wxGRID_VALUE_FLOAT,
+                             new wxGridCellFloatRenderer,
+                             new wxGridCellFloatEditor);
+        }
+        else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+        if ( typeName == wxGRID_VALUE_CHOICE )
+        {
+            RegisterDataType(wxGRID_VALUE_CHOICE,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellChoiceEditor);
+        }
+        else
+#endif // wxUSE_COMBOBOX
+        {
+            return wxNOT_FOUND;
+        }
+
+        // we get here only if just added the entry for this type, so return
+        // the last index
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
+{
+    int index = FindDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // the first part of the typename is the "real" type, anything after ':'
+        // are the parameters for the renderer
+        index = FindDataType(typeName.BeforeFirst(wxT(':')));
+        if ( index == wxNOT_FOUND )
+        {
+            return wxNOT_FOUND;
+        }
+
+        wxGridCellRenderer *renderer = GetRenderer(index);
+        wxGridCellRenderer *rendererOld = renderer;
+        renderer = renderer->Clone();
+        rendererOld->DecRef();
+
+        wxGridCellEditor *editor = GetEditor(index);
+        wxGridCellEditor *editorOld = editor;
+        editor = editor->Clone();
+        editorOld->DecRef();
+
+        // do it even if there are no parameters to reset them to defaults
+        wxString params = typeName.AfterFirst(wxT(':'));
+        renderer->SetParameters(params);
+        editor->SetParameters(params);
+
+        // register the new typename
+        RegisterDataType(typeName, renderer, editor);
+
+        // we just registered it, it's the last one
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+{
+    wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+    if (renderer)
+        renderer->IncRef();
+
+    return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+    wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+    if (editor)
+        editor->IncRef();
+
+    return editor;
+}
 
 #endif // wxUSE_GRID