Minor corrections to the documentations.

[wxWidgets.git] / src / generic / grid.cpp
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp

index 37688f30733fcf9979165376347445afd3ca64e7..d0675c4d8a2215fc8821925136a9c8fee5c0b222 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,605 +1,590 @@
  ///////////////////////////////////////////////////////////////////////////
  ///////////////////////////////////////////////////////////////////////////
-// Name:        grid.cpp
+// Name:        src/generic/grid.cpp
  // Purpose:     wxGrid and related classes
  // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
  // Purpose:     wxGrid and related classes
  // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
-// Modified by:
+// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
  // Created:     1/08/1999
  // RCS-ID:      $Id$
  // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
  // Created:     1/08/1999
  // RCS-ID:      $Id$
  // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+/*
+    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 precompilation, includes "wx/wx.h".
  #include "wx/wxprec.h"
  
  
  // For compilers that support precompilation, includes "wx/wx.h".
  #include "wx/wxprec.h"
  
-#include "wx/defs.h"
-
  #ifdef __BORLANDC__
      #pragma hdrstop
  #endif
  
  #ifdef __BORLANDC__
      #pragma hdrstop
  #endif
  
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-#include "gridg.cpp"
-#else
+#if wxUSE_GRID
+
+#include "wx/grid.h"
  
  #ifndef WX_PRECOMP
      #include "wx/utils.h"
      #include "wx/dcclient.h"
      #include "wx/settings.h"
      #include "wx/log.h"
  
  #ifndef WX_PRECOMP
      #include "wx/utils.h"
      #include "wx/dcclient.h"
      #include "wx/settings.h"
      #include "wx/log.h"
+    #include "wx/textctrl.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
  
  #endif
  
-// this include needs to be outside precomp for BCC
  #include "wx/textfile.h"
  #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"
-
-
-// ----------------------------------------------------------------------------
-// array classes
-// ----------------------------------------------------------------------------
-
-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+#include "wx/generic/gridsel.h"
+#include "wx/generic/gridctrl.h"
+#include "wx/generic/grideditors.h"
+#include "wx/generic/private/grid.h"
  
  
-struct wxGridCellWithAttr
-{
-    wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_)
-        : coords(row, col), attr(attr_)
-    {
-    }
+const char wxGridNameStr[] = "grid";
  
  
-    ~wxGridCellWithAttr()
-    {
-        attr->DecRef();
-    }
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
+#else
+    #define WXUNUSED_MOTIF(identifier)  identifier
+#endif
  
  
-    wxGridCellCoords coords;
-    wxGridCellAttr  *attr;
-};
+#if defined(__WXGTK__)
+    #define WXUNUSED_GTK(identifier)    WXUNUSED(identifier)
+#else
+    #define WXUNUSED_GTK(identifier)    identifier
+#endif
  
  
-WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+// Required for wxIs... functions
+#include <ctype.h>
  
  
-#include "wx/arrimpl.cpp"
+WX_DECLARE_HASH_SET_WITH_DECL(int, wxIntegerHash, wxIntegerEqual,
+                              wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV);
  
  
-WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
-WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
  
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
-// private classes
+// globals
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
  
-class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
+namespace
  {
  {
-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 OnKeyDown( wxKeyEvent& event );
-
-    DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
-{
-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 OnKeyDown( wxKeyEvent& event );
-
-    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 OnKeyDown( wxKeyEvent& event );
-    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 wxPanel
+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 OnMouseEvent( wxMouseEvent& event );
-    void OnKeyDown( 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);
+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 )
  BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
+    EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus )
      EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
      EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
+    EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
  END_EVENT_TABLE()
  
  END_EVENT_TABLE()
  
+BEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
+    EVT_HEADER_CLICK(wxID_ANY, wxGridHeaderCtrl::OnClick)
  
  
+    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
-// ----------------------------------------------------------------------------
-
-// this class stores attributes set for cells
-class WXDLLEXPORT wxGridCellAttrData
-{
-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;
-
-    wxGridCellWithAttrArray m_attrs;
-};
+    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 rows or columns
-class WXDLLEXPORT wxGridRowOrColAttrData
+wxGridOperations& wxGridRowOperations::Dual() const
  {
  {
-public:
-    ~wxGridRowOrColAttrData();
+    static wxGridColumnOperations s_colOper;
  
  
-    void SetAttr(wxGridCellAttr *attr, int rowOrCol);
-    wxGridCellAttr *GetAttr(int rowOrCol) const;
-    void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols );
-
-private:
-    wxArrayInt m_rowsOrCols;
-    wxArrayAttrs m_attrs;
-};
+    return s_colOper;
+}
  
  
-// NB: this is just a wrapper around 3 objects: one which stores cell
-//     attributes, and 2 others for row/col ones
-class WXDLLEXPORT wxGridCellAttrProviderData
+wxGridOperations& wxGridColumnOperations::Dual() const
  {
  {
-public:
-    wxGridCellAttrData m_cellAttrs;
-    wxGridRowOrColAttrData m_rowAttrs,
-                           m_colAttrs;
-};
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-#ifndef WXGRID_DRAW_LINES
-#define WXGRID_DRAW_LINES 1
-#endif
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-//#define DEBUG_ATTR_CACHE
-#ifdef DEBUG_ATTR_CACHE
-    static size_t gs_nAttrCacheHits = 0;
-    static size_t gs_nAttrCacheMisses = 0;
-#endif // DEBUG_ATTR_CACHE
-
-wxGridCellCoords wxGridNoCellCoords( -1, -1 );
-wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
-
-// scroll line size
-// TODO: fixed so far - make configurable later (and also different for x/y)
-static const size_t GRID_SCROLL_LINE = 10;
-
-// ============================================================================
-// implementation
-// ============================================================================
+    static wxGridRowOperations s_rowOper;
  
  
+    return s_rowOper;
+}
  
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
-// wxGridCellEditor
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
  
-wxGridCellEditor::wxGridCellEditor()
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
  {
  {
-    m_control = NULL;
+    // nothing to do
  }
  
  }
  
-
-wxGridCellEditor::~wxGridCellEditor()
+wxGridCellWorker::~wxGridCellWorker()
  {
  {
-    Destroy();
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// wxGridHeaderLabelsRenderer and related classes
+// ----------------------------------------------------------------------------
  
  
-void wxGridCellEditor::Destroy()
-{
-    if (m_control) {
-        m_control->Destroy();
-        m_control = NULL;
-    }
-}
-
-void wxGridCellEditor::Show(bool show)
+void wxGridHeaderLabelsRenderer::DrawLabel(const wxGrid& grid,
+                                           wxDC& dc,
+                                           const wxString& value,
+                                           const wxRect& rect,
+                                           int horizAlign,
+                                           int vertAlign,
+                                           int textOrientation) const
  {
  {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-    m_control->Show(show);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc.SetTextForeground(grid.GetLabelTextColour());
+    dc.SetFont(grid.GetLabelFont());
+    grid.DrawTextRectangle(dc, value, rect, horizAlign, vertAlign, textOrientation);
  }
  
  }
  
-void wxGridCellEditor::SetSize(const wxRect& rect)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-    m_control->SetSize(rect);
-}
  
  
-void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
+void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
+                                                wxDC& dc,
+                                                wxRect& rect) const
  {
  {
-    event.Skip();
-}
+    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());
  
  
+    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());
  
  
-void wxGridCellEditor::StartingKey(wxKeyEvent& event)
-{
+    rect.Deflate(2);
  }
  
  }
  
-
-
-wxGridCellTextEditor::wxGridCellTextEditor()
+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());
  
  
-void wxGridCellTextEditor::Create(wxWindow* parent,
-                                  wxWindowID id,
-                                  wxEvtHandler* evtHandler)
-{
-    m_control = new wxTextCtrl(parent, -1, "",
-                               wxDefaultPosition, wxDefaultSize
-#if defined(__WXMSW__)
-                               , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
-#endif
-        );
+    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);
  
  
-    if (evtHandler)
-        m_control->PushEventHandler(evtHandler);
+    rect.Deflate(2);
  }
  
  }
  
-
-void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid,
-                           wxGridCellAttr* attr)
+void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
+                                                   wxDC& dc,
+                                                   wxRect& rect) const
  {
  {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    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());
  
  
-    m_startValue = grid->GetTable()->GetValue(row, col);
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
-    ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
-    ((wxTextCtrl*)m_control)->SetFocus();
+    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);
  
  
-    // ???  Should we use attr and try to set colours and font?
+    rect.Deflate(2);
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// wxGridCellAttr
+// ----------------------------------------------------------------------------
  
  
-
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
-                                   wxGrid* grid, wxGridCellAttr* attr)
+void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
  {
  {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    m_isReadOnly = Unset;
  
  
-    bool changed = FALSE;
-    wxString value = ((wxTextCtrl*)m_control)->GetValue();
-    if (value != m_startValue)
-        changed = TRUE;
+    m_renderer = NULL;
+    m_editor = NULL;
  
  
-    if (changed)
-        grid->GetTable()->SetValue(row, col, value);
+    m_attrkind = wxGridCellAttr::Cell;
  
  
-    m_startValue = "";
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
+    m_sizeRows = m_sizeCols = 1;
+    m_overflow = UnsetOverflow;
  
  
-    return changed;
+    SetDefAttr(attrDefault);
  }
  
  }
  
-
-void wxGridCellTextEditor::Reset()
+wxGridCellAttr *wxGridCellAttr::Clone() const
  {
  {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
-    ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
-}
+    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);
  
  
-void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    attr->SetSize( m_sizeRows, m_sizeCols );
  
  
-    int code = event.KeyCode();
-    if (code >= 32 && code < 255) {
-        wxString st((char)code);
-        if (! event.ShiftDown())
-            st.LowerCase();
-        ((wxTextCtrl*)m_control)->AppendText(st);
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
      }
      }
-}
-
-
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
-{
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
-    // wxMotif needs a little extra help...
-    int pos = ((wxTextCtrl*)m_control)->GetInsertionPoint();
-    wxString s( ((wxTextCtrl*)m_control)->GetValue() );
-    s = s.Left(pos) + "\n" + s.Mid(pos);
-    ((wxTextCtrl*)m_control)->SetValue(s);
-    ((wxTextCtrl*)m_control)->SetInsertionPoint( pos );
-#else
-    // the other ports can handle a Return key press
-    //
-    event.Skip();
-#endif
-}
-
-
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
-{
-    switch ( event.KeyCode() )
+    if ( m_editor )
      {
      {
-        case WXK_ESCAPE:
-            m_editor->Reset();
-            m_grid->EnableCellEditControl(FALSE);
-            break;
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
  
  
-//          case WXK_UP:
-//          case WXK_DOWN:
-//          case WXK_LEFT:
-//          case WXK_RIGHT:
-//          case WXK_PRIOR:
-//          case WXK_NEXT:
-//          case WXK_SPACE:
-//          case WXK_HOME:
-//          case WXK_END:
-//              // send the event to the parent grid, skipping the
-//              // event if nothing happens
-//              //
-//              event.Skip( m_grid->ProcessEvent( event ) );
-//              break;
-
-        case WXK_TAB:
-        case WXK_RETURN:
-            if (!m_grid->ProcessEvent(event))
-                m_editor->HandleReturn(event);
-            break;
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
  
  
+    attr->SetOverflow( m_overflow == Overflow );
+    attr->SetKind( m_attrkind );
  
  
-        default:
-            event.Skip();
-    }
+    return attr;
  }
  
  }
  
-// ----------------------------------------------------------------------------
-// wxGridCellRenderer
-// ----------------------------------------------------------------------------
-
-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int row, int col,
-                              bool isSelected)
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
  {
  {
-    dc.SetBackgroundMode( wxSOLID );
+    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);
+    }
+    if ( !HasSize() && mergefrom->HasSize() )
+        mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
  
  
-    if ( isSelected )
+    // 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() )
      {
      {
-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+        m_renderer = mergefrom->m_renderer;
+        m_renderer->IncRef();
      }
      }
-    else
+    if ( !HasEditor() && mergefrom->HasEditor() )
      {
      {
-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+        m_editor =  mergefrom->m_editor;
+        m_editor->IncRef();
      }
      }
+    if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
+        SetReadOnly(mergefrom->IsReadOnly());
  
  
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle(rect);
+    if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
+        SetOverflow(mergefrom->GetOverflow());
+
+    SetDefAttr(mergefrom->m_defGridAttr);
  }
  
  }
  
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
-                                    wxGridCellAttr& attr,
-                                    wxDC& dc,
-                                    const wxRect& rectCell,
-                                    int row, int col,
-                                    bool isSelected)
+void wxGridCellAttr::SetSize(int num_rows, int num_cols)
  {
  {
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
-
-    // now we only have to draw the text
-    dc.SetBackgroundMode( wxTRANSPARENT );
+    // The size of a cell is normally 1,1
  
  
-    if ( isSelected )
-    {
-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
-    }
-    else
-    {
-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
-    }
-    dc.SetFont( attr.GetFont() );
+    // 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.
  
  
-    int hAlign, vAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
+    // Size of 0,0 is NOT valid, neither is <=0 and any positive value
  
  
-    wxRect rect = rectCell;
-    rect.x++;
-    rect.y++;
-    rect.width -= 2;
-    rect.height -= 2;
+    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"));
  
  
-    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                           rect, hAlign, vAlign);
+    m_sizeRows = num_rows;
+    m_sizeCols = num_cols;
  }
  
  }
  
-// ----------------------------------------------------------------------------
-// wxGridCellAttr
-// ----------------------------------------------------------------------------
-
  const wxColour& wxGridCellAttr::GetTextColour() const
  {
      if (HasTextColour())
  const wxColour& wxGridCellAttr::GetTextColour() const
  {
      if (HasTextColour())
+    {
          return m_colText;
          return m_colText;
-    else if (m_defGridAttr != this)
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
          return m_defGridAttr->GetTextColour();
          return m_defGridAttr->GetTextColour();
-    else {
+    }
+    else
+    {
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullColour;
      }
  }
  
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullColour;
      }
  }
  
-
  const wxColour& wxGridCellAttr::GetBackgroundColour() const
  {
      if (HasBackgroundColour())
  const wxColour& wxGridCellAttr::GetBackgroundColour() const
  {
      if (HasBackgroundColour())
+    {
          return m_colBack;
          return m_colBack;
-    else if (m_defGridAttr != this)
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
          return m_defGridAttr->GetBackgroundColour();
          return m_defGridAttr->GetBackgroundColour();
-    else {
+    }
+    else
+    {
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullColour;
      }
  }
  
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullColour;
      }
  }
  
-
  const wxFont& wxGridCellAttr::GetFont() const
  {
      if (HasFont())
  const wxFont& wxGridCellAttr::GetFont() const
  {
      if (HasFont())
+    {
          return m_font;
          return m_font;
-    else if (m_defGridAttr != this)
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
          return m_defGridAttr->GetFont();
          return m_defGridAttr->GetFont();
-    else {
+    }
+    else
+    {
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullFont;
      }
  }
  
          wxFAIL_MSG(wxT("Missing default cell attribute"));
          return wxNullFont;
      }
  }
  
-
  void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
  {
  void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
  {
-    if (HasAlignment()) {
-        if ( hAlign ) *hAlign = m_hAlign;
-        if ( vAlign ) *vAlign = m_vAlign;
+    if (HasAlignment())
+    {
+        if ( hAlign )
+            *hAlign = m_hAlign;
+        if ( vAlign )
+            *vAlign = m_vAlign;
      }
      }
-    else if (m_defGridAttr != this)
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
          m_defGridAttr->GetAlignment(hAlign, vAlign);
          m_defGridAttr->GetAlignment(hAlign, vAlign);
-    else {
+    }
+    else
+    {
          wxFAIL_MSG(wxT("Missing default cell attribute"));
      }
  }
  
          wxFAIL_MSG(wxT("Missing default cell attribute"));
      }
  }
  
+void wxGridCellAttr::GetNonDefaultAlignment(int *hAlign, int *vAlign) const
+{
+    if ( hAlign && m_hAlign != wxALIGN_INVALID )
+        *hAlign = m_hAlign;
+
+    if ( vAlign && m_vAlign != wxALIGN_INVALID )
+        *vAlign = m_vAlign;
+}
  
  
-wxGridCellRenderer* wxGridCellAttr::GetRenderer() const
+void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
  {
  {
-    if (HasRenderer())
-        return m_renderer;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetRenderer();
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return NULL;
+    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(const wxGrid* grid, int row, int col) const
+{
+    wxGridCellRenderer *renderer = NULL;
+
+    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);
+        }
+
+        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();
+            }
+        }
      }
      }
+
+    // we're supposed to always find something
+    wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));
+
+    return renderer;
  }
  
  }
  
-wxGridCellEditor* wxGridCellAttr::GetEditor() const
+// same as above, except for s/renderer/editor/g
+wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const
  {
  {
-    if (HasEditor())
-        return m_editor;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetEditor();
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return NULL;
+    wxGridCellEditor *editor = NULL;
+
+    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);
+        }
+
+        if ( editor == 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)
+                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;
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -608,18 +593,25 @@ wxGridCellEditor* wxGridCellAttr::GetEditor() const
  
  void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
  {
  
  void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
  {
+    // 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 )
      {
      int n = FindIndex(row, col);
      if ( n == wxNOT_FOUND )
      {
-        // add the attribute
-        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+        if ( attr )
+        {
+            // add the attribute
+            m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+        }
+        //else: nothing to do
      }
      }
-    else
+    else // we already have an attribute for this cell
      {
          if ( attr )
          {
              // change the attribute
      {
          if ( attr )
          {
              // change the attribute
-            m_attrs[(size_t)n].attr = attr;
+            m_attrs[(size_t)n].ChangeAttr(attr);
          }
          else
          {
          }
          else
          {
@@ -631,7 +623,7 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
  
  wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
  {
  
  wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
  {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    wxGridCellAttr *attr = NULL;
  
      int n = FindIndex(row, col);
      if ( n != wxNOT_FOUND )
  
      int n = FindIndex(row, col);
      if ( n != wxNOT_FOUND )
@@ -649,29 +641,30 @@ void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
      for ( size_t n = 0; n < count; n++ )
      {
          wxGridCellCoords& coords = m_attrs[n].coords;
      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--;
-               }
-           }
+        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(n);
+                    n--;
+                    count--;
+                }
+            }
          }
      }
  }
          }
      }
  }
@@ -682,29 +675,30 @@ void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
      for ( size_t n = 0; n < count; n++ )
      {
          wxGridCellCoords& coords = m_attrs[n].coords;
      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--;
-               }
-           }
+        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--;
+                }
+            }
          }
      }
  }
          }
      }
  }
@@ -730,7 +724,7 @@ int wxGridCellAttrData::FindIndex(int row, int col) const
  
  wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
  {
  
  wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
  {
-    size_t count = m_attrs.Count();
+    size_t count = m_attrs.GetCount();
      for ( size_t n = 0; n < count; n++ )
      {
          m_attrs[n]->DecRef();
      for ( size_t n = 0; n < count; n++ )
      {
          m_attrs[n]->DecRef();
@@ -739,7 +733,7 @@ wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
  
  wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
  {
  
  wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
  {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    wxGridCellAttr *attr = NULL;
  
      int n = m_rowsOrCols.Index(rowOrCol);
      if ( n != wxNOT_FOUND )
  
      int n = m_rowsOrCols.Index(rowOrCol);
      if ( n != wxNOT_FOUND )
@@ -753,26 +747,37 @@ wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
  
  void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
  {
  
  void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
  {
-    int n = m_rowsOrCols.Index(rowOrCol);
-    if ( n == wxNOT_FOUND )
+    int i = m_rowsOrCols.Index(rowOrCol);
+    if ( i == wxNOT_FOUND )
      {
      {
-        // add the attribute
-        m_rowsOrCols.Add(rowOrCol);
-        m_attrs.Add(attr);
-    }
-    else
+        if ( attr )
+        {
+            // store the new attribute, taking its ownership
+            m_rowsOrCols.Add(rowOrCol);
+            m_attrs.Add(attr);
+        }
+        // nothing to remove
+    }
+    else // we have an attribute for this row or column
      {
      {
+        size_t n = (size_t)i;
+
+        // 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 ( attr )
          {
          if ( attr )
          {
-            // change the attribute
-            m_attrs[(size_t)n] = attr;
+            // replace the attribute with the new one
+            m_attrs[n] = attr;
          }
          }
-        else
+        else // remove the attribute
          {
          {
-            // remove this attribute
-            m_attrs[(size_t)n]->DecRef();
-            m_rowsOrCols.RemoveAt((size_t)n);
-            m_attrs.RemoveAt((size_t)n);
+            m_rowsOrCols.RemoveAt(n);
+            m_attrs.RemoveAt(n);
          }
      }
  }
          }
      }
  }
@@ -783,25 +788,27 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols
      for ( size_t n = 0; n < count; n++ )
      {
          int & rowOrCol = m_rowsOrCols[n];
      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--;
-               }
-           }
+        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--;
+                }
+            }
          }
      }
  }
          }
      }
  }
@@ -812,7 +819,7 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols
  
  wxGridCellAttrProvider::wxGridCellAttrProvider()
  {
  
  wxGridCellAttrProvider::wxGridCellAttrProvider()
  {
-    m_data = (wxGridCellAttrProviderData *)NULL;
+    m_data = NULL;
  }
  
  wxGridCellAttrProvider::~wxGridCellAttrProvider()
  }
  
  wxGridCellAttrProvider::~wxGridCellAttrProvider()
@@ -825,25 +832,91 @@ void wxGridCellAttrProvider::InitData()
      m_data = new wxGridCellAttrProviderData;
  }
  
      m_data = new wxGridCellAttrProviderData;
  }
  
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+                                                wxGridCellAttr::wxAttrKind  kind ) const
  {
  {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    wxGridCellAttr *attr = NULL;
      if ( m_data )
      {
      if ( m_data )
      {
-        // first look for the attribute of this specific cell
-        attr = m_data->m_cellAttrs.GetAttr(row, col);
-
-        if ( !attr )
+        switch (kind)
          {
          {
-            // then look for the col attr (col attributes are more common than
-            // the row ones, hence they have priority)
-            attr = m_data->m_colAttrs.GetAttr(col);
-        }
+            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);
  
  
-        if ( !attr )
-        {
-            // finally try the row attributes
-            attr = m_data->m_rowAttrs.GetAttr(row);
+                    if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol))
+                    {
+                        // Two or more are non NULL
+                        attr = new wxGridCellAttr;
+                        attr->SetKind(wxGridCellAttr::Merged);
+
+                        // Order is 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)
+                        {
+                            if (attr)
+                                attr->DecRef();
+                            attr = attrcol;
+                        }
+                        if (attrcell)
+                        {
+                            if (attr)
+                                attr->DecRef();
+                            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;
          }
      }
  
          }
      }
  
@@ -881,7 +954,7 @@ void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows )
      {
          m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
  
      {
          m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
  
-       m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
+        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
      }
  }
  
      }
  }
  
@@ -891,25 +964,37 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
      {
          m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
  
      {
          m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
  
-       m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
      }
  }
  
      }
  }
  
+const wxGridColumnHeaderRenderer&
+wxGridCellAttrProvider::GetColumnHeaderRenderer(int WXUNUSED(col))
+{
+    return gs_defaultHeaderRenderers.colRenderer;
+}
+
+const wxGridRowHeaderRenderer&
+wxGridCellAttrProvider::GetRowHeaderRenderer(int WXUNUSED(row))
+{
+    return gs_defaultHeaderRenderers.rowRenderer;
+}
+
+const wxGridCornerHeaderRenderer& wxGridCellAttrProvider::GetCornerRenderer()
+{
+    return gs_defaultHeaderRenderers.cornerRenderer;
+}
+
  // ----------------------------------------------------------------------------
  // wxGridTableBase
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
  // wxGridTableBase
  // ----------------------------------------------------------------------------
  
-//////////////////////////////////////////////////////////////////////
-//
-// Abstract base class for grid data (the model)
-//
  IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
  
  IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
  
-
  wxGridTableBase::wxGridTableBase()
  {
  wxGridTableBase::wxGridTableBase()
  {
-    m_view = (wxGrid *) NULL;
-    m_attrProvider = (wxGridCellAttrProvider *) NULL;
+    m_view = NULL;
+    m_attrProvider = NULL;
  }
  
  wxGridTableBase::~wxGridTableBase()
  }
  
  wxGridTableBase::~wxGridTableBase()
@@ -923,25 +1008,38 @@ void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
      m_attrProvider = attrProvider;
  }
  
      m_attrProvider = attrProvider;
  }
  
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+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 )
  {
      if ( m_attrProvider )
-        return m_attrProvider->GetAttr(row, col);
+        return m_attrProvider->GetAttr(row, col, kind);
      else
      else
-        return (wxGridCellAttr *)NULL;
+        return NULL;
  }
  
  void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
  {
      if ( m_attrProvider )
      {
  }
  
  void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
  {
      if ( m_attrProvider )
      {
+        if ( attr )
+            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
          m_attrProvider->SetAttr(attr, row, col);
      }
      else
      {
          // as we take ownership of the pointer and don't store it, we must
          // free it now
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
      }
  }
  
      }
  }
  
@@ -949,13 +1047,14 @@ void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
  {
      if ( m_attrProvider )
      {
  {
      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
          m_attrProvider->SetRowAttr(attr, row);
      }
      else
      {
          // as we take ownership of the pointer and don't store it, we must
          // free it now
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
      }
  }
  
      }
  }
  
@@ -963,85 +1062,71 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
  {
      if ( m_attrProvider )
      {
  {
      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
          m_attrProvider->SetColAttr(attr, col);
      }
      else
      {
          // as we take ownership of the pointer and don't store it, we must
          // free it now
-        attr->SafeDecRef();
-    }
-}
-
-void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
-{
-    if ( m_attrProvider )
-    {
-        m_attrProvider->UpdateAttrRows( pos, numRows );
-    }
-}
-
-void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
-{
-    if ( m_attrProvider )
-    {
-        m_attrProvider->UpdateAttrCols( pos, numCols );
+        wxSafeDecRef(attr);
      }
  }
  
      }
  }
  
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
  {
  {
-    wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
-                    "but your derived table class does not override this function") );
+    wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-bool wxGridTableBase::AppendRows( size_t numRows )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
  {
  {
-    wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
  {
  {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
  {
  {
-    wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
-                  "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-bool wxGridTableBase::AppendCols( size_t numCols )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
  {
  {
-    wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
-                   "but your derived table class does not override this function"));
+    wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
  {
  {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
  
  
-    return FALSE;
+    return false;
  }
  
  }
  
-
  wxString wxGridTableBase::GetRowLabelValue( int row )
  {
      wxString s;
  wxString wxGridTableBase::GetRowLabelValue( int row )
  {
      wxString s;
-    s << row;
+
+    // RD: Starting the rows at zero confuses users,
+    // no matter how much it makes sense to us geeks.
+    s << row + 1;
+
      return s;
  }
  
      return s;
  }
  
@@ -1056,22 +1141,79 @@ wxString wxGridTableBase::GetColLabelValue( int col )
      unsigned int i, n;
      for ( n = 1; ; n++ )
      {
      unsigned int i, n;
      for ( n = 1; ; n++ )
      {
-        s += (_T('A') + (wxChar)( col%26 ));
-        col = col/26 - 1;
-        if ( col < 0 ) break;
+        s += (wxChar) (wxT('A') + (wxChar)(col % 26));
+        col = col / 26 - 1;
+        if ( col < 0 )
+            break;
      }
  
      // reverse the string...
      wxString s2;
      }
  
      // reverse the string...
      wxString s2;
-    for ( i = 0;  i < n;  i++ )
+    for ( i = 0; i < n; i++ )
      {
      {
-        s2 += s[n-i-1];
+        s2 += s[n - i - 1];
      }
  
      return s2;
  }
  
      }
  
      return s2;
  }
  
+wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return wxGRID_VALUE_STRING;
+}
+
+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) )
+{
+}
  
  //////////////////////////////////////////////////////////////////////
  //
  
  //////////////////////////////////////////////////////////////////////
  //
@@ -1081,7 +1223,7 @@ wxString wxGridTableBase::GetColLabelValue( int col )
  
  wxGridTableMessage::wxGridTableMessage()
  {
  
  wxGridTableMessage::wxGridTableMessage()
  {
-    m_table = (wxGridTableBase *) NULL;
+    m_table =  NULL;
      m_id = -1;
      m_comInt1 = -1;
      m_comInt2 = -1;
      m_id = -1;
      m_comInt1 = -1;
      m_comInt2 = -1;
@@ -1096,8 +1238,6 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
      m_comInt2 = commandInt2;
  }
  
      m_comInt2 = commandInt2;
  }
  
-
-
  //////////////////////////////////////////////////////////////////////
  //
  // A basic grid table for string data. An object of this class will
  //////////////////////////////////////////////////////////////////////
  //
  // A basic grid table for string data. An object of this class will
@@ -1111,67 +1251,42 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
  wxGridStringTable::wxGridStringTable()
          : wxGridTableBase()
  {
  wxGridStringTable::wxGridStringTable()
          : wxGridTableBase()
  {
+    m_numCols = 0;
  }
  
  wxGridStringTable::wxGridStringTable( int numRows, int numCols )
          : wxGridTableBase()
  {
  }
  
  wxGridStringTable::wxGridStringTable( int numRows, int numCols )
          : wxGridTableBase()
  {
-    int row, col;
+    m_numCols = numCols;
  
      m_data.Alloc( numRows );
  
      wxArrayString sa;
      sa.Alloc( numCols );
  
      m_data.Alloc( numRows );
  
      wxArrayString sa;
      sa.Alloc( numCols );
-    for ( col = 0;  col < numCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
-
-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
-}
-
-wxGridStringTable::~wxGridStringTable()
-{
-}
-
-long wxGridStringTable::GetNumberRows()
-{
-    return m_data.GetCount();
-}
+    sa.Add( wxEmptyString, numCols );
  
  
-long wxGridStringTable::GetNumberCols()
-{
-    if ( m_data.GetCount() > 0 )
-        return m_data[0].GetCount();
-    else
-        return 0;
+    m_data.Add( sa, numRows );
  }
  
  wxString wxGridStringTable::GetValue( int row, int col )
  {
  }
  
  wxString wxGridStringTable::GetValue( int row, int col )
  {
-    // TODO: bounds checking
-    //
+    wxCHECK_MSG( (row >= 0 && row < GetNumberRows()) &&
+                 (col >= 0 && col < GetNumberCols()),
+                 wxEmptyString,
+                 wxT("invalid row or column index in wxGridStringTable") );
+
      return m_data[row][col];
  }
  
      return m_data[row][col];
  }
  
-void wxGridStringTable::SetValue( int row, int col, const wxString& s )
+void wxGridStringTable::SetValue( int row, int col, const wxString& value )
  {
  {
-    // TODO: bounds checking
-    //
-    m_data[row][col] = s;
-}
+    wxCHECK_RET( (row >= 0 && row < GetNumberRows()) &&
+                 (col >= 0 && col < GetNumberCols()),
+                 wxT("invalid row or column index in wxGridStringTable") );
  
  
-bool wxGridStringTable::IsEmptyCell( int row, int col )
-{
-    // TODO: bounds checking
-    //
-    return (m_data[row][col] == wxEmptyString);
+    m_data[row][col] = value;
  }
  
  }
  
-
  void wxGridStringTable::Clear()
  {
      int row, col;
  void wxGridStringTable::Clear()
  {
      int row, col;
@@ -1182,9 +1297,9 @@ void wxGridStringTable::Clear()
      {
          numCols = m_data[0].GetCount();
  
      {
          numCols = m_data[0].GetCount();
  
-        for ( row = 0;  row < numRows;  row++ )
+        for ( row = 0; row < numRows; row++ )
          {
          {
-            for ( col = 0;  col < numCols;  col++ )
+            for ( col = 0; col < numCols; col++ )
              {
                  m_data[row][col] = wxEmptyString;
              }
              {
                  m_data[row][col] = wxEmptyString;
              }
@@ -1192,13 +1307,11 @@ void wxGridStringTable::Clear()
      }
  }
  
      }
  }
  
-
  bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
  {
  bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
  {
-    size_t row, col;
-
      size_t curNumRows = m_data.GetCount();
      size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
  
      if ( pos >= curNumRows )
      {
  
      if ( pos >= curNumRows )
      {
@@ -1207,16 +1320,9 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
  
      wxArrayString sa;
      sa.Alloc( curNumCols );
  
      wxArrayString sa;
      sa.Alloc( curNumCols );
-    for ( col = 0;  col < curNumCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
+    sa.Add( wxEmptyString, curNumCols );
+    m_data.Insert( sa, pos, numRows );
  
  
-    for ( row = pos;  row < pos + numRows;  row++ )
-    {
-        m_data.Insert( sa, row );
-    }
-    UpdateAttrRows( pos, numRows );
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
@@ -1227,30 +1333,24 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  bool wxGridStringTable::AppendRows( size_t numRows )
  {
  }
  
  bool wxGridStringTable::AppendRows( size_t numRows )
  {
-    size_t row, col;
-
      size_t curNumRows = m_data.GetCount();
      size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0
+                         ? m_data[0].GetCount()
+                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
  
      wxArrayString sa;
      if ( curNumCols > 0 )
      {
          sa.Alloc( curNumCols );
  
      wxArrayString sa;
      if ( curNumCols > 0 )
      {
          sa.Alloc( curNumCols );
-        for ( col = 0;  col < curNumCols;  col++ )
-        {
-            sa.Add( wxEmptyString );
-        }
+        sa.Add( wxEmptyString, curNumCols );
      }
  
      }
  
-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
+    m_data.Add( sa, numRows );
  
      if ( GetView() )
      {
  
      if ( GetView() )
      {
@@ -1261,23 +1361,24 @@ bool wxGridStringTable::AppendRows( size_t numRows )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
  {
  }
  
  bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
  {
-    size_t n;
-
      size_t curNumRows = m_data.GetCount();
  
      if ( pos >= curNumRows )
      {
      size_t curNumRows = m_data.GetCount();
  
      if ( pos >= curNumRows )
      {
-        wxString errmsg;
-        errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
-                      "Pos value is invalid for present table with %d rows",
-                      pos, numRows, curNumRows );
-        wxFAIL_MSG( wxT(errmsg) );
-        return FALSE;
+        wxFAIL_MSG( wxString::Format
+                    (
+                        wxT("Called wxGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"),
+                        (unsigned long)pos,
+                        (unsigned long)numRows,
+                        (unsigned long)curNumRows
+                    ) );
+
+        return false;
      }
  
      if ( numRows > curNumRows - pos )
      }
  
      if ( numRows > curNumRows - pos )
@@ -1287,16 +1388,13 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
  
      if ( numRows >= curNumRows )
      {
  
      if ( numRows >= curNumRows )
      {
-        m_data.Empty();  // don't release memory just yet
+        m_data.Clear();
      }
      else
      {
      }
      else
      {
-        for ( n = 0;  n < numRows;  n++ )
-        {
-            m_data.Remove( pos );
-        }
+        m_data.RemoveAt( pos, numRows );
      }
      }
-    UpdateAttrRows( pos, -numRows );
+
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
@@ -1307,7 +1405,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
  }
  
  bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
@@ -1315,21 +1413,34 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
      size_t row, col;
  
      size_t curNumRows = m_data.GetCount();
      size_t row, col;
  
      size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0
+                         ? m_data[0].GetCount()
+                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
  
      if ( pos >= curNumCols )
      {
          return AppendCols( numCols );
      }
  
  
      if ( pos >= curNumCols )
      {
          return AppendCols( numCols );
      }
  
-    for ( row = 0;  row < curNumRows;  row++ )
+    if ( !m_colLabels.IsEmpty() )
      {
      {
-        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_data[row].Insert( wxEmptyString, col );
          }
      }
-    UpdateAttrCols( pos, numCols );
+
+    m_numCols += numCols;
+
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
@@ -1340,31 +1451,22 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  bool wxGridStringTable::AppendCols( size_t numCols )
  {
  }
  
  bool wxGridStringTable::AppendCols( size_t numCols )
  {
-    size_t row, n;
+    size_t row;
  
      size_t curNumRows = m_data.GetCount();
  
      size_t curNumRows = m_data.GetCount();
-    if ( !curNumRows )
-    {
-        // TODO: something better than this ?
-        //
-        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
-                        "Call AppendRows() first") );
-        return FALSE;
-    }
  
  
-    for ( row = 0;  row < curNumRows;  row++ )
+    for ( row = 0; row < curNumRows; row++ )
      {
      {
-        for ( n = 0;  n < numCols;  n++ )
-        {
-            m_data[row].Add( wxEmptyString );
-        }
+        m_data[row].Add( wxEmptyString, numCols );
      }
  
      }
  
+    m_numCols += numCols;
+
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
@@ -1374,46 +1476,69 @@ bool wxGridStringTable::AppendCols( size_t numCols )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
  {
  }
  
  bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
  {
-    size_t row, n;
+    size_t row;
  
      size_t curNumRows = m_data.GetCount();
  
      size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
  
      if ( pos >= curNumCols )
      {
  
      if ( pos >= curNumCols )
      {
-        wxString errmsg;
-        errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
-                        "Pos value is invalid for present table with %d cols",
-                        pos, numCols, curNumCols );
-        wxFAIL_MSG( wxT( errmsg ) );
-        return FALSE;
+        wxFAIL_MSG( wxString::Format
+                    (
+                        wxT("Called wxGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"),
+                        (unsigned long)pos,
+                        (unsigned long)numCols,
+                        (unsigned long)curNumCols
+                    ) );
+        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();
          }
          {
              m_data[row].Clear();
          }
-        else
+
+        m_numCols = 0;
+    }
+    else // something will be left
+    {
+        for ( row = 0; row < curNumRows; row++ )
          {
          {
-            for ( n = 0;  n < numCols;  n++ )
-            {
-                m_data[row].Remove( pos );
-            }
+            m_data[row].RemoveAt( colID, numCols );
          }
          }
+
+        m_numCols -= numCols;
      }
      }
-    UpdateAttrCols( pos, -numCols );
+
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
      if ( GetView() )
      {
          wxGridTableMessage msg( this,
@@ -1424,7 +1549,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
          GetView()->ProcessTableMessage( msg );
      }
  
          GetView()->ProcessTableMessage( msg );
      }
  
-    return TRUE;
+    return true;
  }
  
  wxString wxGridStringTable::GetRowLabelValue( int row )
  }
  
  wxString wxGridStringTable::GetRowLabelValue( int row )
@@ -1437,7 +1562,7 @@ wxString wxGridStringTable::GetRowLabelValue( int row )
      }
      else
      {
      }
      else
      {
-        return m_rowLabels[ row ];
+        return m_rowLabels[row];
      }
  }
  
      }
  }
  
@@ -1451,7 +1576,7 @@ wxString wxGridStringTable::GetColLabelValue( int col )
      }
      else
      {
      }
      else
      {
-        return m_colLabels[ col ];
+        return m_colLabels[col];
      }
  }
  
      }
  }
  
@@ -1461,7 +1586,8 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
      {
          int n = m_rowLabels.GetCount();
          int i;
      {
          int n = m_rowLabels.GetCount();
          int i;
-        for ( i = n;  i <= row;  i++ )
+
+        for ( i = n; i <= row; i++ )
          {
              m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
          }
          {
              m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
          }
@@ -1476,7 +1602,8 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
      {
          int n = m_colLabels.GetCount();
          int i;
      {
          int n = m_colLabels.GetCount();
          int i;
-        for ( i = n;  i <= col;  i++ )
+
+        for ( i = n; i <= col; i++ )
          {
              m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
          }
          {
              m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
          }
@@ -1486,27 +1613,25 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
  }
  
  
  }
  
  
-
  //////////////////////////////////////////////////////////////////////
  //////////////////////////////////////////////////////////////////////
  
  //////////////////////////////////////////////////////////////////////
  //////////////////////////////////////////////////////////////////////
  
-IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
-    EVT_PAINT( wxGridRowLabelWindow::OnPaint )
-    EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+    EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
  END_EVENT_TABLE()
  
  END_EVENT_TABLE()
  
-wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
  {
  {
-    m_owner = parent;
+    m_owner->CancelMouseCapture();
  }
  
  }
  
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+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);
  
  {
      wxPaintDC dc(this);
  
@@ -1518,48 +1643,33 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
  
      int x, y;
      m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
  
      int x, y;
      m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
-    dc.SetDeviceOrigin( 0, -y );
+    wxPoint pt = dc.GetDeviceOrigin();
+    dc.SetDeviceOrigin( pt.x, pt.y-y );
  
  
-    m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawRowLabels( dc );
+    wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawRowLabels( dc, rows );
  }
  
  }
  
-
  void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessRowLabelMouseEvent( event );
  }
  
  void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessRowLabelMouseEvent( event );
  }
  
-
-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
  {
  {
-    if ( !m_owner->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_PAINT( wxGridColLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
      EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
      EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
  END_EVENT_TABLE()
  
  END_EVENT_TABLE()
  
-wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
-{
-    m_owner = parent;
-}
-
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
      wxPaintDC dc(this);
  
  {
      wxPaintDC dc(this);
  
@@ -1571,450 +1681,770 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
  
      int x, y;
      m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
  
      int x, y;
      m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
-    dc.SetDeviceOrigin( -x, 0 );
+    wxPoint pt = dc.GetDeviceOrigin();
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+        dc.SetDeviceOrigin( pt.x+x, pt.y );
+    else
+        dc.SetDeviceOrigin( pt.x-x, pt.y );
  
  
-    m_owner->CalcColLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawColLabels( dc );
+    wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawColLabels( dc, cols );
  }
  
  }
  
-
  void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessColLabelMouseEvent( event );
  }
  
  void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessColLabelMouseEvent( 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 )
+void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
  {
  {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+        event.Skip();
  }
  
  }
  
-
-
  //////////////////////////////////////////////////////////////////////
  
  //////////////////////////////////////////////////////////////////////
  
-IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
+    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
      EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
      EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
-    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
-    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
  END_EVENT_TABLE()
  
  END_EVENT_TABLE()
  
-wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
-                                                  wxWindowID id,
-                                                  const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
-{
-    m_owner = parent;
-}
-
  void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
      wxPaintDC dc(this);
  
  void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
      wxPaintDC dc(this);
  
-    int client_height = 0;
-    int client_width = 0;
-    GetClientSize( &client_width, &client_height );
-
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
-    dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
-
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 0, 0, client_width, 0 );
-    dc.DrawLine( 0, 0, 0, client_height );
+    m_owner->DrawCornerLabel(dc);
  }
  
  }
  
-
  void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessCornerLabelMouseEvent( event );
  }
  
  void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
  {
      m_owner->ProcessCornerLabelMouseEvent( 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 )
+void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
  {
  {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if (!m_owner->GetEventHandler()->ProcessEvent(event))
+        event.Skip();
  }
  
  }
  
-
-
  //////////////////////////////////////////////////////////////////////
  
  //////////////////////////////////////////////////////////////////////
  
-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
-
-BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
+BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
      EVT_PAINT( wxGridWindow::OnPaint )
      EVT_PAINT( wxGridWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
      EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
      EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
      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()
  
      EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
  END_EVENT_TABLE()
  
-wxGridWindow::wxGridWindow( wxGrid *parent,
-                            wxGridRowLabelWindow *rowLblWin,
-                            wxGridColLabelWindow *colLblWin,
-                            wxWindowID id, const wxPoint &pos, const wxSize &size )
-        : wxPanel( parent, id, pos, size, 0, "grid window" )
-{
-    m_owner = parent;
-    m_rowLabelWin = rowLblWin;
-    m_colLabelWin = colLblWin;
-    SetBackgroundColour( "WHITE" );
-}
-
-
-wxGridWindow::~wxGridWindow()
-{
-}
-
-
  void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
  {
      wxPaintDC dc( this );
      m_owner->PrepareDC( dc );
      wxRegion reg = GetUpdateRegion();
  void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
  {
      wxPaintDC dc( this );
      m_owner->PrepareDC( dc );
      wxRegion reg = GetUpdateRegion();
-    m_owner->CalcCellsExposed( reg );
-    m_owner->DrawGridCellArea( dc );
-#if WXGRID_DRAW_LINES
+    wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc, dirtyCells );
+
+    m_owner->DrawGridSpace( dc );
+
      m_owner->DrawAllGridLines( dc, reg );
      m_owner->DrawAllGridLines( dc, reg );
-#endif
-}
  
  
+    m_owner->DrawHighlight( dc, dirtyCells );
+}
  
  void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
  {
  
  void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
  {
-    wxPanel::ScrollWindow( dx, dy, rect );
-    m_rowLabelWin->ScrollWindow( 0, dy, rect );
-    m_colLabelWin->ScrollWindow( dx, 0, rect );
+    wxWindow::ScrollWindow( dx, dy, rect );
+    m_owner->GetGridRowLabelWindow()->ScrollWindow( 0, dy, rect );
+    m_owner->GetGridColLabelWindow()->ScrollWindow( dx, 0, rect );
  }
  
  }
  
-
  void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
  {
  void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
  {
+    if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
+        SetFocus();
+
      m_owner->ProcessGridCellMouseEvent( event );
  }
  
      m_owner->ProcessGridCellMouseEvent( event );
  }
  
+void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+        event.Skip();
+}
  
  
-// This seems to be required for wxMotif otherwise the mouse
+// This seems to be required for wxMotif/wxGTK otherwise the mouse
  // cursor must be in the cell edit control to get key events
  //
  void wxGridWindow::OnKeyDown( wxKeyEvent& event )
  {
  // cursor must be in the cell edit control to get key events
  //
  void wxGridWindow::OnKeyDown( wxKeyEvent& event )
  {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
  }
  
  }
  
-void wxGridWindow::OnEraseBackground(wxEraseEvent&)
-{ }
-
-
-
+void wxGridWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
+}
  
  
-//////////////////////////////////////////////////////////////////////
+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.
+
+        // 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);
+    }
+
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
+}
+
+#define internalXToCol(x) XToCol(x, true)
+#define internalYToRow(y) YToRow(y, 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 )
  IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
+#endif
  
  BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
      EVT_PAINT( wxGrid::OnPaint )
      EVT_SIZE( wxGrid::OnSize )
      EVT_KEY_DOWN( wxGrid::OnKeyDown )
  
  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()
  
      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, name )
+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();
      Create();
+    SetInitialSize(size);
+    SetScrollRate(m_scrollLineX, m_scrollLineY);
+    CalcDimensions();
+
+    return true;
  }
  
  }
  
-
  wxGrid::~wxGrid()
  {
  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();
      ClearAttrCache();
-    m_defaultCellAttr->SafeDecRef();
+    wxSafeDecRef(m_defaultCellAttr);
  
  #ifdef DEBUG_ATTR_CACHE
      size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
  
  #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
  
                  "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;
          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
  //
  
  
  //
  // ----- 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()
  {
  void wxGrid::Create()
  {
-    m_created = FALSE;    // set to TRUE by CreateGrid
-    m_displayed = TRUE; // FALSE;  // set to TRUE by OnPaint
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
  
  
-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = FALSE;
+    m_cellEditCtrlEnabled = false;
  
  
-    m_cellEditCtrlEnabled = FALSE;
+    m_defaultCellAttr = new wxGridCellAttr();
  
  
-    m_defaultCellAttr = new wxGridCellAttr;
+    // Set default cell attributes
      m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
      m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
-    // RD:  Should we fill the default attrs now or is waiting until Init() okay?
+    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));
+#endif
  
      m_numRows = 0;
      m_numCols = 0;
      m_currentCellCoords = wxGridNoCellCoords;
  
  
      m_numRows = 0;
      m_numCols = 0;
      m_currentCellCoords = wxGridNoCellCoords;
  
-    m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+    // subwindow components that make up the wxGrid
+    m_rowLabelWin = new wxGridRowLabelWindow(this);
+    CreateColumnWindow();
+    m_cornerLabelWin = new wxGridCornerLabelWindow(this);
+    m_gridWin = new wxGridWindow( this );
  
  
-    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-                                                    -1,
-                                                    wxDefaultPosition,
-                                                    wxDefaultSize );
+    SetTargetWindow( m_gridWin );
  
  
-    m_rowLabelWin = new wxGridRowLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
+#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_colLabelWin = new wxGridColLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
+    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 = new wxGridWindow( this,
-                                  m_rowLabelWin,
-                                  m_colLabelWin,
-                                  -1,
-                                  wxDefaultPosition,
-                                  wxDefaultSize );
+    m_gridWin->SetOwnForegroundColour(gfg);
+    m_gridWin->SetOwnBackgroundColour(gbg);
  
  
-    SetTargetWindow( m_gridWin );
-}
+    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
  
  
+}
  
  
-bool wxGrid::CreateGrid( int numRows, int numCols )
+void wxGrid::CreateColumnWindow()
  {
  {
-    if ( m_created )
+    if ( m_useNativeHeader )
      {
      {
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
+        m_colWindow = new wxGridHeaderCtrl(this);
+        m_colLabelHeight = m_colWindow->GetBestSize().y;
      }
      }
-    else
+    else // draw labels ourselves
      {
      {
-        m_numRows = numRows;
-        m_numCols = numCols;
-
-        m_table = new wxGridStringTable( m_numRows, m_numCols );
-        m_table->SetView( this );
-        m_ownTable = TRUE;
-        Init();
-        m_created = TRUE;
+        m_colWindow = new wxGridColLabelWindow(this);
+        m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
      }
      }
+}
  
  
-    return m_created;
+bool wxGrid::CreateGrid( int numRows, int numCols,
+                         wxGridSelectionModes selmode )
+{
+    wxCHECK_MSG( !m_created,
+                 false,
+                 wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
+
+    return SetTable(new wxGridStringTable(numRows, numCols), true, selmode);
+}
+
+void wxGrid::SetSelectionMode(wxGridSelectionModes selmode)
+{
+    wxCHECK_RET( m_created,
+                 wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+
+    m_selection->SetSelectionMode( selmode );
+}
+
+wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
+{
+    wxCHECK_MSG( m_created, wxGridSelectCells,
+                 wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
+
+    return m_selection->GetSelectionMode();
  }
  
  }
  
-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
+bool
+wxGrid::SetTable(wxGridTableBase *table,
+                 bool takeOwnership,
+                 wxGrid::wxGridSelectionModes selmode )
  {
  {
+    bool checkSelection = false;
      if ( m_created )
      {
      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 implmentation 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;
+        }
  
  
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
+        delete m_selection;
+        m_selection = NULL;
+
+        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();
  
      {
          m_numRows = table->GetNumberRows();
          m_numCols = table->GetNumberCols();
  
+        if ( m_useNativeHeader )
+            GetGridColHeader()->SetColumnCount(m_numCols);
+
          m_table = table;
          m_table->SetView( this );
          m_table = table;
          m_table->SetView( this );
-        if (takeOwnership)
-            m_ownTable = TRUE;
-        Init();
-        m_created = 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;
      }
  
      return m_created;
  }
  
      }
  
      return m_created;
  }
  
-
  void wxGrid::Init()
  {
  void wxGrid::Init()
  {
-    int i;
+    m_created = false;
+
+    m_cornerLabelWin = NULL;
+    m_rowLabelWin = NULL;
+    m_colWindow = NULL;
+    m_gridWin = NULL;
  
  
-    if ( m_numRows <= 0 )
-        m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
+    m_table = NULL;
+    m_ownTable = false;
  
  
-    if ( m_numCols <= 0 )
-        m_numCols = WXGRID_DEFAULT_NUMBER_COLS;
+    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;
  
  
      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;
  
      // 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.SetWeight( m_labelFont.GetWeight() + 2 );
+    m_labelFont = GetFont();
+    m_labelFont.SetWeight( wxBOLD );
  
  
-    m_rowLabelHorizAlign = wxLEFT;
-    m_rowLabelVertAlign  = wxCENTRE;
+    m_rowLabelHorizAlign = wxALIGN_CENTRE;
+    m_rowLabelVertAlign  = wxALIGN_CENTRE;
  
  
-    m_colLabelHorizAlign = wxCENTRE;
-    m_colLabelVertAlign  = wxTOP;
+    m_colLabelHorizAlign = wxALIGN_CENTRE;
+    m_colLabelVertAlign  = wxALIGN_CENTRE;
+    m_colLabelTextOrientation = wxHORIZONTAL;
  
      m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
  
      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_gridLinesClipHorz =
+    m_gridLinesClipVert = true;
+    m_cellHighlightColour = *wxBLACK;
+    m_cellHighlightPenWidth = 2;
+    m_cellHighlightROPenWidth = 1;
+
+    m_canDragColMove = false;
+
+    m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
+    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_startDragPos = wxDefaultPosition;
+
+    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_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_inOnKeyDown = false;
+    m_batchCount = 0;
+
+    m_extraWidth =
+    m_extraHeight = 0;
+
+    m_scrollLineX = GRID_SCROLL_LINE_X;
+    m_scrollLineY = GRID_SCROLL_LINE_Y;
+}
+
+// ----------------------------------------------------------------------------
+// the idea is to call these functions only when necessary because they create
+// quite big arrays which eat memory mostly unnecessary - in particular, if
+// 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 (resulting in space savings for huge grids) but
+// this is not done currently
+// ----------------------------------------------------------------------------
+
+void wxGrid::InitRowHeights()
+{
+    m_rowHeights.Empty();
+    m_rowBottoms.Empty();
  
      m_rowHeights.Alloc( m_numRows );
      m_rowBottoms.Alloc( m_numRows );
  
      m_rowHeights.Alloc( m_numRows );
      m_rowBottoms.Alloc( m_numRows );
+
+    m_rowHeights.Add( m_defaultRowHeight, m_numRows );
+
      int rowBottom = 0;
      int rowBottom = 0;
-    for ( i = 0;  i < m_numRows;  i++ )
+    for ( int i = 0; i < m_numRows; i++ )
      {
      {
-        m_rowHeights.Add( m_defaultRowHeight );
          rowBottom += m_defaultRowHeight;
          m_rowBottoms.Add( rowBottom );
      }
          rowBottom += m_defaultRowHeight;
          m_rowBottoms.Add( rowBottom );
      }
+}
+
+void wxGrid::InitColWidths()
+{
+    m_colWidths.Empty();
+    m_colRights.Empty();
  
      m_colWidths.Alloc( m_numCols );
      m_colRights.Alloc( m_numCols );
  
      m_colWidths.Alloc( m_numCols );
      m_colRights.Alloc( m_numCols );
-    int colRight = 0;
-    for ( i = 0;  i < m_numCols;  i++ )
+
+    m_colWidths.Add( m_defaultColWidth, m_numCols );
+
+    for ( int i = 0; i < m_numCols; i++ )
      {
      {
-        m_colWidths.Add( m_defaultColWidth );
-        colRight += m_defaultColWidth;
+        int colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
          m_colRights.Add( colRight );
      }
          m_colRights.Add( colRight );
      }
+}
  
  
-    // Set default cell attributes
-    m_defaultCellAttr->SetFont(GetFont());
-    m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
-    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
-    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
-    m_defaultCellAttr->SetTextColour(
-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
-    m_defaultCellAttr->SetBackgroundColour(
-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+int wxGrid::GetColWidth(int col) const
+{
+    return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col];
+}
  
  
+int wxGrid::GetColLeft(int col) const
+{
+    return m_colRights.IsEmpty() ? GetColPos( col ) * m_defaultColWidth
+                                 : m_colRights[col] - m_colWidths[col];
+}
  
  
-    m_gridLineColour = wxColour( 128, 128, 255 );
-    m_gridLinesEnabled = TRUE;
+int wxGrid::GetColRight(int col) const
+{
+    return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth
+                                 : m_colRights[col];
+}
  
  
-    m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
-    m_winCapture = (wxWindow *)NULL;
-    m_dragLastPos  = -1;
-    m_dragRowOrCol = -1;
-    m_isDragging = FALSE;
-    m_startDragPos = wxDefaultPosition;
+int wxGrid::GetRowHeight(int row) const
+{
+    return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row];
+}
  
  
-    m_waitForSlowClick = FALSE;
+int wxGrid::GetRowTop(int row) const
+{
+    return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight
+                                  : m_rowBottoms[row] - m_rowHeights[row];
+}
  
  
-    m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
-    m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
+int wxGrid::GetRowBottom(int row) const
+{
+    return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight
+                                  : m_rowBottoms[row];
+}
  
  
-    m_currentCellCoords = wxGridNoCellCoords;
+void wxGrid::CalcDimensions()
+{
+    // 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;
+
+    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();
+    }
  
  
-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
-    m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
-    m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    // preserve (more or less) the previous position
+    int x, y;
+    GetViewStart( &x, &y );
  
  
-    m_editable = TRUE;  // default for whole grid
+    // 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 );
  
  
-    m_inOnKeyDown = FALSE;
-    m_batchCount = 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();
  }
  
  }
  
-
-void wxGrid::CalcDimensions()
+wxSize wxGrid::GetSizeAvailableForScrollTarget(const wxSize& size)
  {
  {
-    int cw, ch;
-    GetClientSize( &cw, &ch );
+    wxSize sizeGridWin(size);
+    sizeGridWin.x -= m_rowLabelWidth;
+    sizeGridWin.y -= m_colLabelHeight;
  
  
-    if ( m_numRows > 0  &&  m_numCols > 0 )
-    {
-        int right = m_colRights[ m_numCols-1 ] + 50;
-        int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
-
-        // TODO: restore the scroll position that we had before sizing
-        //
-        int x, y;
-        GetViewStart( &x, &y );
-        SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
-                       right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
-                       x, y );
-    }
+    return sizeGridWin;
  }
  
  }
  
-
  void wxGrid::CalcWindowSizes()
  {
  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 );
  
      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 );
  
          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 wxGrid::Redimension( wxGridTableMessage& msg )
  {
      int i;
+    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();
  
      switch ( msg.GetId() )
      {
  
      switch ( msg.GetId() )
      {
@@ -2022,178 +2452,358 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
          {
              size_t pos = msg.GetCommandInt();
              int numRows = msg.GetCommandInt2();
          {
              size_t pos = msg.GetCommandInt();
              int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
+
+            m_numRows += numRows;
+
+            if ( !m_rowHeights.IsEmpty() )
              {
              {
-                m_rowHeights.Insert( m_defaultRowHeight, pos );
-                m_rowBottoms.Insert( 0, pos );
+                m_rowHeights.Insert( m_defaultRowHeight, pos, numRows );
+                m_rowBottoms.Insert( 0, pos, numRows );
+
+                int bottom = 0;
+                if ( pos > 0 )
+                    bottom = m_rowBottoms[pos - 1];
+
+                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
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
              }
              }
-            m_numRows += numRows;
  
  
-            int bottom = 0;
-            if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+            if ( m_selection )
+                m_selection->UpdateRows( pos, numRows );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrRows( pos, numRows );
  
  
-            for ( i = pos;  i < m_numRows;  i++ )
+            if ( !GetBatchCount() )
              {
              {
-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
              }
              }
-            CalcDimensions();
          }
          }
-        return TRUE;
+        result = true;
+        break;
  
          case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
          {
              int numRows = msg.GetCommandInt();
  
          case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
          {
              int numRows = msg.GetCommandInt();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Add( m_defaultRowHeight );
-                m_rowBottoms.Add( 0 );
-            }
-
              int oldNumRows = m_numRows;
              m_numRows += numRows;
  
              int oldNumRows = m_numRows;
              m_numRows += numRows;
  
-            int bottom = 0;
-            if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+            if ( !m_rowHeights.IsEmpty() )
+            {
+                m_rowHeights.Add( m_defaultRowHeight, numRows );
+                m_rowBottoms.Add( 0, numRows );
+
+                int bottom = 0;
+                if ( oldNumRows > 0 )
+                    bottom = m_rowBottoms[oldNumRows - 1];
+
+                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
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
  
  
-            for ( i = oldNumRows;  i < m_numRows;  i++ )
+            if ( !GetBatchCount() )
              {
              {
-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
              }
              }
-            CalcDimensions();
          }
          }
-        return TRUE;
+        result = true;
+        break;
  
          case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
          {
              size_t pos = msg.GetCommandInt();
              int numRows = msg.GetCommandInt2();
  
          case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
          {
              size_t pos = msg.GetCommandInt();
              int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
+            m_numRows -= numRows;
+
+            if ( !m_rowHeights.IsEmpty() )
              {
              {
-                m_rowHeights.Remove( pos );
-                m_rowBottoms.Remove( pos );
+                m_rowHeights.RemoveAt( pos, numRows );
+                m_rowBottoms.RemoveAt( pos, numRows );
+
+                int h = 0;
+                for ( i = 0; i < m_numRows; i++ )
+                {
+                    h += m_rowHeights[i];
+                    m_rowBottoms[i] = h;
+                }
              }
              }
-            m_numRows -= numRows;
  
              if ( !m_numRows )
              {
  
              if ( !m_numRows )
              {
-                m_numCols = 0;
-                m_colWidths.Clear();
-                m_colRights.Clear();
                  m_currentCellCoords = wxGridNoCellCoords;
              }
              else
              {
                  if ( m_currentCellCoords.GetRow() >= m_numRows )
                      m_currentCellCoords.Set( 0, 0 );
                  m_currentCellCoords = wxGridNoCellCoords;
              }
              else
              {
                  if ( m_currentCellCoords.GetRow() >= m_numRows )
                      m_currentCellCoords.Set( 0, 0 );
+            }
  
  
-                int h = 0;
-                for ( i = 0;  i < m_numRows;  i++ )
-                {
-                    h += m_rowHeights[i];
-                    m_rowBottoms[i] = h;
-                }
+            if ( m_selection )
+                m_selection->UpdateRows( pos, -((int)numRows) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            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
+                // removed _all_ rows, in this case, we remove
+                // all column attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrRows.
+                if ( !GetNumberRows() )
+                    attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
+#endif
              }
  
              }
  
-            CalcDimensions();
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }
          }
          }
-        return TRUE;
+        result = true;
+        break;
  
          case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
          {
              size_t pos = msg.GetCommandInt();
              int numCols = msg.GetCommandInt2();
  
          case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
          {
              size_t pos = msg.GetCommandInt();
              int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Insert( m_defaultColWidth, pos );
-                m_colRights.Insert( 0, pos );
-            }
              m_numCols += numCols;
  
              m_numCols += numCols;
  
-            int right = 0;
-            if ( pos > 0 ) right = m_colRights[pos-1];
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_numCols);
  
  
-            for ( i = pos;  i < m_numCols;  i++ )
+            if ( !m_colAt.IsEmpty() )
              {
              {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                //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;
+                }
              }
              }
-            CalcDimensions();
-        }
-        return TRUE;
  
  
-        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
-        {
-            int numCols = msg.GetCommandInt();
-            for ( i = 0;  i < numCols;  i++ )
+            if ( !m_colWidths.IsEmpty() )
              {
              {
-                m_colWidths.Add( m_defaultColWidth );
-                m_colRights.Add( 0 );
-            }
+                m_colWidths.Insert( m_defaultColWidth, pos, numCols );
+                m_colRights.Insert( 0, pos, numCols );
  
  
-            int oldNumCols = m_numCols;
-            m_numCols += numCols;
+                int right = 0;
+                if ( pos > 0 )
+                    right = m_colRights[GetColAt( pos - 1 )];
  
  
-            int right = 0;
-            if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+                int colPos;
+                for ( colPos = pos; colPos < m_numCols; colPos++ )
+                {
+                    i = GetColAt( colPos );
  
  
-            for ( i = oldNumCols;  i < m_numCols;  i++ )
-            {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
              }
              }
-            CalcDimensions();
-        }
-        return TRUE;
  
  
-        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
+            if ( m_currentCellCoords == wxGridNoCellCoords )
              {
              {
-                m_colWidths.Remove( pos );
-                m_colRights.Remove( pos );
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
              }
              }
-            m_numCols -= numCols;
  
  
-            if ( !m_numCols )
+            if ( m_selection )
+                m_selection->UpdateCols( pos, numCols );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrCols( pos, numCols );
+            if ( !GetBatchCount() )
              {
              {
-#if 0  // leave the row alone here so that AppendCols will work subsequently
-                m_numRows = 0;
-                m_rowHeights.Clear();
-                m_rowBottoms.Clear();
-#endif
-                m_currentCellCoords = wxGridNoCellCoords;
+                CalcDimensions();
+                m_colWindow->Refresh();
              }
              }
-            else
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+        {
+            int numCols = msg.GetCommandInt();
+            int oldNumCols = m_numCols;
+            m_numCols += numCols;
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_numCols);
+
+            if ( !m_colAt.IsEmpty() )
              {
              {
-                if ( m_currentCellCoords.GetCol() >= m_numCols )
-                    m_currentCellCoords.Set( 0, 0 );
+                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[GetColAt( oldNumCols - 1 )];
+
+                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
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colWindow->Refresh();
+            }
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+        {
+            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() )
+            {
+                m_colWidths.RemoveAt( pos, numCols );
+                m_colRights.RemoveAt( pos, numCols );
  
                  int w = 0;
  
                  int w = 0;
-                for ( i = 0;  i < m_numCols;  i++ )
+                int colPos;
+                for ( colPos = 0; colPos < m_numCols; colPos++ )
                  {
                  {
+                    i = GetColAt( colPos );
+
                      w += m_colWidths[i];
                      m_colRights[i] = w;
                  }
              }
                      w += m_colWidths[i];
                      m_colRights[i] = w;
                  }
              }
-            CalcDimensions();
+
+            if ( !m_numCols )
+            {
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetCol() >= m_numCols )
+                  m_currentCellCoords.Set( 0, 0 );
+            }
+
+            if ( m_selection )
+                m_selection->UpdateCols( pos, -((int)numCols) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            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
+                // removed _all_ columns, in this case, we remove
+                // all row attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrCols.
+                if ( !GetNumberCols() )
+                    attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
+            }
+
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colWindow->Refresh();
+            }
          }
          }
-        return TRUE;
+        result = true;
+        break;
      }
  
      }
  
-    return FALSE;
-}
+    if (result && !GetBatchCount() )
+        m_gridWin->Refresh();
  
  
+    return result;
+}
  
  
-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
-    m_rowLabelsExposed.Empty();
+    wxArrayInt  rowlabels;
  
      int top, bottom;
      while ( iter )
  
      int top, bottom;
      while ( iter )
@@ -2208,7 +2818,8 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
  #if defined(__WXMOTIF__)
          int cw, ch;
          m_gridWin->GetClientSize( &cw, &ch );
  #if defined(__WXMOTIF__)
          int cw, ch;
          m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetTop() > ch ) r.SetTop( 0 );
+        if ( r.GetTop() > ch )
+            r.SetTop( 0 );
          r.SetBottom( wxMin( r.GetBottom(), ch ) );
  #endif
  
          r.SetBottom( wxMin( r.GetBottom(), ch ) );
  #endif
  
@@ -2221,28 +2832,29 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
          // find the row labels within these bounds
          //
          int row;
          // find the row labels within these bounds
          //
          int row;
-        int rowTop;
-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top); row < m_numRows; row++ )
          {
          {
-            if ( m_rowBottoms[row] < top ) continue;
+            if ( GetRowBottom(row) < top )
+                continue;
  
  
-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
+            if ( GetRowTop(row) > bottom )
+                break;
  
  
-            m_rowLabelsExposed.Add( row );
+            rowlabels.Add( row );
          }
  
          }
  
-        iter++ ;
+        ++iter;
      }
      }
-}
  
  
+    return rowlabels;
+}
  
  
-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
-    m_colLabelsExposed.Empty();
+    wxArrayInt colLabels;
  
      int left, right;
      while ( iter )
  
      int left, right;
      while ( iter )
@@ -2257,7 +2869,8 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
  #if defined(__WXMOTIF__)
          int cw, ch;
          m_gridWin->GetClientSize( &cw, &ch );
  #if defined(__WXMOTIF__)
          int cw, ch;
          m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+        if ( r.GetLeft() > cw )
+            r.SetLeft( 0 );
          r.SetRight( wxMin( r.GetRight(), cw ) );
  #endif
  
          r.SetRight( wxMin( r.GetRight(), cw ) );
  #endif
  
@@ -2270,30 +2883,32 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
          // find the cells within these bounds
          //
          int col;
          // find the cells within these bounds
          //
          int col;
-        int colLeft;
-        for ( col = 0;  col < m_numCols;  col++ )
+        int colPos;
+        for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
          {
          {
-            if ( m_colRights[col] < left ) continue;
+            col = GetColAt( colPos );
+
+            if ( GetColRight(col) < left )
+                continue;
  
  
-            colLeft = m_colRights[col] - m_colWidths[col];
-            if ( colLeft > right ) break;
+            if ( GetColLeft(col) > right )
+                break;
  
  
-            m_colLabelsExposed.Add( col );
+            colLabels.Add( col );
          }
  
          }
  
-        iter++ ;
+        ++iter;
      }
      }
-}
  
  
+    return colLabels;
+}
  
  
-void wxGrid::CalcCellsExposed( wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
  {
      wxRegionIterator iter( reg );
      wxRect r;
  
-    m_cellsExposed.Empty();
-    m_rowsExposed.Empty();
-    m_colsExposed.Empty();
+    wxGridCellCoordsArray  cellsExposed;
  
      int left, top, right, bottom;
      while ( iter )
  
      int left, top, right, bottom;
      while ( iter )
@@ -2320,32 +2935,38 @@ void wxGrid::CalcCellsExposed( wxRegion& reg )
          CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
  
          // find the cells within these bounds
          CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
  
          // find the cells within these bounds
-        //
-        int row, col;
-        int colLeft, rowTop;
-        for ( row = 0;  row < m_numRows;  row++ )
+        wxArrayInt cols;
+        for ( int row = internalYToRow(top); row < m_numRows; row++ )
          {
          {
-            if ( m_rowBottoms[row] <= top ) continue;
+            if ( GetRowBottom(row) <= top )
+                continue;
  
  
-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
-
-            m_rowsExposed.Add( row );
+            if ( GetRowTop(row) > bottom )
+                break;
  
  
-            for ( col = 0;  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 ( m_colRights[col] <= left ) continue;
+                // do determine the dirty columns
+                for ( int pos = XToPos(left); pos <= XToPos(right); pos++ )
+                    cols.push_back(GetColAt(pos));
  
  
-                colLeft = m_colRights[col] - m_colWidths[col];
-                if ( colLeft > right ) break;
-
-                if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col );
-                m_cellsExposed.Add( wxGridCellCoords( row, col ) );
+                // if there are no dirty columns at all, nothing to do
+                if ( cols.empty() )
+                    break;
              }
              }
+
+            const size_t count = cols.size();
+            for ( size_t n = 0; n < count; n++ )
+                cellsExposed.Add(wxGridCellCoords(row, cols[n]));
          }
  
          }
  
-        iter++ ;
+        ++iter;
      }
      }
+
+    return cellsExposed;
  }
  
  
  }
  
  
@@ -2357,11 +2978,15 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
  
      if ( event.Dragging() )
      {
  
      if ( event.Dragging() )
      {
-        m_isDragging = TRUE;
+        if (!m_isDragging)
+        {
+            m_isDragging = true;
+            m_rowLabelWin->CaptureMouse();
+        }
  
          if ( event.LeftIsDown() )
          {
  
          if ( event.LeftIsDown() )
          {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
              {
                  case WXGRID_CURSOR_RESIZE_ROW:
                  {
              {
                  case WXGRID_CURSOR_RESIZE_ROW:
                  {
@@ -2372,9 +2997,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                      wxClientDC dc( m_gridWin );
                      PrepareDC( dc );
                      y = wxMax( y,
                      wxClientDC dc( m_gridWin );
                      PrepareDC( dc );
                      y = wxMax( y,
-                               m_rowBottoms[m_dragRowOrCol] -
-                               m_rowHeights[m_dragRowOrCol] +
-                               WXGRID_MIN_ROW_HEIGHT );
+                               GetRowTop(m_dragRowOrCol) +
+                               GetRowMinimalHeight(m_dragRowOrCol) );
                      dc.SetLogicalFunction(wxINVERT);
                      if ( m_dragLastPos >= 0 )
                      {
                      dc.SetLogicalFunction(wxINVERT);
                      if ( m_dragLastPos >= 0 )
                      {
@@ -2386,11 +3010,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                  break;
  
                  case WXGRID_CURSOR_SELECT_ROW:
                  break;
  
                  case WXGRID_CURSOR_SELECT_ROW:
-                    if ( (row = YToRow( y )) >= 0  &&
-                         !IsInSelection( row, 0 ) )
+                {
+                    if ( (row = YToRow( y )) >= 0 )
                      {
                      {
-                        SelectRow( row, TRUE );
+                        if ( m_selection )
+                            m_selection->SelectRow(row, event);
                      }
                      }
+                }
+                break;
  
                  // default label to suppress warnings about "enumeration value
                  // 'xxx' not handled in switch
  
                  // default label to suppress warnings about "enumeration value
                  // 'xxx' not handled in switch
@@ -2401,8 +3028,15 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
          return;
      }
  
          return;
      }
  
-    m_isDragging = FALSE;
+    if ( m_isDragging && (event.Entering() || event.Leaving()) )
+        return;
  
  
+    if (m_isDragging)
+    {
+        if (m_rowLabelWin->HasCapture())
+            m_rowLabelWin->ReleaseMouse();
+        m_isDragging = false;
+    }
  
      // ------------ Entering or leaving the window
      //
  
      // ------------ Entering or leaving the window
      //
@@ -2411,152 +3045,302 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
          ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
      }
  
          ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
      }
  
-
      // ------------ Left button pressed
      //
      else if ( event.LeftDown() )
      {
      // ------------ Left button pressed
      //
      else if ( event.LeftDown() )
      {
-        // 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);
          {
              row = YToRow(y);
-            if ( row >= 0  &&
-                 !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
+            if ( row >= 0 &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
              {
              {
-                SelectRow( row, event.ShiftDown() );
+                if ( !event.ShiftDown() && !event.CmdDown() )
+                    ClearSelection();
+                if ( m_selection )
+                {
+                    if ( event.ShiftDown() )
+                    {
+                        m_selection->SelectBlock
+                                     (
+                                        m_currentCellCoords.GetRow(), 0,
+                                        row, GetNumberCols() - 1,
+                                        event
+                                     );
+                    }
+                    else
+                    {
+                        m_selection->SelectRow(row, event);
+                    }
+                }
+
                  ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
              }
          }
                  ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
              }
          }
-        else
-        {
-            // starting to drag-resize a row
-            //
-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
-        }
      }
  
      }
  
-
      // ------------ Left double click
      //
      else if (event.LeftDClick() )
      {
      // ------------ 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);
          {
              row = YToRow(y);
-            SendEvent(  EVT_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 )
      // ------------ 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( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
-        }
+            DoEndDragResizeRow(event);
  
          ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
          m_dragLastPos = -1;
      }
  
  
          ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
          m_dragLastPos = -1;
      }
  
-
      // ------------ Right button down
      //
      else if ( event.RightDown() )
      {
          row = YToRow(y);
      // ------------ Right button down
      //
      else if ( event.RightDown() )
      {
          row = YToRow(y);
-        if ( !SendEvent( EVT_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
          }
      }
  
          {
              // no default action at the moment
          }
      }
  
-
      // ------------ Right double click
      //
      else if ( event.RightDClick() )
      {
          row = YToRow(y);
      // ------------ Right double click
      //
      else if ( event.RightDClick() )
      {
          row = YToRow(y);
-        if ( !SendEvent( EVT_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 default action at the moment
          }
      }
  
-
      // ------------ No buttons down and mouse moving
      //
      else if ( event.Moving() )
      {
          m_dragRowOrCol = YToEdgeOfRow( y );
      // ------------ 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 )
              {
          {
              if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
              {
-                // don't capture the mouse yet
-                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 )
          {
              }
          }
          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 )
  {
  
  void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
  {
-    int x, y, col;
+    int x, y;
      wxPoint pos( event.GetPosition() );
      CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
  
      wxPoint pos( event.GetPosition() );
      CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
  
+    int col = XToCol(x);
      if ( event.Dragging() )
      {
      if ( event.Dragging() )
      {
-        m_isDragging = TRUE;
+        if (!m_isDragging)
+        {
+            m_isDragging = true;
+            GetColLabelWindow()->CaptureMouse();
+
+            if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
+                DoStartMoveCol(col);
+        }
  
          if ( event.LeftIsDown() )
          {
  
          if ( event.LeftIsDown() )
          {
-            switch( m_cursorMode )
+            switch ( m_cursorMode )
              {
                  case WXGRID_CURSOR_RESIZE_COL:
              {
                  case WXGRID_CURSOR_RESIZE_COL:
-                {
-                    int cw, ch, dummy, top;
-                    m_gridWin->GetClientSize( &cw, &ch );
-                    CalcUnscrolledPosition( 0, 0, &dummy, &top );
+                DoUpdateResizeCol(x);
+                break;
  
  
-                    wxClientDC dc( m_gridWin );
-                    PrepareDC( dc );
-                    x = wxMax( x,
-                               m_colRights[m_dragRowOrCol] -
-                               m_colWidths[m_dragRowOrCol] +
-                               WXGRID_MIN_COL_WIDTH );
-                    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;
  
                  }
                  break;
  
-                case WXGRID_CURSOR_SELECT_COL:
-                    if ( (col = XToCol( x )) >= 0  &&
-                         !IsInSelection( 0, col ) )
+                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 )
                      {
                      {
-                        SelectCol( col, TRUE );
+                        wxClientDC dc( GetColLabelWindow() );
+                        DoPrepareDC(dc);
+
+                        int cw, ch;
+                        GetColLabelWindow()->GetClientSize( &cw, &ch );
+
+                        markerX++;
+
+                        //Clean up the last indicator
+                        if ( m_dragLastPos >= 0 )
+                        {
+                            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
  
                  // default label to suppress warnings about "enumeration value
                  // 'xxx' not handled in switch
@@ -2567,99 +3351,163 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
          return;
      }
  
          return;
      }
  
-    m_isDragging = FALSE;
+    if ( m_isDragging && (event.Entering() || event.Leaving()) )
+        return;
  
  
+    if (m_isDragging)
+    {
+        if (GetColLabelWindow()->HasCapture())
+            GetColLabelWindow()->ReleaseMouse();
+        m_isDragging = false;
+    }
  
      // ------------ Entering or leaving the window
      //
      if ( event.Entering() || event.Leaving() )
      {
  
      // ------------ 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() )
      {
      // ------------ 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);
          {
              col = XToCol(x);
-            if ( col >= 0  &&
-                 !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
+            if ( col >= 0 &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
              {
              {
-                SelectCol( col, event.ShiftDown() );
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+                if ( m_canDragColMove )
+                {
+                    //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 )
+                    {
+                        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, GetColLabelWindow());
+                }
              }
          }
              }
          }
-        else
-        {
-            // starting to drag-resize a col
-            //
-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
-        }
      }
  
      }
  
-
      // ------------ Left double click
      //
      if ( event.LeftDClick() )
      {
      // ------------ Left double click
      //
      if ( event.LeftDClick() )
      {
-        if ( XToEdgeOfCol(x) < 0 )
+        const int colEdge = XToEdgeOfCol(x);
+        if ( colEdge == -1 )
          {
          {
-            col = XToCol(x);
-            SendEvent(  EVT_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() )
      {
  
      // ------------ 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( EVT_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
+                {
+                    DoEndMoveCol(XToPos(x));
+                }
+                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() )
      {
      // ------------ Right button down
      //
      else if ( event.RightDown() )
      {
-        col = XToCol(x);
-        if ( !SendEvent( EVT_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
          }
      }
  
          {
              // no default action at the moment
          }
      }
  
-
      // ------------ Right double click
      //
      else if ( event.RightDClick() )
      {
      // ------------ Right double click
      //
      else if ( event.RightDClick() )
      {
-        col = XToCol(x);
-        if ( !SendEvent( EVT_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 default action at the moment
          }
      }
  
-
      // ------------ No buttons down and mouse moving
      //
      else if ( event.Moving() )
      // ------------ No buttons down and mouse moving
      //
      else if ( event.Moving() )
@@ -2669,18 +3517,17 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
          {
              if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
              {
          {
              if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
              {
-                // don't capture the cursor yet
-                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 )
          {
              }
          }
          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() )
  void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
  {
      if ( event.LeftDown() )
@@ -2688,58 +3535,75 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
          // indicate corner label by having both row and
          // col args == -1
          //
          // indicate corner label by having both row and
          // col args == -1
          //
-        if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) )
+        if ( !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) )
          {
              SelectAll();
          }
      }
          {
              SelectAll();
          }
      }
-
      else if ( event.LeftDClick() )
      {
      else if ( event.LeftDClick() )
      {
-        SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
+        SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
      }
      }
-
      else if ( event.RightDown() )
      {
      else if ( event.RightDown() )
      {
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
          {
              // no default action at the moment
          }
      }
          {
              // no default action at the moment
          }
      }
-
      else if ( event.RightDClick() )
      {
      else if ( event.RightDClick() )
      {
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
          {
              // no default action at the moment
          }
      }
  }
  
          {
              // no default action at the moment
          }
      }
  }
  
-void wxGrid::ChangeCursorMode(CursorMode mode,
-                              wxWindow *win,
-                              bool captureMouse)
+void wxGrid::CancelMouseCapture()
  {
  {
-#ifdef __WXDEBUG__
-    static const wxChar *cursorModes[] =
+    // cancel operation currently in progress, whatever it is
+    if ( m_winCapture )
      {
      {
-        _T("SELECT_CELL"),
-        _T("RESIZE_ROW"),
-        _T("RESIZE_COL"),
-        _T("SELECT_ROW"),
-        _T("SELECT_COL")
-    };
+        m_isDragging = false;
+        m_startDragPos = wxDefaultPosition;
  
  
-    wxLogTrace(_T("grid"),
-               _T("wxGrid cursor mode (mouse capture for %s): %s -> %s"),
-               win == m_colLabelWin ? _T("colLabelWin")
-                                    : win ? _T("rowLabelWin")
-                                          : _T("gridWin"),
-               cursorModes[m_cursorMode], cursorModes[mode]);
-#endif // __WXDEBUG__
+        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+        m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+        m_winCapture = NULL;
  
  
-    if ( mode == m_cursorMode )
-        return;
+        // remove traces of whatever we drew on screen
+        Refresh();
+    }
+}
+
+void wxGrid::ChangeCursorMode(CursorMode mode,
+                              wxWindow *win,
+                              bool captureMouse)
+{
+#if wxUSE_LOG_TRACE
+    static const wxChar *const cursorModes[] =
+    {
+        wxT("SELECT_CELL"),
+        wxT("RESIZE_ROW"),
+        wxT("RESIZE_COL"),
+        wxT("SELECT_ROW"),
+        wxT("SELECT_COL"),
+        wxT("MOVE_COL"),
+    };
+
+    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 // wxUSE_LOG_TRACE
+
+    if ( mode == m_cursorMode &&
+         win == m_winCapture &&
+         captureMouse == (m_winCapture != NULL))
+        return;
  
      if ( !win )
      {
  
      if ( !win )
      {
@@ -2750,7 +3614,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
      if ( m_winCapture )
      {
          m_winCapture->ReleaseMouse();
      if ( m_winCapture )
      {
          m_winCapture->ReleaseMouse();
-        m_winCapture = (wxWindow *)NULL;
+        m_winCapture = NULL;
      }
  
      m_cursorMode = mode;
      }
  
      m_cursorMode = mode;
@@ -2765,8 +3629,13 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
              win->SetCursor( m_colResizeCursor );
              break;
  
              win->SetCursor( m_colResizeCursor );
              break;
  
+        case WXGRID_CURSOR_MOVE_COL:
+            win->SetCursor( wxCursor(wxCURSOR_HAND) );
+            break;
+
          default:
              win->SetCursor( *wxSTANDARD_CURSOR );
          default:
              win->SetCursor( *wxSTANDARD_CURSOR );
+            break;
      }
  
      // we need to capture mouse when resizing
      }
  
      // we need to capture mouse when resizing
@@ -2780,757 +3649,867 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
      }
  }
  
      }
  }
  
-void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
-{
-    int x, y;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+// ----------------------------------------------------------------------------
+// grid mouse event processing
+// ----------------------------------------------------------------------------
  
  
-    wxGridCellCoords coords;
-    XYToCell( x, y, coords );
+void
+wxGrid::DoGridCellDrag(wxMouseEvent& event,
+                       const wxGridCellCoords& coords,
+                       bool isFirstDrag)
+{
+    if ( coords == wxGridNoCellCoords )
+        return; // we're outside any valid cell
  
  
-    if ( event.Dragging() )
+    // Hide the edit control, so it won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
      {
      {
-        //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
-
-        // Don't start doing anything until the mouse has been drug at
-        // least 3 pixels in any direction...
-        if (! m_isDragging) {
-            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_isDragging = TRUE;
-        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-        {
-            // Hide the edit control, so it
-            // won't interfer with drag-shrinking.
-            if ( IsCellEditControlEnabled() )
-                HideCellEditControl();
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
  
  
-            // Have we captured the mouse yet?
-            if (! m_winCapture) {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
-            }
+    switch ( event.GetModifiers() )
+    {
+        case wxMOD_CMD:
+            if ( m_selectedBlockCorner == wxGridNoCellCoords)
+                m_selectedBlockCorner = coords;
+            UpdateBlockBeingSelected(m_selectedBlockCorner, coords);
+            break;
  
  
-            if ( coords != wxGridNoCellCoords )
+        case wxMOD_NONE:
+            if ( CanDragCell() )
              {
              {
-                if ( !IsSelection() )
-                {
-                    SelectBlock( coords, coords );
-                }
-                else
+                if ( isFirstDrag )
                  {
                  {
-                    SelectBlock( m_currentCellCoords, coords );
-                }
+                    if ( m_selectedBlockCorner == wxGridNoCellCoords)
+                        m_selectedBlockCorner = coords;
  
  
-                if (! IsVisible(coords)) {
-                    MakeCellVisible(coords);
-                    // TODO: need to introduce a delay or something here.  The
-                    // scrolling is way to fast, at least on MSW.
+                    SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event);
+                    return;
                  }
              }
                  }
              }
-        }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
-        {
-            int cw, ch, left, dummy;
-            m_gridWin->GetClientSize( &cw, &ch );
-            CalcUnscrolledPosition( 0, 0, &left, &dummy );
-
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-           y = wxMax( y,
-                      m_rowBottoms[m_dragRowOrCol] -
-                      m_rowHeights[m_dragRowOrCol] +
-                      WXGRID_MIN_ROW_HEIGHT );
-            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;
-        }
-        else if ( m_cursorMode == 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 );
-           x = wxMax( x,
-                      m_colRights[m_dragRowOrCol] -
-                      m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH );
-            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;
-        }
+            UpdateBlockBeingSelected(m_currentCellCoords, coords);
+            break;
  
  
-        return;
+        default:
+            // we don't handle the other key modifiers
+            event.Skip();
      }
      }
+}
  
  
-    m_isDragging = FALSE;
-    m_startDragPos = wxDefaultPosition;
+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()));
  
  
-    if ( coords != wxGridNoCellCoords )
+    // 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 )
      {
      {
-        // 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() )
+        // Don't start doing anything until the mouse has been dragged far
+        // enough
+        const wxPoint& pt = event.GetPosition();
+        if ( m_startDragPos == wxDefaultPosition )
          {
          {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+            m_startDragPos = pt;
+            return;
          }
          }
-        else
-#endif // 0
  
  
-        // ------------ Left button pressed
-        //
-        if ( event.LeftDown() )
-        {
-            EnableCellEditControl( FALSE );
-            if ( event.ShiftDown() )
-            {
-                SelectBlock( m_currentCellCoords, coords );
-            }
-            else if ( XToEdgeOfCol(x) < 0  &&
-                      YToEdgeOfRow(y) < 0 )
-            {
-                if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
-                                 coords.GetRow(),
-                                 coords.GetCol(),
-                                 event ) )
-                {
-                    MakeCellVisible( coords );
-
-                    // if this is the second click on this cell then start
-                    // the edit control
-                    if (m_waitForSlowClick && coords == m_currentCellCoords) {
-                        EnableCellEditControl(TRUE);
-                        ShowCellEditControl();
-                        m_waitForSlowClick = FALSE;
-                    }
-                    else {
-                        SetCurrentCell( coords );
-                        m_waitForSlowClick = TRUE;
-                    }
-                }
-            }
-        }
+        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;
  
  
-        // ------------ Left double click
-        //
-        else if ( event.LeftDClick() )
-        {
-            EnableCellEditControl( FALSE );
-            if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
-            {
-                SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
-                           coords.GetRow(),
-                           coords.GetCol(),
-                           event );
-            }
-        }
+    switch ( m_cursorMode )
+    {
+        case WXGRID_CURSOR_SELECT_CELL:
+            DoGridCellDrag(event, coords, isFirstDrag);
+            break;
  
  
+        case WXGRID_CURSOR_RESIZE_ROW:
+            DoGridLineDrag(event, wxGridRowOperations());
+            break;
  
  
-        // ------------ Left button released
-        //
-        else if ( event.LeftUp() )
-        {
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-            {
-                if ( IsSelection() )
-                {
-                    if (m_winCapture) {
-                        m_winCapture->ReleaseMouse();
-                        m_winCapture = NULL;
-                    }
-                    SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
-                }
+        case WXGRID_CURSOR_RESIZE_COL:
+            DoGridLineDrag(event, wxGridColumnOperations());
+            break;
  
  
-                // Show the edit control, if it has
-                // been hidden for drag-shrinking.
-                if ( IsCellEditControlEnabled() )
-                    ShowCellEditControl();
-            }
-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                DoEndDragResizeRow();
+        default:
+            event.Skip();
+    }
  
  
-                // Note: we are ending the event *after* doing
-                // default processing in this case
-                //
-                SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
-            }
-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                DoEndDragResizeCol();
+    if ( isFirstDrag )
+    {
+        wxASSERT_MSG( !m_winCapture, "shouldn't capture the mouse twice" );
  
  
-                // Note: we are ending the event *after* doing
-                // default processing in this case
-                //
-                SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
-            }
+        m_winCapture = m_gridWin;
+        m_winCapture->CaptureMouse();
+    }
+}
  
  
-            m_dragLastPos = -1;
-        }
+void
+wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                           const wxGridCellCoords& coords,
+                           const wxPoint& pos)
+{
+    if ( SendEvent(wxEVT_GRID_CELL_LEFT_CLICK, coords, event) )
+    {
+        // event handled by user code, no need to do anything here
+        return;
+    }
  
  
+    if ( !event.CmdDown() )
+        ClearSelection();
  
  
-        // ------------ Right button down
-        //
-        else if ( event.RightDown() )
+    if ( event.ShiftDown() )
+    {
+        if ( m_selection )
          {
          {
-            EnableCellEditControl( FALSE );
-            if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
-            {
-                // no default action at the moment
-            }
+            m_selection->SelectBlock(m_currentCellCoords, coords, event);
+            m_selectedBlockCorner = coords;
          }
          }
+    }
+    else if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 )
+    {
+        DisableCellEditControl();
+        MakeCellVisible( coords );
  
  
-
-        // ------------ Right double click
-        //
-        else if ( event.RightDClick() )
+        if ( event.CmdDown() )
          {
          {
-            EnableCellEditControl( FALSE );
-            if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
+            if ( m_selection )
              {
              {
-                // no default action at the moment
+                m_selection->ToggleCellSelection(coords, event);
              }
              }
-        }
  
  
-        // ------------ Moving and no button action
-        //
-        else if ( event.Moving() && !event.IsButton() )
+            m_selectedBlockTopLeft = wxGridNoCellCoords;
+            m_selectedBlockBottomRight = wxGridNoCellCoords;
+            m_selectedBlockCorner = coords;
+        }
+        else
          {
          {
-            int dragRow = YToEdgeOfRow( y );
-            int dragCol = XToEdgeOfCol( x );
+            m_waitForSlowClick = m_currentCellCoords == coords &&
+                                        coords != wxGridNoCellCoords;
+            SetCurrentCell( coords );
+        }
+    }
+}
  
  
-            // Dragging on the corner of a cell to resize in both
-            // directions is not implemented yet...
-            //
-            if ( dragRow >= 0  &&  dragCol >= 0 )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                return;
-            }
+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) )
+        {
+            // 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;
+        }
+    }
+}
  
  
-            if ( dragRow >= 0 )
-            {
-                m_dragRowOrCol = dragRow;
+void
+wxGrid::DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords)
+{
+    if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+    {
+        if (m_winCapture)
+        {
+            m_winCapture->ReleaseMouse();
+            m_winCapture = NULL;
+        }
  
  
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
-                }
+        if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
+        {
+            ClearSelection();
+            EnableCellEditControl();
  
  
-                return;
-            }
+            wxGridCellAttr *attr = GetCellAttr(coords);
+            wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+            editor->StartingClick();
+            editor->DecRef();
+            attr->DecRef();
  
  
-            if ( dragCol >= 0 )
+            m_waitForSlowClick = false;
+        }
+        else if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+             m_selectedBlockBottomRight != wxGridNoCellCoords )
+        {
+            if ( m_selection )
              {
              {
-                m_dragRowOrCol = dragCol;
-
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
-                }
-
-                return;
+                m_selection->SelectBlock( m_selectedBlockTopLeft,
+                                          m_selectedBlockBottomRight,
+                                          event );
              }
  
              }
  
-            // Neither on a row or col edge
-            //
-            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            }
+            m_selectedBlockTopLeft = wxGridNoCellCoords;
+            m_selectedBlockBottomRight = wxGridNoCellCoords;
+
+            // 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);
+        DoEndDragResizeRow(event);
+    }
+    else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        DoEndDragResizeCol(event);
+    }
  
  
+    m_dragLastPos = -1;
+}
  
  
-void wxGrid::DoEndDragResizeRow()
+void
+wxGrid::DoGridMouseMoveEvent(wxMouseEvent& WXUNUSED(event),
+                             const wxGridCellCoords& coords,
+                             const wxPoint& pos)
  {
  {
-    if ( m_dragLastPos >= 0 )
+    if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
      {
      {
-        // erase the last line and resize the row
-        //
-        int cw, ch, left, dummy;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &left, &dummy );
+        // out of grid cell area
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        return;
+    }
  
  
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
-        HideCellEditControl();
+    int dragRow = YToEdgeOfRow( pos.y );
+    int dragCol = XToEdgeOfCol( pos.x );
  
  
-        int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
-        SetRowSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+    // Dragging on the corner of a cell to resize in both
+    // directions is not implemented yet...
+    //
+    if ( dragRow >= 0 && dragCol >= 0 )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        return;
+    }
  
  
-        if ( !GetBatchCount() )
+    if ( dragRow >= 0 && CanDragGridSize() && CanDragRowSize(dragRow) )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
          {
          {
-            // 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;
-            m_gridWin->Refresh( FALSE, &rect );
+            m_dragRowOrCol = dragRow;
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);
+        }
+    }
+    // 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 )
+        {
+            m_dragRowOrCol = dragCol;
+            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);
+        }
+    }
+    else // Neither on a row or col edge
+    {
+        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
          }
          }
-
-        ShowCellEditControl();
      }
  }
  
      }
  }
  
-
-void wxGrid::DoEndDragResizeCol()
+void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
  {
  {
-    if ( m_dragLastPos >= 0 )
+    if ( event.Entering() || event.Leaving() )
      {
      {
-        // erase the last line and resize the col
-        //
-        int cw, ch, dummy, top;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &dummy, &top );
+        // 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;
+    }
  
  
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
-        HideCellEditControl();
+    const wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
  
  
-        int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
-        SetColSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+    // coordinates of the cell under mouse
+    wxGridCellCoords coords = XYToCell(pos);
  
  
-        if ( !GetBatchCount() )
+    int cell_rows, cell_cols;
+    GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
+    if ( (cell_rows < 0) || (cell_cols < 0) )
+    {
+        coords.SetRow(coords.GetRow() + cell_rows);
+        coords.SetCol(coords.GetCol() + cell_cols);
+    }
+
+    if ( event.Dragging() )
+    {
+        if ( event.LeftIsDown() )
+            DoGridDragEvent(event, coords);
+        else
+            event.Skip();
+        return;
+    }
+
+    m_isDragging = false;
+    m_startDragPos = wxDefaultPosition;
+
+    // deal with various button presses
+    if ( event.IsButton() )
+    {
+        if ( coords != wxGridNoCellCoords )
          {
          {
-            // 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;
-            m_gridWin->Refresh( FALSE, &rect );
+            DisableCellEditControl();
+
+            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);
          }
  
          }
  
-        ShowCellEditControl();
+        // this one should be called even if we're not over any cell
+        if ( event.LeftUp() )
+        {
+            DoGridCellLeftUp(event, coords);
+        }
+    }
+    else if ( event.Moving() )
+    {
+        DoGridMouseMoveEvent(event, coords, pos);
+    }
+    else // unknown mouse event?
+    {
+        event.Skip();
      }
  }
  
      }
  }
  
+// this function returns true only if the size really changed
+bool wxGrid::DoEndDragResizeLine(const wxGridOperations& oper)
+{
+    if ( m_dragLastPos == -1 )
+        return false;
  
  
+    const wxGridOperations& doper = oper.Dual();
  
  
-//
-// ------ interaction with data model
-//
-bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
-{
-    switch ( msg.GetId() )
-    {
-        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
-            return GetModelValues();
+    const wxSize size = m_gridWin->GetClientSize();
  
  
-        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
-            return SetModelValues();
+    const wxPoint ptOrigin = CalcUnscrolledPosition(wxPoint(0, 0));
  
  
-        case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
-        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
-        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
-        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
-        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
-        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
-            return Redimension( msg );
+    // erase the last line we drew
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
+    dc.SetLogicalFunction(wxINVERT);
  
  
-        default:
-            return FALSE;
-    }
-}
+    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();
  
  
-// 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
-// not to change the number of rows or cols.
-//
-void wxGrid::ClearGrid()
-{
-    if ( m_table )
+    // 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() )
      {
      {
-        m_table->Clear();
-        SetEditControlValue();
-        if ( !GetBatchCount() ) m_gridWin->Refresh();
-    }
-}
+        // 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()));
  
  
-bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
+        // 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;
  
  
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
-        return FALSE;
-    }
+        wxRect rectHeader(rect.GetPosition(),
+                          oper.MakeSize
+                               (
+                                    oper.GetHeaderWindowSize(this),
+                                    doper.Select(size) - doper.Select(rect)
+                               ));
  
  
-    if ( m_table )
-    {
-        bool ok = m_table->InsertRows( pos, numRows );
+        oper.GetHeaderWindow(this)->Refresh(true, &rectHeader);
  
  
-        // the table will have sent the results of the insert row
-        // operation to this view object as a grid table message
-        //
-        if ( ok )
+
+        // also refresh the grid window: extend the rectangle
+        if ( m_table )
          {
          {
-            if ( m_numCols == 0 )
-            {
-                m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
-                //
-                // TODO: perhaps instead of appending the default number of cols
-                // we should remember what the last non-zero number of cols was ?
-                //
-            }
+            oper.SelectSize(rect) = oper.Select(size);
  
  
-            if ( m_currentCellCoords == wxGridNoCellCoords )
+            int subtractLines = 0;
+            const int lineStart = oper.PosToLine(this, posLineStart);
+            if ( lineStart >= 0 )
              {
              {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
+                // 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 = oper.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;
+                }
              }
  
              }
  
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-        }
+            int startPos =
+                oper.GetLineStartPos(this, m_dragRowOrCol + subtractLines);
+            startPos = doper.CalcScrolledPosition(this, startPos);
  
  
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
+            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;
+}
  
  
-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event)
  {
  {
-    // TODO: something with updateLabels flag
+    // TODO: generate RESIZING event, see #10754
  
  
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
-        return FALSE;
-    }
+    if ( DoEndDragResizeLine(wxGridRowOperations()) )
+        SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event);
+}
  
  
-    if ( m_table && m_table->AppendRows( numRows ) )
-    {
-        if ( m_currentCellCoords == wxGridNoCellCoords )
-        {
-            // if we have just inserted cols into an empty grid the current
-            // cell will be undefined...
-            //
-            SetCurrentCell( 0, 0 );
-        }
+void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event)
+{
+    // TODO: generate RESIZING event, see #10754
  
  
-        // the table will have sent the results of the append row
-        // operation to this view object as a grid table message
-        //
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    if ( DoEndDragResizeLine(wxGridColumnOperations()) )
+        SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event);
  }
  
  }
  
+void wxGrid::DoStartMoveCol(int col)
+{
+    m_dragRowOrCol = col;
+}
  
  
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::DoEndMoveCol(int pos)
  {
  {
-    // TODO: something with updateLabels flag
+    wxASSERT_MSG( m_dragRowOrCol != -1, "no matching DoStartMoveCol?" );
+
+    if ( SendEvent(wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol) != -1 )
+        SetColPos(m_dragRowOrCol, pos);
+    //else: vetoed by user
  
  
-    if ( !m_created )
+    m_dragRowOrCol = -1;
+}
+
+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() )
      {
      {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
-        return FALSE;
+        int colRight = 0;
+        for ( int colPos = 0; colPos < m_numCols; colPos++ )
+        {
+            int colID = GetColAt( colPos );
+
+            colRight += m_colWidths[colID];
+            m_colRights[colID] = colRight;
+        }
      }
  
      }
  
-    if ( m_table && m_table->DeleteRows( pos, numRows ) )
+    // and make the changes visible
+    if ( m_useNativeHeader )
      {
      {
-        // the table will have sent the results of the delete row
-        // operation to this view object as a grid table message
-        //
-        if ( m_numRows > 0 )
-            SetEditControlValue();
+        if ( m_colAt.empty() )
+            GetGridColHeader()->ResetColumnsOrder();
          else
          else
-            HideCellEditControl();
-
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
+            GetGridColHeader()->SetColumnsOrder(m_colAt);
      }
      else
      {
      }
      else
      {
-        return FALSE;
+        m_colWindow->Refresh();
      }
      }
+    m_gridWin->Refresh();
  }
  
  }
  
-
-bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+void wxGrid::SetColumnsOrder(const wxArrayInt& order)
  {
  {
-    // TODO: something with updateLabels flag
+    m_colAt = order;
+
+    RefreshAfterColPosChange();
+}
  
  
-    if ( !m_created )
+void wxGrid::SetColPos(int idx, int pos)
+{
+    // we're going to need m_colAt now, initialize it if needed
+    if ( m_colAt.empty() )
      {
      {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
-        return FALSE;
+        m_colAt.reserve(m_numCols);
+        for ( int i = 0; i < m_numCols; i++ )
+            m_colAt.push_back(i);
      }
  
      }
  
-    if ( m_table )
-    {
-        HideCellEditControl();
-        bool ok = m_table->InsertCols( pos, numCols );
+    wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);
  
  
-        // the table will have sent the results of the insert col
-        // operation to this view object as a grid table message
-        //
-        if ( ok )
-        {
-            if ( m_currentCellCoords == wxGridNoCellCoords )
-            {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
-            }
+    RefreshAfterColPosChange();
+}
  
  
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-        }
+void wxGrid::ResetColPos()
+{
+    m_colAt.clear();
  
  
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
-    }
+    RefreshAfterColPosChange();
  }
  
  }
  
-
-bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+void wxGrid::EnableDragColMove( bool enable )
  {
  {
-    // TODO: something with updateLabels flag
+    if ( m_canDragColMove == enable )
+        return;
  
  
-    if ( !m_created )
+    if ( m_useNativeHeader )
      {
      {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
-        return FALSE;
+        // update all columns to make them [not] reorderable
+        GetGridColHeader()->SetColumnCount(m_numCols);
      }
  
      }
  
-    if ( 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
-        //
-        if ( m_currentCellCoords == wxGridNoCellCoords )
-        {
-            // if we have just inserted cols into an empty grid the current
-            // cell will be undefined...
-            //
-            SetCurrentCell( 0, 0 );
-        }
+    m_canDragColMove = enable;
  
  
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    // 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
  }
  
  
  }
  
  
-bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+//
+// ------ interaction with data model
+//
+bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
  {
  {
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
+    switch ( msg.GetId() )
      {
      {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
-        return FALSE;
-    }
+        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
+            return GetModelValues();
  
  
-    if ( m_table && 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
-        //
-        if ( m_numCols > 0 )
-            SetEditControlValue();
-        else
-            HideCellEditControl();
+        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
+            return SetModelValues();
  
  
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
+        case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
+        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
+        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
+        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+            return Redimension( msg );
+
+        default:
+            return false;
      }
      }
-    else
+}
+
+// The behaviour of this function depends on the grid table class
+// 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()
+{
+    if ( m_table )
      {
      {
-        return FALSE;
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        m_table->Clear();
+        if (!GetBatchCount())
+            m_gridWin->Refresh();
      }
  }
  
      }
  }
  
+bool
+wxGrid::DoModifyLines(bool (wxGridTableBase::*funcModify)(size_t, size_t),
+                      int pos, int num, bool WXUNUSED(updateLabels) )
+{
+    wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
  
  
+    if ( !m_table )
+        return false;
  
  
-//
-// ----- event handlers
-//
+    if ( IsCellEditControlEnabled() )
+        DisableCellEditControl();
  
  
-// Generate a grid event based on a mouse event and
-// return the result of ProcessEvent()
-//
-bool wxGrid::SendEvent( const wxEventType type,
-                        int row, int col,
-                        wxMouseEvent& mouseEv )
-{
-    if ( type == EVT_GRID_ROW_SIZE ||
-         type == EVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
+    return (m_table->*funcModify)(pos, num);
  
  
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol,
-                                 mouseEv.GetX(), mouseEv.GetY(),
-                                 mouseEv.ControlDown(),
-                                 mouseEv.ShiftDown(),
-                                 mouseEv.AltDown(),
-                                 mouseEv.MetaDown() );
+    // the table will have sent the results of the insert row
+    // operation to this view object as a grid table message
+}
  
  
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else if ( type == EVT_GRID_RANGE_SELECT )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        type,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight,
-                                        mouseEv.ControlDown(),
-                                        mouseEv.ShiftDown(),
-                                        mouseEv.AltDown(),
-                                        mouseEv.MetaDown() );
+bool
+wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t),
+                      int num, bool WXUNUSED(updateLabels))
+{
+    wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
  
  
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else
-    {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col,
-                             mouseEv.GetX(), mouseEv.GetY(),
-                             mouseEv.ControlDown(),
-                             mouseEv.ShiftDown(),
-                             mouseEv.AltDown(),
-                             mouseEv.MetaDown() );
+    if ( !m_table )
+        return false;
  
  
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+    return (m_table->*funcAppend)(num);
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// event generation helpers
+// ----------------------------------------------------------------------------
  
  
-// Generate a grid event of specified type and return the result
-// of ProcessEvent().
+void
+wxGrid::SendGridSizeEvent(wxEventType type,
+                      int row, int col,
+                      const wxMouseEvent& mouseEv)
+{
+   int rowOrCol = row == -1 ? col : row;
+
+   wxGridSizeEvent gridEvt( GetId(),
+           type,
+           this,
+           rowOrCol,
+           mouseEv.GetX() + GetRowLabelSize(),
+           mouseEv.GetY() + GetColLabelSize(),
+           mouseEv);
+
+   GetEventHandler()->ProcessEvent(gridEvt);
+}
+
+// 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, vetoed;
+
+   if ( type == wxEVT_GRID_RANGE_SELECT )
+   {
+       // Right now, it should _never_ end up here!
+       wxGridRangeSelectEvent gridEvt( GetId(),
+               type,
+               this,
+               m_selectedBlockTopLeft,
+               m_selectedBlockBottomRight,
+               true,
+               mouseEv);
+
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK ||
+             type == wxEVT_GRID_LABEL_LEFT_DCLICK ||
+             type == wxEVT_GRID_LABEL_RIGHT_CLICK ||
+             type == wxEVT_GRID_LABEL_RIGHT_DCLICK )
+   {
+       wxPoint pos = mouseEv.GetPosition();
+
+       if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() )
+           pos.y += GetColLabelSize();
+       if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
+           pos.x += GetRowLabelSize();
+
+       wxGridEvent gridEvt( GetId(),
+               type,
+               this,
+               row, col,
+               pos.x,
+               pos.y,
+               false,
+               mouseEv);
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else
+   {
+       wxGridEvent gridEvt( GetId(),
+               type,
+               this,
+               row, col,
+               mouseEv.GetX() + GetRowLabelSize(),
+               mouseEv.GetY() + GetColLabelSize(),
+               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;
+
+   return claimed ? 1 : 0;
+}
+
+// Generate a grid event of specified type, return value same as above
  //
  //
-bool wxGrid::SendEvent( const wxEventType type,
-                        int row, int col )
+int
+wxGrid::SendEvent(const wxEventType type, int row, int col, const wxString& s)
  {
  {
-    if ( type == EVT_GRID_ROW_SIZE ||
-         type == EVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
+    wxGridEvent gridEvt( GetId(), type, this, row, col );
+    gridEvt.SetString(s);
  
  
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol );
+    const bool claimed = GetEventHandler()->ProcessEvent(gridEvt);
  
  
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else
-    {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col );
+    // A Veto'd event may not be `claimed' so test this first
+    if ( !gridEvt.IsAllowed() )
+        return -1;
  
  
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+    return claimed ? 1 : 0;
  }
  
  }
  
-
  void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
  void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
-    wxPaintDC dc( this );
+    // needed to prevent zillions of paint events on MSW
+    wxPaintDC dc(this);
+}
  
  
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
-         m_numRows && m_numCols )
+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 ( m_created && !GetBatchCount() )
      {
      {
-        m_currentCellCoords.Set(0, 0);
-        SetEditControlValue();
-        ShowCellEditControl();
-    }
+        // Refresh to get correct scrolled position:
+        wxScrolledWindow::Refresh(eraseb, rect);
  
  
-    m_displayed = TRUE;
-}
+        if (rect)
+        {
+            int rect_x, rect_y, rectWidth, rectHeight;
+            int width_label, width_cell, height_label, height_cell;
+            int x, y;
  
  
+            // Copy rectangle can get scroll offsets..
+            rect_x = rect->GetX();
+            rect_y = rect->GetY();
+            rectWidth = rect->GetWidth();
+            rectHeight = rect->GetHeight();
  
  
-// This is just here to make sure that CalcDimensions gets called when
-// the grid view is resized... then the size event is skipped to allow
-// the box sizers to handle everything
-//
-void wxGrid::OnSize( wxSizeEvent& event )
-{
-    CalcWindowSizes();
-    CalcDimensions();
+            width_label = m_rowLabelWidth - rect_x;
+            if (width_label > rectWidth)
+                width_label = rectWidth;
+
+            height_label = m_colLabelHeight - rect_y;
+            if (height_label > rectHeight)
+                height_label = rectHeight;
+
+            if (rect_x > m_rowLabelWidth)
+            {
+                x = rect_x - m_rowLabelWidth;
+                width_cell = rectWidth;
+            }
+            else
+            {
+                x = 0;
+                width_cell = rectWidth - (m_rowLabelWidth - rect_x);
+            }
+
+            if (rect_y > m_colLabelHeight)
+            {
+                y = rect_y - m_colLabelHeight;
+                height_cell = rectHeight;
+            }
+            else
+            {
+                y = 0;
+                height_cell = rectHeight - (m_colLabelHeight - rect_y);
+            }
+
+            // Paint corner label part intersecting rect.
+            if ( width_label > 0 && height_label > 0 )
+            {
+                wxRect anotherrect(rect_x, rect_y, width_label, height_label);
+                m_cornerLabelWin->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint col labels part intersecting rect.
+            if ( width_cell > 0 && height_label > 0 )
+            {
+                wxRect anotherrect(x, rect_y, width_cell, height_label);
+                m_colWindow->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint row labels part intersecting rect.
+            if ( width_label > 0 && height_cell > 0 )
+            {
+                wxRect anotherrect(rect_x, y, width_label, height_cell);
+                m_rowLabelWin->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint cell area part intersecting rect.
+            if ( width_cell > 0 && height_cell > 0 )
+            {
+                wxRect anotherrect(x, y, width_cell, height_cell);
+                m_gridWin->Refresh(eraseb, &anotherrect);
+            }
+        }
+        else
+        {
+            m_cornerLabelWin->Refresh(eraseb, NULL);
+            m_colWindow->Refresh(eraseb, NULL);
+            m_rowLabelWin->Refresh(eraseb, NULL);
+            m_gridWin->Refresh(eraseb, NULL);
+        }
+    }
  }
  
  }
  
+void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    if (m_targetWindow != this) // check whether initialisation has been done
+    {
+        // reposition our children windows
+        CalcWindowSizes();
+    }
+}
  
  void wxGrid::OnKeyDown( wxKeyEvent& event )
  {
  
  void wxGrid::OnKeyDown( wxKeyEvent& event )
  {
@@ -3541,87 +4520,109 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
          wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
      }
  
          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
  
      // propagate the event up and see if it gets processed
-    //
      wxWindow *parent = GetParent();
      wxKeyEvent keyEvt( event );
      keyEvt.SetEventObject( parent );
  
      if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
      {
      wxWindow *parent = GetParent();
      wxKeyEvent keyEvt( event );
      keyEvt.SetEventObject( parent );
  
      if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
      {
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            if (event.GetKeyCode() == WXK_RIGHT)
+                event.m_keyCode = WXK_LEFT;
+            else if (event.GetKeyCode() == WXK_LEFT)
+                event.m_keyCode = WXK_RIGHT;
+        }
+
          // try local handlers
          // try local handlers
-        //
-        switch ( event.KeyCode() )
+        switch ( event.GetKeyCode() )
          {
              case WXK_UP:
                  if ( event.ControlDown() )
          {
              case WXK_UP:
                  if ( event.ControlDown() )
-                {
-                    MoveCursorUpBlock();
-                }
+                    MoveCursorUpBlock( event.ShiftDown() );
                  else
                  else
-                {
-                    MoveCursorUp();
-                }
+                    MoveCursorUp( event.ShiftDown() );
                  break;
  
              case WXK_DOWN:
                  if ( event.ControlDown() )
                  break;
  
              case WXK_DOWN:
                  if ( event.ControlDown() )
-                {
-                    MoveCursorDownBlock();
-                }
+                    MoveCursorDownBlock( event.ShiftDown() );
                  else
                  else
-                {
-                    MoveCursorDown();
-                }
+                    MoveCursorDown( event.ShiftDown() );
                  break;
  
              case WXK_LEFT:
                  if ( event.ControlDown() )
                  break;
  
              case WXK_LEFT:
                  if ( event.ControlDown() )
-                {
-                    MoveCursorLeftBlock();
-                }
+                    MoveCursorLeftBlock( event.ShiftDown() );
                  else
                  else
-                {
-                    MoveCursorLeft();
-                }
+                    MoveCursorLeft( event.ShiftDown() );
                  break;
  
              case WXK_RIGHT:
                  if ( event.ControlDown() )
                  break;
  
              case WXK_RIGHT:
                  if ( event.ControlDown() )
-                {
-                    MoveCursorRightBlock();
-                }
+                    MoveCursorRightBlock( event.ShiftDown() );
                  else
                  else
-                {
-                    MoveCursorRight();
-                }
+                    MoveCursorRight( event.ShiftDown() );
                  break;
  
              case WXK_RETURN:
                  break;
  
              case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
                  if ( event.ControlDown() )
                  {
                      event.Skip();  // to let the edit control have the return
                  }
                  else
                  {
                  if ( event.ControlDown() )
                  {
                      event.Skip();  // to let the edit control have the return
                  }
                  else
                  {
-                    MoveCursorDown();
+                    if ( GetGridCursorRow() < GetNumberRows()-1 )
+                    {
+                        MoveCursorDown( event.ShiftDown() );
+                    }
+                    else
+                    {
+                        // at the bottom of a column
+                        DisableCellEditControl();
+                    }
                  }
                  break;
  
                  }
                  break;
  
+            case WXK_ESCAPE:
+                ClearSelection();
+                break;
+
              case WXK_TAB:
                  if (event.ShiftDown())
              case WXK_TAB:
                  if (event.ShiftDown())
-                    MoveCursorLeft();
+                {
+                    if ( GetGridCursorCol() > 0 )
+                    {
+                        MoveCursorLeft( false );
+                    }
+                    else
+                    {
+                        // at left of grid
+                        DisableCellEditControl();
+                    }
+                }
                  else
                  else
-                    MoveCursorRight();
+                {
+                    if ( GetGridCursorCol() < GetNumberCols() - 1 )
+                    {
+                        MoveCursorRight( false );
+                    }
+                    else
+                    {
+                        // at right of grid
+                        DisableCellEditControl();
+                    }
+                }
                  break;
  
              case WXK_HOME:
                  if ( event.ControlDown() )
                  {
                  break;
  
              case WXK_HOME:
                  if ( event.ControlDown() )
                  {
-                    MakeCellVisible( 0, 0 );
-                    SetCurrentCell( 0, 0 );
+                    GoToCell(0, 0);
                  }
                  else
                  {
                  }
                  else
                  {
@@ -3632,8 +4633,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
              case WXK_END:
                  if ( event.ControlDown() )
                  {
              case WXK_END:
                  if ( event.ControlDown() )
                  {
-                    MakeCellVisible( m_numRows-1, m_numCols-1 );
-                    SetCurrentCell( m_numRows-1, m_numCols-1 );
+                    GoToCell(m_numRows - 1, m_numCols - 1);
                  }
                  else
                  {
                  }
                  else
                  {
@@ -3641,94 +4641,317 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                  }
                  break;
  
                  }
                  break;
  
-            case WXK_PRIOR:
+            case WXK_PAGEUP:
                  MovePageUp();
                  break;
  
                  MovePageUp();
                  break;
  
-            case WXK_NEXT:
+            case WXK_PAGEDOWN:
                  MovePageDown();
                  break;
  
                  MovePageDown();
                  break;
  
-            // We don't want these keys to trigger the edit control, any others?
-            case WXK_SHIFT:
-            case WXK_ALT:
-            case WXK_CONTROL:
-            case WXK_CAPITAL:
-                event.Skip();
-                break;
-
              case WXK_SPACE:
              case WXK_SPACE:
-                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();
-                    break;
+                    case wxMOD_CONTROL:
+                        m_selection->SelectCol(m_currentCellCoords.GetCol());
+                        break;
+
+                    case wxMOD_SHIFT:
+                        m_selection->SelectRow(m_currentCellCoords.GetRow());
+                        break;
+
+                    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();
                  }
                  }
-                // Otherwise fall through to default
+                break;
  
              default:
  
              default:
-                // now try the cell edit control
-                //
-                if ( !IsCellEditControlEnabled() )
-                    EnableCellEditControl( TRUE );
-                if (IsCellEditControlEnabled()) {
-                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                    attr->GetEditor()->StartingKey(event);
-                    attr->DecRef();
-                }
+                event.Skip();
                  break;
          }
      }
  
                  break;
          }
      }
  
-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;
  }
  
  }
  
+void wxGrid::OnKeyUp( wxKeyEvent& event )
+{
+    // try local handlers
+    //
+    if ( event.GetKeyCode() == WXK_SHIFT )
+    {
+        if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+             m_selectedBlockBottomRight != wxGridNoCellCoords )
+        {
+            if ( m_selection )
+            {
+                m_selection->SelectBlock(
+                    m_selectedBlockTopLeft,
+                    m_selectedBlockBottomRight,
+                    event);
+            }
+        }
+
+        m_selectedBlockTopLeft = wxGridNoCellCoords;
+        m_selectedBlockBottomRight = wxGridNoCellCoords;
+        m_selectedBlockCorner = wxGridNoCellCoords;
+    }
+}
  
  
-void wxGrid::OnEraseBackground(wxEraseEvent&)
-{ }
+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();
+    }
+}
  
  
+void wxGrid::OnEraseBackground(wxEraseEvent&)
+{
+}
  
  
-void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
+bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
  {
  {
-    if ( SendEvent( EVT_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;
      }
  
      }
  
-    if ( m_displayed  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+#if !defined(__WXMAC__)
+    wxClientDC dc( m_gridWin );
+    PrepareDC( dc );
+#endif
+
+    if ( m_currentCellCoords != wxGridNoCellCoords )
      {
      {
-        HideCellEditControl();
-        SaveEditControlValue();
-        EnableCellEditControl(FALSE);
+        DisableCellEditControl();
  
  
-        // Clear the old current cell highlight
-        wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
-       m_currentCellCoords = coords;   // Otherwise refresh redraws the highlight!
-        m_gridWin->Refresh( FALSE, &r );
+        if ( IsVisible( m_currentCellCoords, false ) )
+        {
+            wxRect r;
+            r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );
+            if ( !m_gridLinesEnabled )
+            {
+                r.x--;
+                r.y--;
+                r.width++;
+                r.height++;
+            }
+
+            wxGridCellCoordsArray cells = CalcCellsExposed( r );
+
+            // Otherwise refresh redraws the highlight!
+            m_currentCellCoords = coords;
+
+#if defined(__WXMAC__)
+            m_gridWin->Refresh(true /*, & r */);
+#else
+            DrawGridCellArea( dc, cells );
+            DrawAllGridLines( dc, r );
+#endif
+        }
      }
  
      m_currentCellCoords = coords;
  
      }
  
      m_currentCellCoords = coords;
  
-    SetEditControlValue();
+    wxGridCellAttr *attr = GetCellAttr( coords );
+#if !defined(__WXMAC__)
+    DrawCellHighlight( dc, attr );
+#endif
+    attr->DecRef();
+
+    return true;
+}
+
+void
+wxGrid::UpdateBlockBeingSelected(int topRow, int leftCol,
+                                 int bottomRow, int rightCol)
+{
+    if ( m_selection )
+    {
+        switch ( m_selection->GetSelectionMode() )
+        {
+            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;
+        }
+    }
+
+    m_selectedBlockCorner = wxGridCellCoords(bottomRow, rightCol);
+    MakeCellVisible(m_selectedBlockCorner);
+
+    EnsureFirstLessThanSecond(topRow, bottomRow);
+    EnsureFirstLessThanSecond(leftCol, rightCol);
+
+    wxGridCellCoords updateTopLeft = wxGridCellCoords(topRow, leftCol),
+                     updateBottomRight = wxGridCellCoords(bottomRow, rightCol);
+
+    // First the case that we selected a completely new area
+    if ( m_selectedBlockTopLeft == wxGridNoCellCoords ||
+         m_selectedBlockBottomRight == wxGridNoCellCoords )
+    {
+        wxRect rect;
+        rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
+                                  wxGridCellCoords ( bottomRow, rightCol ) );
+        m_gridWin->Refresh( false, &rect );
+    }
  
  
-    if ( m_displayed )
+    // Now handle changing an existing selection area.
+    else if ( m_selectedBlockTopLeft != updateTopLeft ||
+              m_selectedBlockBottomRight != updateBottomRight )
      {
      {
-        wxClientDC dc(m_gridWin);
-        PrepareDC(dc);
-        DrawCellHighlight(dc);
+        // Compute two optimal update rectangles:
+        // Either one rectangle is a real subset of the
+        // other, or they are (almost) disjoint!
+        wxRect  rect[4];
+        bool    need_refresh[4];
+        need_refresh[0] =
+        need_refresh[1] =
+        need_refresh[2] =
+        need_refresh[3] = false;
+        int     i;
+
+        // Store intermediate values
+        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.
+        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
+        // is contained in the other.
+
+        if ( oldLeft < leftCol )
+        {
+            // 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 ) );
+        }
  
  
-        if ( IsSelection() )
+        if ( oldTop < topRow )
          {
          {
-            wxRect r( SelectionToDeviceRect() );
-            ClearSelection();
-            if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+            // 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 ) );
+        }
+
+        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 ) );
          }
          }
+
+        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 ) );
+        }
+
+        // various Refresh() calls
+        for (i = 0; i < 4; i++ )
+            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+                m_gridWin->Refresh( false, &(rect[i]) );
      }
      }
-}
  
  
+    // change selection
+    m_selectedBlockTopLeft = updateTopLeft;
+    m_selectedBlockBottomRight = updateBottomRight;
+}
  
  //
  // ------ functions to get/send data (see also public functions)
  
  //
  // ------ functions to get/send data (see also public functions)
@@ -3736,367 +4959,758 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
  
  bool wxGrid::GetModelValues()
  {
  
  bool wxGrid::GetModelValues()
  {
+    // Hide the editor, so it won't hide a changed value.
+    HideCellEditControl();
+
      if ( m_table )
      {
          // all we need to do is repaint the grid
          //
          m_gridWin->Refresh();
      if ( m_table )
      {
          // 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;
  
  bool wxGrid::SetModelValues()
  {
      int row, col;
  
+    // Disable the editor, so it won't hide a changed value.
+    // Do we also want to save the current value of the editor first?
+    // I think so ...
+    DisableCellEditControl();
+
      if ( m_table )
      {
      if ( m_table )
      {
-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = 0; row < m_numRows; row++ )
          {
          {
-            for ( col = 0;  col < m_numCols;  col++ )
+            for ( col = 0; col < m_numCols; col++ )
              {
                  m_table->SetValue( row, col, GetCellValue(row, col) );
              }
          }
  
              {
                  m_table->SetValue( row, col, GetCellValue(row, col) );
              }
          }
  
-        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)
  //
  // 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 )
+void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
  {
  {
-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numRows || !m_numCols )
+        return;
  
  
-    size_t i;
-    size_t numCells = m_cellsExposed.GetCount();
+    int i, numCells = cells.GetCount();
+    int row, col, cell_rows, cell_cols;
+    wxGridCellCoordsArray redrawCells;
+
+    for ( i = numCells - 1; i >= 0; i-- )
+    {
+        row = cells[i].GetRow();
+        col = cells[i].GetCol();
+        GetCellSize( row, col, &cell_rows, &cell_cols );
+
+        // 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++ )
+            {
+                if ( cell == cells[j] )
+                {
+                    marked = true;
+                    break;
+                }
+            }
+
+            if (!marked)
+            {
+                int count = redrawCells.GetCount();
+                for (int j = 0; j < count; j++)
+                {
+                    if ( cell == redrawCells[j] )
+                    {
+                        marked = true;
+                        break;
+                    }
+                }
+
+                if (!marked)
+                    redrawCells.Add( cell );
+            }
+
+            // don't bother drawing this cell
+            continue;
+        }
+
+        // If this cell is empty, find cell to left that might want to overflow
+        if (m_table && m_table->IsEmptyCell(row, col))
+        {
+            for ( int l = 0; l < cell_rows; l++ )
+            {
+                // find a cell in this row to leave already marked for repaint
+                int left = col;
+                for (int k = 0; k < int(redrawCells.GetCount()); k++)
+                    if ((redrawCells[k].GetCol() < left) &&
+                        (redrawCells[k].GetRow() == row))
+                    {
+                        left = redrawCells[k].GetCol();
+                    }
+
+                if (left == col)
+                    left = 0; // oh well
+
+                for (int j = col - 1; j >= left; j--)
+                {
+                    if (!m_table->IsEmptyCell(row + l, j))
+                    {
+                        if (GetCellOverflow(row + l, j))
+                        {
+                            wxGridCellCoords cell(row + l, j);
+                            bool marked = false;
+
+                            for (int k = 0; k < numCells; k++)
+                            {
+                                if ( cell == cells[k] )
+                                {
+                                    marked = true;
+                                    break;
+                                }
+                            }
+
+                            if (!marked)
+                            {
+                                int count = redrawCells.GetCount();
+                                for (int k = 0; k < count; k++)
+                                {
+                                    if ( cell == redrawCells[k] )
+                                    {
+                                        marked = true;
+                                        break;
+                                    }
+                                }
+                                if (!marked)
+                                    redrawCells.Add( cell );
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        DrawCell( dc, cells[i] );
+    }
+
+    numCells = redrawCells.GetCount();
  
  
-    for ( i = 0;  i < numCells;  i++ )
+    for ( i = numCells - 1; i >= 0; i-- )
      {
      {
-        DrawCell( dc, m_cellsExposed[i] );
+        DrawCell( dc, redrawCells[i] );
      }
  }
  
      }
  }
  
+void wxGrid::DrawGridSpace( wxDC& dc )
+{
+  int cw, ch;
+  m_gridWin->GetClientSize( &cw, &ch );
+
+  int right, bottom;
+  CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+  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(GetDefaultCellBackgroundColour());
+      dc.SetPen( *wxTRANSPARENT_PEN );
+
+      if ( right > rightCol )
+      {
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch );
+      }
+
+      if ( bottom > bottomRow )
+      {
+          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow );
+      }
+  }
+}
  
  void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
  {
      int row = coords.GetRow();
      int col = coords.GetCol();
  
  
  void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
  {
      int row = coords.GetRow();
      int col = coords.GetCol();
  
-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
          return;
  
      // we draw the cell border ourselves
          return;
  
      // we draw the cell border ourselves
-#if !WXGRID_DRAW_LINES
-    if ( m_gridLinesEnabled )
-        DrawCellBorder( dc, coords );
-#endif
+    wxGridCellAttr* attr = GetCellAttr(row, col);
  
  
-    // but all the rest is drawn by the cell renderer and hence may be
-    // customized
-    wxRect rect;
-    rect.x = m_colRights[col] - m_colWidths[col];
-    rect.y = m_rowBottoms[row] - m_rowHeights[row];
-    rect.width = m_colWidths[col]-1;
-    rect.height = m_rowHeights[row]-1;
+    bool isCurrent = coords == m_currentCellCoords;
  
  
-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
-    attr->DecRef();
+    wxRect rect = CellToRect( row, col );
  
  
-    if (m_currentCellCoords == coords)
-        DrawCellHighlight(dc);
-}
+    // if the editor is shown, we should use it and not the renderer
+    // 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
+        wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
+        renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
+        renderer->DecRef();
+    }
  
  
+    attr->DecRef();
+}
  
  
-void wxGrid::DrawCellHighlight( wxDC& dc )
+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();
  
      int row = m_currentCellCoords.GetRow();
      int col = m_currentCellCoords.GetCol();
  
-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
          return;
  
          return;
  
-    wxRect rect;
-    rect.x = m_colRights[col] - m_colWidths[col];
-    rect.y = m_rowBottoms[row] - m_rowHeights[row];
-    rect.width = m_colWidths[col] - 1;
-    rect.height = m_rowHeights[row] - 1;
-
-    dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    wxRect rect = CellToRect(row, col);
  
  
-    dc.DrawRectangle(rect);
-}
+    // hmmm... what could we do here to show that the cell is disabled?
+    // for now, I just draw a thinner border than for the other ones, but
+    // it doesn't look really good
  
  
-void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
-{
-    if ( m_colWidths[coords.GetCol()] <=0  ||
-         m_rowHeights[coords.GetRow()] <= 0 ) return;
+    int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth;
  
  
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
-    int row = coords.GetRow();
-    int col = coords.GetCol();
+    if (penWidth > 0)
+    {
+        // 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;
  
  
-    // right hand border
-    //
-    dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
-                 m_colRights[col], m_rowBottoms[row] );
+        // 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));
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(rect);
+    }
+}
  
  
-    // bottom border
-    //
-    dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
-                 m_colRights[col], m_rowBottoms[row] );
+wxPen wxGrid::GetDefaultGridLinePen()
+{
+    return wxPen(GetGridLineColour());
  }
  
  }
  
+wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
+{
+    return GetDefaultGridLinePen();
+}
  
  
-// 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 & reg )
+wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col))
  {
  {
-    if ( !m_gridLinesEnabled ||
-         !m_numRows ||
-         !m_numCols ) return;
+    return GetDefaultGridLinePen();
+}
  
  
-    int top, bottom, left, right;
+void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
+{
+    int row = coords.GetRow();
+    int col = coords.GetCol();
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        return;
  
  
-    if (reg.IsEmpty()){
-      int cw, ch;
-      m_gridWin->GetClientSize(&cw, &ch);
  
  
-      // virtual coords of visible area
-      //
-      CalcUnscrolledPosition( 0, 0, &left, &top );
-      CalcUnscrolledPosition( cw, ch, &right, &bottom );
-    }
-    else{
-      wxCoord x, y, w, h;
-      reg.GetBox(x, y, w, h);
-      CalcUnscrolledPosition( x, y, &left, &top );
-      CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
-    }
+    wxRect rect = CellToRect( row, col );
  
  
-    // avoid drawing grid lines past the last row and col
-    //
-    right = wxMin( right, m_colRights[m_numCols-1] );
-    bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] );
+    // right hand border
+    dc.SetPen( GetColGridLinePen(col) );
+    dc.DrawLine( rect.x + rect.width, rect.y,
+                 rect.x + rect.width, rect.y + rect.height + 1 );
  
  
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+    // bottom border
+    dc.SetPen( GetRowGridLinePen(row) );
+    dc.DrawLine( rect.x, rect.y + rect.height,
+                 rect.x + rect.width, rect.y + rect.height);
+}
  
  
-    // horizontal grid lines
+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
      //
      //
-    int i;
-    for ( i = 0; i < m_numRows; i++ )
+    if ( m_currentCellCoords == wxGridNoCellCoords &&
+         m_numRows && m_numCols )
      {
      {
-        if ( m_rowBottoms[i]-1 > bottom )
-        {
-            break;
-        }
-        else if ( m_rowBottoms[i]-1 >= top )
-        {
-            dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
-        }
+        m_currentCellCoords.Set(0, 0);
      }
  
      }
  
+    if ( IsCellEditControlShown() )
+    {
+        // don't show highlight when the edit control is shown
+        return;
+    }
  
  
-    // vertical grid lines
-    //
-    for ( i = 0; i < m_numCols; i++ )
+    // if the active cell was repainted, repaint its highlight too because it
+    // might have been damaged by the grid lines
+    size_t count = cells.GetCount();
+    for ( size_t n = 0; n < count; n++ )
      {
      {
-        if ( m_colRights[i]-1 > right )
+        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() )
          {
          {
-            break;
+            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);
          }
          }
-        else if ( m_colRights[i]-1 >= left )
+
+        if ( cell == m_currentCellCoords )
          {
          {
-            dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+            wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+            DrawCellHighlight(dc, attr);
+            attr->DecRef();
+
+            break;
          }
      }
  }
  
          }
      }
  }
  
-
-void wxGrid::DrawRowLabels( wxDC& dc )
+// 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 ( !m_numRows || !m_numCols ) return;
+    if ( !m_gridLinesEnabled )
+         return;
  
  
-    size_t i;
-    size_t numLabels = m_rowLabelsExposed.GetCount();
+    int top, bottom, left, right;
  
  
-    for ( i = 0;  i < numLabels;  i++ )
-    {
-        DrawRowLabel( dc, m_rowLabelsExposed[i] );
-    }
-}
+    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 )
+    {
+        if ( !m_numCols )
+            return;
  
  
+        const int lastColRight = GetColRight(GetColAt(m_numCols - 1));
+        if ( right > lastColRight )
+            right = lastColRight;
+    }
  
  
-void wxGrid::DrawRowLabel( wxDC& dc, int row )
+    if ( m_gridLinesClipVert )
+    {
+        if ( !m_numRows )
+            return;
+
+        const int lastRowBottom = GetRowBottom(m_numRows - 1);
+        if ( bottom > lastRowBottom )
+            bottom = lastRowBottom;
+    }
+
+    // no gridlines inside multicells, clip them out
+    int leftCol = GetColPos( internalXToCol(left) );
+    int topRow = internalYToRow(top);
+    int rightCol = GetColPos( internalXToCol(right) );
+    int bottomRow = internalYToRow(bottom);
+
+    wxRegion clippedcells(0, 0, cw, ch);
+
+    int cell_rows, cell_cols;
+    wxRect rect;
+
+    for ( int j = topRow; j <= bottomRow; j++ )
+    {
+        for ( int colPos = leftCol; colPos <= rightCol; colPos++ )
+        {
+            int i = GetColAt( colPos );
+
+            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);
+            }
+        }
+    }
+
+    dc.SetDeviceClippingRegion( clippedcells );
+
+
+    // horizontal grid lines
+    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 ( int colPos = leftCol; colPos < m_numCols; colPos++ )
+    {
+        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)
  {
  {
-    if ( m_rowHeights[row] <= 0 ) return;
+    if ( !m_numRows )
+        return;
  
  
-    int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+    const size_t numLabels = rows.GetCount();
+    for ( size_t i = 0; i < numLabels; i++ )
+    {
+        DrawRowLabel( dc, rows[i] );
+    }
+}
  
  
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawLine( m_rowLabelWidth-1, rowTop,
-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+void wxGrid::DrawRowLabel( wxDC& dc, int row )
+{
+    if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
+        return;
  
  
-    dc.DrawLine( 0, m_rowBottoms[row]-1,
-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+    wxGridCellAttrProvider * const
+        attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
  
  
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
-    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+    // 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.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+    wxRect rect(0, GetRowTop(row), m_rowLabelWidth, GetRowHeight(row));
+    rend.DrawBorder(*this, dc, rect);
  
      int hAlign, vAlign;
  
      int hAlign, vAlign;
-    GetRowLabelAlignment( &hAlign, &vAlign );
+    GetRowLabelAlignment(&hAlign, &vAlign);
  
  
-    wxRect rect;
-    rect.SetX( 2 );
-    rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 );
-    rect.SetWidth( m_rowLabelWidth - 4 );
-    rect.SetHeight( m_rowHeights[row] - 4 );
-    DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
+    rend.DrawLabel(*this, dc, GetRowLabelValue(row),
+                   rect, hAlign, vAlign, wxHORIZONTAL);
  }
  
  }
  
-
-void wxGrid::DrawColLabels( wxDC& dc )
+void wxGrid::UseNativeColHeader(bool native)
  {
  {
-    if ( !m_numRows || !m_numCols ) return;
+    if ( native == m_useNativeHeader )
+        return;
  
  
-    size_t i;
-    size_t numLabels = m_colLabelsExposed.GetCount();
+    delete m_colWindow;
+    m_useNativeHeader = native;
  
  
-    for ( i = 0;  i < numLabels;  i++ )
+    CreateColumnWindow();
+
+    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)
      {
      {
-        DrawColLabel( dc, m_colLabelsExposed[i] );
+        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;
+
+    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 ( m_colWidths[col] <= 0 ) return;
+    wxRect rect(wxSize(m_rowLabelWidth, m_colLabelHeight));
  
  
-    int colLeft = m_colRights[col] - m_colWidths[col];
+    if ( m_nativeColumnLabels )
+    {
+        rect.Deflate(1);
  
  
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawLine( m_colRights[col]-1, 0,
-                 m_colRights[col]-1, m_colLabelHeight-1 );
+        wxRendererNative::Get().DrawHeaderButton(m_cornerLabelWin, dc, rect, 0);
+    }
+    else
+    {
+        rect.width++;
+        rect.height++;
  
  
-    dc.DrawLine( colLeft, m_colLabelHeight-1,
-                 m_colRights[col]-1, m_colLabelHeight-1 );
+        wxGridCellAttrProvider * const
+            attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
+        const wxGridCornerHeaderRenderer&
+            rend = attrProvider ? attrProvider->GetCornerRenderer()
+                                : static_cast<wxGridCornerHeaderRenderer&>
+                                    (gs_defaultHeaderRenderers.cornerRenderer);
  
  
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
-    dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
+        rend.DrawBorder(*this, dc, rect);
+    }
+}
  
  
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+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
+    {
+        rend.DrawBorder(*this, dc, rect);
+    }
  
      int hAlign, vAlign;
  
      int hAlign, vAlign;
-    GetColLabelAlignment( &hAlign, &vAlign );
+    GetColLabelAlignment(&hAlign, &vAlign);
+    const int orient = GetColLabelTextOrientation();
  
  
-    wxRect rect;
-    rect.SetX( m_colRights[col] - m_colWidths[col] + 2 );
-    rect.SetY( 2 );
-    rect.SetWidth( m_colWidths[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,
  void wxGrid::DrawTextRectangle( wxDC& dc,
                                  const wxString& value,
                                  const wxRect& rect,
                                  int horizAlign,
-                                int vertAlign )
+                                int vertAlign,
+                                int textOrientation ) const
  {
  {
-    long textWidth, textHeight;
-    long lineWidth, lineHeight;
      wxArrayString lines;
  
      wxArrayString lines;
  
-    dc.SetClippingRegion( rect );
      StringToLines( value, lines );
      StringToLines( value, lines );
-    if ( lines.GetCount() )
-    {
+
+    DrawTextRectangle(dc, lines, rect, horizAlign, vertAlign, textOrientation);
+}
+
+void wxGrid::DrawTextRectangle(wxDC& dc,
+                               const wxArrayString& lines,
+                               const wxRect& rect,
+                               int horizAlign,
+                               int vertAlign,
+                               int textOrientation) const
+{
+    if ( lines.empty() )
+        return;
+
+    wxDCClipper clip(dc, rect);
+
+    long textWidth,
+         textHeight;
+
+    if ( textOrientation == wxHORIZONTAL )
          GetTextBoxSize( dc, lines, &textWidth, &textHeight );
          GetTextBoxSize( dc, lines, &textWidth, &textHeight );
-        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+    else
+        GetTextBoxSize( dc, lines, &textHeight, &textWidth );
  
  
-        float x, y;
-        switch ( horizAlign )
-        {
-            case wxRIGHT:
-                x = rect.x + (rect.width - textWidth - 1);
-                break;
+    int x = 0,
+        y = 0;
+    switch ( vertAlign )
+    {
+        case wxALIGN_BOTTOM:
+            if ( textOrientation == wxHORIZONTAL )
+                y = rect.y + (rect.height - textHeight - 1);
+            else
+                x = rect.x + rect.width - textWidth;
+            break;
  
  
-            case wxCENTRE:
-                x = rect.x + ((rect.width - textWidth)/2);
-                break;
+        case wxALIGN_CENTRE:
+            if ( textOrientation == wxHORIZONTAL )
+                y = rect.y + ((rect.height - textHeight) / 2);
+            else
+                x = rect.x + ((rect.width - textWidth) / 2);
+            break;
  
  
-            case wxLEFT:
-            default:
+        case wxALIGN_TOP:
+        default:
+            if ( textOrientation == wxHORIZONTAL )
+                y = rect.y + 1;
+            else
                  x = rect.x + 1;
                  x = rect.x + 1;
-                break;
+            break;
+    }
+
+    // Align each line of a multi-line label
+    size_t nLines = lines.GetCount();
+    for ( size_t l = 0; l < nLines; l++ )
+    {
+        const wxString& line = lines[l];
+
+        if ( line.empty() )
+        {
+            *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+            continue;
          }
  
          }
  
-        switch ( vertAlign )
+        wxCoord lineWidth = 0,
+             lineHeight = 0;
+        dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+        switch ( horizAlign )
          {
          {
-            case wxBOTTOM:
-                y = rect.y + (rect.height - textHeight - 1);
+            case wxALIGN_RIGHT:
+                if ( textOrientation == wxHORIZONTAL )
+                    x = rect.x + (rect.width - lineWidth - 1);
+                else
+                    y = rect.y + lineWidth + 1;
                  break;
  
                  break;
  
-            case wxCENTRE:
-                y = rect.y + ((rect.height - textHeight)/2);
+            case wxALIGN_CENTRE:
+                if ( textOrientation == wxHORIZONTAL )
+                    x = rect.x + ((rect.width - lineWidth) / 2);
+                else
+                    y = rect.y + rect.height - ((rect.height - lineWidth) / 2);
                  break;
  
                  break;
  
-            case wxTOP:
+            case wxALIGN_LEFT:
              default:
              default:
-                y = rect.y + 1;
+                if ( textOrientation == wxHORIZONTAL )
+                    x = rect.x + 1;
+                else
+                    y = rect.y + rect.height - 1;
                  break;
          }
  
                  break;
          }
  
-        for ( size_t i = 0;  i < lines.GetCount();  i++ )
+        if ( textOrientation == wxHORIZONTAL )
          {
          {
-            dc.DrawText( lines[i], (long)x, (long)y );
+            dc.DrawText( line, x, y );
              y += lineHeight;
          }
              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 );
  
  {
      int startPos = 0;
      int pos;
      wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
      wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
  
-    while ( startPos < (int)tVal.Length() )
+    while ( startPos < (int)tVal.length() )
      {
          pos = tVal.Mid(startPos).Find( eol );
          if ( pos < 0 )
      {
          pos = tVal.Mid(startPos).Find( eol );
          if ( pos < 0 )
@@ -4109,27 +5723,28 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
          }
          else
          {
          }
          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,
-                             wxArrayString& lines,
-                             long *width, long *height )
+void wxGrid::GetTextBoxSize( const wxDC& dc,
+                             const wxArrayString& lines,
+                             long *width, long *height ) const
  {
  {
-    long w = 0;
-    long h = 0;
-    long lineW, lineH;
+    wxCoord w = 0;
+    wxCoord h = 0;
+    wxCoord lineW = 0, lineH = 0;
  
      size_t i;
  
      size_t i;
-    for ( i = 0;  i < lines.GetCount();  i++ )
+    for ( i = 0; i < lines.GetCount(); i++ )
      {
          dc.GetTextExtent( lines[i], &lineW, &lineH );
          w = wxMax( w, lineW );
      {
          dc.GetTextExtent( lines[i], &lineW, &lineH );
          w = wxMax( w, lineW );
@@ -4140,57 +5755,149 @@ void wxGrid::GetTextBoxSize( wxDC& dc,
      *height = h;
  }
  
      *height = h;
  }
  
+//
+// ------ Batch processing.
+//
+void wxGrid::EndBatch()
+{
+    if ( m_batchCount > 0 )
+    {
+        m_batchCount--;
+        if ( !m_batchCount )
+        {
+            CalcDimensions();
+            m_rowLabelWin->Refresh();
+            m_colWindow->Refresh();
+            m_cornerLabelWin->Refresh();
+            m_gridWin->Refresh();
+        }
+    }
+}
+
+// Use this, rather than wxWindow::Refresh(), to force an immediate
+// repainting of the grid. Has no effect if you are already inside a
+// BeginBatch / EndBatch block.
+//
+void wxGrid::ForceRefresh()
+{
+    BeginBatch();
+    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
  //
  
  
  //
  // ------ Edit control functions
  //
  
-
  void wxGrid::EnableEditing( bool edit )
  {
  void wxGrid::EnableEditing( bool edit )
  {
-    // TODO: improve this ?
-    //
      if ( edit != m_editable )
      {
      if ( edit != m_editable )
      {
+        if (!edit)
+            EnableCellEditControl(edit);
          m_editable = edit;
          m_editable = edit;
-
-        EnableCellEditControl(m_editable);
      }
  }
  
      }
  }
  
-
  void wxGrid::EnableCellEditControl( bool enable )
  {
      if (! m_editable)
          return;
  
  void wxGrid::EnableCellEditControl( bool enable )
  {
      if (! m_editable)
          return;
  
-    if ( m_currentCellCoords == wxGridNoCellCoords )
-        SetCurrentCell( 0, 0 );
-
      if ( enable != m_cellEditCtrlEnabled )
      {
          if ( enable )
          {
      if ( enable != m_cellEditCtrlEnabled )
      {
          if ( enable )
          {
+            if ( SendEvent(wxEVT_GRID_EDITOR_SHOWN) == -1 )
+                return;
+
+            // this should be checked by the caller!
+            wxASSERT_MSG( CanEnableCellControl(), wxT("can't enable editing for this cell!") );
+
+            // do it before ShowCellEditControl()
              m_cellEditCtrlEnabled = enable;
              m_cellEditCtrlEnabled = enable;
-            SetEditControlValue();
+
              ShowCellEditControl();
          }
          else
          {
              ShowCellEditControl();
          }
          else
          {
+            SendEvent(wxEVT_GRID_EDITOR_HIDDEN);
+
              HideCellEditControl();
              SaveEditControlValue();
              HideCellEditControl();
              SaveEditControlValue();
+
+            // do it after HideCellEditControl()
              m_cellEditCtrlEnabled = enable;
          }
      }
  }
  
              m_cellEditCtrlEnabled = enable;
          }
      }
  }
  
+bool wxGrid::IsCurrentCellReadOnly() const
+{
+    // const_cast
+    wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords);
+    bool readonly = attr->IsReadOnly();
+    attr->DecRef();
+
+    return readonly;
+}
+
+bool wxGrid::CanEnableCellControl() const
+{
+    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;
+}
+
+bool wxGrid::IsCellEditControlShown() const
+{
+    bool isShown = false;
+
+    if ( m_cellEditCtrlEnabled )
+    {
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col);
+        attr->DecRef();
+
+        if ( editor )
+        {
+            if ( editor->IsCreated() )
+            {
+                isShown = editor->GetControl()->IsShown();
+            }
+
+            editor->DecRef();
+        }
+    }
+
+    return isShown;
+}
  
  void wxGrid::ShowCellEditControl()
  {
      if ( IsCellEditControlEnabled() )
      {
  
  void wxGrid::ShowCellEditControl()
  {
      if ( IsCellEditControlEnabled() )
      {
-        if ( !IsVisible( m_currentCellCoords ) )
+        if ( !IsVisible( m_currentCellCoords, false ) )
          {
          {
+            m_cellEditCtrlEnabled = false;
              return;
          }
          else
              return;
          }
          else
@@ -4199,71 +5906,116 @@ void wxGrid::ShowCellEditControl()
              int row = m_currentCellCoords.GetRow();
              int col = m_currentCellCoords.GetCol();
  
              int row = m_currentCellCoords.GetRow();
              int col = m_currentCellCoords.GetCol();
  
-            // convert to scrolled coords
-            //
-            int left, top, right, bottom;
-            CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
-            CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
-            left--; top--; right--; bottom--;   // cell is shifted by one pixel
-            int cw, ch;
-            m_gridWin->GetClientSize( &cw, &ch );
-
-            // Make the edit control large enough to allow for internal margins
-            // TODO: remove this if the text ctrl sizing is improved esp. for unix
-            //
-            int extra;
-#if defined(__WXMOTIF__)
-            if ( row == 0  || col == 0 )
+            // if this is part of a multicell, find owner (topleft)
+            int cell_rows, cell_cols;
+            GetCellSize( row, col, &cell_rows, &cell_cols );
+            if ( cell_rows <= 0 || cell_cols <= 0 )
              {
              {
-                extra = 2;
+                row += cell_rows;
+                col += cell_cols;
+                m_currentCellCoords.SetRow( row );
+                m_currentCellCoords.SetCol( col );
              }
              }
-            else
+
+            // erase the highlight and the cell contents because the editor
+            // might not cover the entire cell
+            wxClientDC dc( m_gridWin );
+            PrepareDC( dc );
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            dc.SetBrush(wxBrush(attr->GetBackgroundColour()));
+            dc.SetPen(*wxTRANSPARENT_PEN);
+            dc.DrawRectangle(rect);
+
+            // 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
+            // since the SetSize() method interprets that as
+            // "don't change."
+            if (rect.x > 0)
+                rect.x--;
+            if (rect.y > 0)
+                rect.y--;
+
+            wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+            if ( !editor->IsCreated() )
              {
              {
-                extra = 4;
+                editor->Create(m_gridWin, wxID_ANY,
+                               new wxGridCellEditorEvtHandler(this, editor));
+
+                wxGridEditorCreatedEvent evt(GetId(),
+                                             wxEVT_GRID_EDITOR_CREATED,
+                                             this,
+                                             row,
+                                             col,
+                                             editor->GetControl());
+                GetEventHandler()->ProcessEvent(evt);
              }
              }
-#else
-            if ( row == 0  || col == 0 )
+
+            // resize editor to overflow into righthand cells if allowed
+            int maxWidth = rect.width;
+            wxString value = GetCellValue(row, col);
+            if ( (value != wxEmptyString) && (attr->GetOverflow()) )
              {
              {
-                extra = 1;
+                int y;
+                GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont());
+                if (maxWidth < rect.width)
+                    maxWidth = rect.width;
              }
              }
-            else
+
+            int client_right = m_gridWin->GetClientSize().GetWidth();
+            if (rect.x + maxWidth > client_right)
+                maxWidth = client_right - rect.x;
+
+            if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
              {
              {
-                extra = 2;
-            }
-#endif
+                GetCellSize( row, col, &cell_rows, &cell_cols );
+                // may have changed earlier
+                for (int i = col + cell_cols; i < m_numCols; i++)
+                {
+                    int c_rows, c_cols;
+                    GetCellSize( row, i, &c_rows, &c_cols );
  
  
-#if defined(__WXGTK__)
-            int top_diff = 0;
-            int left_diff = 0;
-            if (left != 0) left_diff++;
-            if (top != 0) top_diff++;
-            rect.SetLeft( left + left_diff );
-            rect.SetTop( top + top_diff );
-            rect.SetRight( rect.GetRight() - left_diff );
-            rect.SetBottom( rect.GetBottom() - top_diff );
-#else
-            rect.SetLeft( wxMax(0, left - extra) );
-            rect.SetTop( wxMax(0, top - extra) );
-            rect.SetRight( rect.GetRight() + 2*extra );
-            rect.SetBottom( rect.GetBottom() + 2*extra );
-#endif
+                    // looks weird going over a multicell
+                    if (m_table->IsEmptyCell( row, i ) &&
+                            (rect.width < maxWidth) && (c_rows == 1))
+                    {
+                        rect.width += GetColWidth( i );
+                    }
+                    else
+                        break;
+                }
  
  
-            wxGridCellAttr*   attr = GetCellAttr(row, col);
-            wxGridCellEditor* editor = attr->GetEditor();
-            if (! editor->IsCreated()) {
-                editor->Create(m_gridWin, -1,
-                               new wxGridCellEditorEvtHandler(this, editor));
+                if (rect.GetRight() > client_right)
+                    rect.SetRight( client_right - 1 );
              }
  
              }
  
+            editor->SetCellAttr( attr );
              editor->SetSize( rect );
              editor->SetSize( rect );
-            editor->Show( TRUE );
-            editor->BeginEdit(row, col, this, 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
+            CalcDimensions();
+
+            editor->BeginEdit(row, col, this);
+            editor->SetCellAttr(NULL);
+
+            editor->DecRef();
              attr->DecRef();
              attr->DecRef();
-         }
+        }
      }
  }
  
      }
  }
  
-
  void wxGrid::HideCellEditControl()
  {
      if ( IsCellEditControlEnabled() )
  void wxGrid::HideCellEditControl()
  {
      if ( IsCellEditControlEnabled() )
@@ -4271,41 +6023,69 @@ void wxGrid::HideCellEditControl()
          int row = m_currentCellCoords.GetRow();
          int col = m_currentCellCoords.GetCol();
  
          int row = m_currentCellCoords.GetRow();
          int col = m_currentCellCoords.GetCol();
  
-        wxGridCellAttr*   attr = GetCellAttr(row, col);
-        attr->GetEditor()->Show( FALSE );
+        wxGridCellAttr *attr = GetCellAttr(row, col);
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        const bool editorHadFocus = editor->GetControl()->HasFocus();
+        editor->Show( false );
+        editor->DecRef();
          attr->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;
+
+#ifdef __WXMAC__
+        // ensure that the pixels under the focus ring get refreshed as well
+        rect.Inflate(10, 10);
+#endif
  
  
-void wxGrid::SetEditControlValue( const wxString& value )
-{
-    // RD: The new Editors get the value from the table themselves now.  This
-    // method can probably be removed...
+        m_gridWin->Refresh( false, &rect );
+    }
  }
  
  }
  
-
  void wxGrid::SaveEditControlValue()
  {
  void wxGrid::SaveEditControlValue()
  {
-    if (IsCellEditControlEnabled()) {
+    if ( IsCellEditControlEnabled() )
+    {
          int row = m_currentCellCoords.GetRow();
          int col = m_currentCellCoords.GetCol();
  
          int row = m_currentCellCoords.GetRow();
          int col = m_currentCellCoords.GetCol();
  
-        wxGridCellAttr*   attr = GetCellAttr(row, col);
-        bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this, attr);
+        wxString oldval = GetCellValue(row, col);
  
  
-        attr->DecRef();
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+
+        wxString newval;
+        bool changed = editor->EndEdit(row, col, this, oldval, &newval);
  
  
-        if (changed) {
-            SendEvent( EVT_GRID_CELL_CHANGE,
-                       m_currentCellCoords.GetRow(),
-                       m_currentCellCoords.GetCol() );
+        if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 )
+        {
+            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);
+            }
          }
          }
+
+        editor->DecRef();
+        attr->DecRef();
      }
  }
  
      }
  }
  
-
  //
  // ------ Grid location functions
  //  Note that all of these functions work with the logical coordinates of
  //
  // ------ Grid location functions
  //  Note that all of these functions work with the logical coordinates of
@@ -4313,110 +6093,198 @@ void wxGrid::SaveEditControlValue()
  //  coordinates for mouse events etc.
  //
  
  //  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);
  
  {
      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);
  }
  
  }
  
-
-int wxGrid::YToRow( int y )
+// 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
  {
  {
-    int i;
+    const int numLines = oper.GetNumberOfLines(this);
+
+    if ( coord < 0 )
+        return clipToMinMax && numLines > 0 ? 0 : wxNOT_FOUND;
+
+    const int defaultLineSize = oper.GetDefaultLineSize(this);
+    wxCHECK_MSG( defaultLineSize, -1, "can't have 0 default line size" );
  
  
-    for ( i = 0;  i < m_numRows;  i++ )
+    int maxPos = coord / defaultLineSize,
+        minPos = 0;
+
+    // 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 ( y < m_rowBottoms[i] ) return i;
+        if ( maxPos < numLines )
+            return maxPos;
+
+        return clipToMinMax ? numLines - 1 : -1;
      }
  
      }
  
-    return m_numRows; //-1;
-}
  
  
+    // adjust maxPos before starting the binary search
+    if ( maxPos >= numLines )
+    {
+        maxPos = numLines  - 1;
+    }
+    else
+    {
+        if ( coord >= lineEnds[oper.GetLineAt(this, maxPos)])
+        {
+            minPos = maxPos;
+            const int minDist = oper.GetMinimalAcceptableLineSize(this);
+            if ( minDist )
+                maxPos = coord / minDist;
+            else
+                maxPos = numLines - 1;
+        }
  
  
-int wxGrid::XToCol( int x )
-{
-    int i;
+        if ( maxPos >= numLines )
+            maxPos = numLines  - 1;
+    }
+
+    // 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;
  
  
-    for ( i = 0;  i < m_numCols;  i++ )
+
+    // finally do perform the binary search
+    while ( minPos < maxPos )
      {
      {
-        if ( x < m_colRights[i] ) return i;
+        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
+            maxPos--;
+
+        const int median = minPos + (maxPos - minPos + 1) / 2;
+        if ( coord < lineEnds[oper.GetLineAt(this, median)] )
+            maxPos = median;
+        else
+            minPos = median;
      }
  
      }
  
-    return m_numCols; //-1;
+    return maxPos;
  }
  
  }
  
-
-// return the row number that that the y coord is near the edge of, or
-// -1 if not near an edge
-//
-int wxGrid::YToEdgeOfRow( int y )
+int
+wxGrid::PosToLine(int coord,
+                  bool clipToMinMax,
+                  const wxGridOperations& oper) const
  {
  {
-    int i, d;
+    int pos = PosToLinePos(coord, clipToMinMax, oper);
  
  
-    for ( i = 0;  i < m_numRows;  i++ )
-    {
-        if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE )
-        {
-            d = abs( y - m_rowBottoms[i] );
-            {
-                if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-            }
-        }
-    }
+    return pos == wxNOT_FOUND ? wxNOT_FOUND : oper.GetLineAt(this, pos);
+}
  
  
-    return -1;
+int wxGrid::YToRow(int y, bool clipToMinMax) const
+{
+    return PosToLine(y, clipToMinMax, wxGridRowOperations());
  }
  
  }
  
+int wxGrid::XToCol(int x, bool clipToMinMax) const
+{
+    return PosToLine(x, clipToMinMax, wxGridColumnOperations());
+}
+
+int wxGrid::XToPos(int x) const
+{
+    return PosToLinePos(x, true /* clip */, wxGridColumnOperations());
+}
  
  
-// return the col number that that the x 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::XToEdgeOfCol( int x )
+// 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, d;
+    const int line = oper.PosToLine(this, pos, true);
  
  
-    for ( i = 0;  i < m_numCols;  i++ )
+    if ( oper.GetLineSize(this, line) > WXGRID_LABEL_EDGE_ZONE )
      {
      {
-        if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE )
-        {
-            d = abs( x - m_colRights[i] );
-            {
-                if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-            }
-        }
+        // 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 -1;
  }
  
+int wxGrid::YToEdgeOfRow(int y) const
+{
+    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 );
  
  {
      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 )
      {
      {
-        rect.x = m_colRights[col] - m_colWidths[col];
-        rect.y = m_rowBottoms[row] - m_rowHeights[row];
-        rect.width = m_colWidths[col];
-        rect.height = m_rowHeights[ row ];
+        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;
+        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++)
+            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;
+        }
      }
  
      return rect;
  }
  
      }
  
      return rect;
  }
  
-
-bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const
  {
      // get the cell rectangle in logical coords
      //
  {
      // get the cell rectangle in logical coords
      //
@@ -4429,27 +6297,24 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
      CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
  
      // check against the client area of the grid window
      CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
  
      // check against the client area of the grid window
-    //
      int cw, ch;
      m_gridWin->GetClientSize( &cw, &ch );
  
      if ( wholeCellVisible )
      {
          // is the cell wholly visible ?
      int cw, ch;
      m_gridWin->GetClientSize( &cw, &ch );
  
      if ( wholeCellVisible )
      {
          // is the cell wholly visible ?
-        //
-        return ( left >= 0  &&  right <= cw  &&
-                 top >= 0  &&  bottom <= ch );
+        return ( left >= 0 && right <= cw &&
+                 top >= 0 && bottom <= ch );
      }
      else
      {
          // is the cell partly visible ?
          //
      }
      else
      {
          // is the cell partly visible ?
          //
-        return ( ((left >=0 && left < cw) || (right > 0 && right <= cw))  &&
-                 ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+        return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) &&
+                 ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) );
      }
  }
  
      }
  }
  
-
  // make the specified cell location visible by doing a minimal amount
  // of scrolling
  //
  // make the specified cell location visible by doing a minimal amount
  // of scrolling
  //
@@ -4458,15 +6323,13 @@ void wxGrid::MakeCellVisible( int row, int col )
      int i;
      int xpos = -1, ypos = -1;
  
      int i;
      int xpos = -1, ypos = -1;
  
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    if ( row >= 0 && row < m_numRows &&
+         col >= 0 && col < m_numCols )
      {
          // get the cell rectangle in logical coords
      {
          // get the cell rectangle in logical coords
-        //
          wxRect r( CellToRect( row, col ) );
  
          // convert to device coords
          wxRect r( CellToRect( row, col ) );
  
          // convert to device coords
-        //
          int left, top, right, bottom;
          CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
          CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
          int left, top, right, bottom;
          CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
          CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
@@ -4482,428 +6345,279 @@ void wxGrid::MakeCellVisible( int row, int col )
          {
              int h = r.GetHeight();
              ypos = r.GetTop();
          {
              int h = r.GetHeight();
              ypos = r.GetTop();
-            for ( i = row-1;  i >= 0;  i-- )
+            for ( i = row - 1; i >= 0; i-- )
              {
              {
-                if ( h + m_rowHeights[i] > ch ) break;
+                int rowHeight = GetRowHeight(i);
+                if ( h + rowHeight > ch )
+                    break;
  
  
-                h += m_rowHeights[i];
-                ypos -= m_rowHeights[i];
+                h += rowHeight;
+                ypos -= rowHeight;
              }
  
              // we divide it later by GRID_SCROLL_LINE, make sure that we don't
              }
  
              // we divide it later by GRID_SCROLL_LINE, make sure that we don't
-            // have rounding errors (this is important, because if we do, we
-            // might not scroll at all and some cells won't be redrawn)
-            ypos += GRID_SCROLL_LINE / 2;
+            // 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 += m_scrollLineY;
          }
  
          }
  
-        if ( left < 0 )
+        // special handling for wide cells - show always left part of the cell!
+        // Otherwise, e.g. when stepping from row to row, it would jump between
+        // left and right part of the cell on every step!
+//      if ( left < 0 )
+        if ( left < 0 || (right - left) >= cw )
          {
              xpos = r.GetLeft();
          }
          else if ( right > cw )
          {
          {
              xpos = r.GetLeft();
          }
          else if ( right > cw )
          {
-            int w = r.GetWidth();
-            xpos = r.GetLeft();
-            for ( i = col-1;  i >= 0;  i-- )
-            {
-                if ( w + m_colWidths[i] > cw ) break;
-
-                w += m_colWidths[i];
-                xpos -= m_colWidths[i];
-            }
+            // position the view so that the cell is on the right
+            int x0, y0;
+            CalcUnscrolledPosition(0, 0, &x0, &y0);
+            xpos = x0 + (right - cw);
  
              // see comment for ypos above
  
              // see comment for ypos above
-            xpos += GRID_SCROLL_LINE / 2;
+            xpos += m_scrollLineX;
          }
  
          }
  
-        if ( xpos != -1  ||  ypos != -1 )
+        if ( xpos != -1 || ypos != -1 )
          {
          {
-            if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
-            if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
+            if ( xpos != -1 )
+                xpos /= m_scrollLineX;
+            if ( ypos != -1 )
+                ypos /= m_scrollLineY;
              Scroll( xpos, ypos );
              AdjustScrollbars();
          }
      }
  }
  
              Scroll( xpos, ypos );
              AdjustScrollbars();
          }
      }
  }
  
-
  //
  // ------ Grid cursor movement functions
  //
  
  //
  // ------ Grid cursor movement functions
  //
  
-bool wxGrid::MoveCursorUp()
+bool
+wxGrid::DoMoveCursor(bool expandSelection,
+                     const wxGridDirectionOperations& diroper)
  {
  {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() > 0 )
-    {
-        MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
-
-        SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;
  
  
-        return TRUE;
-    }
+    if ( expandSelection )
+    {
+        wxGridCellCoords coords = m_selectedBlockCorner;
+        if ( coords == wxGridNoCellCoords )
+            coords = m_currentCellCoords;
  
  
-    return FALSE;
-}
+        if ( diroper.IsAtBoundary(coords) )
+            return false;
  
  
+        diroper.Advance(coords);
  
  
-bool wxGrid::MoveCursorDown()
-{
-    // TODO: allow for scrolling
-    //
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
+        UpdateBlockBeingSelected(m_currentCellCoords, coords);
+    }
+    else // don't expand selection
      {
      {
-        MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
+        ClearSelection();
+
+        if ( diroper.IsAtBoundary(m_currentCellCoords) )
+            return false;
  
  
-        SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
+        wxGridCellCoords coords = m_currentCellCoords;
+        diroper.Advance(coords);
  
  
-        return TRUE;
+        GoToCell(coords);
      }
  
      }
  
-    return FALSE;
+    return true;
  }
  
  }
  
-
-bool wxGrid::MoveCursorLeft()
+bool wxGrid::MoveCursorUp(bool expandSelection)
  {
  {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
-    {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
-
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
+    return DoMoveCursor(expandSelection,
+                        wxGridBackwardOperations(this, wxGridRowOperations()));
+}
  
  
-        return TRUE;
-    }
+bool wxGrid::MoveCursorDown(bool expandSelection)
+{
+    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::MoveCursorRight()
+bool wxGrid::DoMoveCursorByPage(const wxGridDirectionOperations& diroper)
  {
  {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols - 1 )
-    {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        return false;
  
  
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
+    if ( diroper.IsAtBoundary(m_currentCellCoords) )
+        return false;
  
  
-        return TRUE;
+    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();
      }
  
      }
  
-    return FALSE;
-}
+    GoToCell(newRow, m_currentCellCoords.GetCol());
  
  
+    return true;
+}
  
  bool wxGrid::MovePageUp()
  {
  
  bool wxGrid::MovePageUp()
  {
-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
-
-    int row = m_currentCellCoords.GetRow();
-    if ( row > 0 )
-    {
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
-
-        int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
-        int newRow = YToRow( y - ch + 1 );
-        if ( newRow == -1 )
-        {
-            newRow = 0;
-        }
-        else if ( newRow == row )
-        {
-            newRow = row - 1;
-        }
-
-        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
-        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
-
-        return TRUE;
-    }
-
-    return FALSE;
+    return DoMoveCursorByPage(
+                wxGridBackwardOperations(this, wxGridRowOperations()));
  }
  
  bool wxGrid::MovePageDown()
  {
  }
  
  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 = m_rowBottoms[ row ] - m_rowHeights[ 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()
+// 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 );
-        SetCurrentCell( row, col );
-
-        return TRUE;
+        diroper.Advance(coords);
+        if ( !m_table->IsEmpty(coords) )
+            break;
      }
      }
-
-    return FALSE;
  }
  
  }
  
-bool wxGrid::MoveCursorDownBlock()
+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 );
-        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()
-{
-    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;
                      break;
-                }
+
+                coords = coordsNext;
              }
          }
              }
          }
+    }
  
  
-        MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
-
-        return TRUE;
+    if ( expandSelection )
+    {
+        UpdateBlockBeingSelected(m_currentCellCoords, coords);
+    }
+    else
+    {
+        ClearSelection();
+        GoToCell(coords);
      }
  
      }
  
-    return FALSE;
+    return true;
  }
  
  }
  
-bool wxGrid::MoveCursorRightBlock()
+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 );
-        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
  //
  
  
  //
  // ------ 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 )
      {
  {
      if ( m_table )
      {
@@ -4917,7 +6631,7 @@ wxString wxGrid::GetRowLabelValue( int row )
      }
  }
  
      }
  }
  
-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const
  {
      if ( m_table )
      {
  {
      if ( m_table )
      {
@@ -4931,66 +6645,77 @@ wxString wxGrid::GetColLabelValue( int col )
      }
  }
  
      }
  }
  
-
  void wxGrid::SetRowLabelSize( int width )
  {
  void wxGrid::SetRowLabelSize( int width )
  {
-    width = wxMax( width, 0 );
+    wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE );
+
+    if ( width == wxGRID_AUTOSIZE )
+    {
+        width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW);
+    }
+
      if ( width != m_rowLabelWidth )
      {
          if ( width == 0 )
          {
      if ( width != m_rowLabelWidth )
      {
          if ( width == 0 )
          {
-            m_rowLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_rowLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );
          }
          else if ( m_rowLabelWidth == 0 )
          {
          }
          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();
          }
  
          m_rowLabelWidth = width;
          CalcWindowSizes();
-        Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );
      }
  }
  
      }
  }
  
-
  void wxGrid::SetColLabelSize( int height )
  {
  void wxGrid::SetColLabelSize( int height )
  {
-    height = wxMax( height, 0 );
+    wxASSERT( height >=0 || height == wxGRID_AUTOSIZE );
+
+    if ( height == wxGRID_AUTOSIZE )
+    {
+        height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN);
+    }
+
      if ( height != m_colLabelHeight )
      {
          if ( height == 0 )
          {
      if ( height != m_colLabelHeight )
      {
          if ( height == 0 )
          {
-            m_colLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_colWindow->Show( false );
+            m_cornerLabelWin->Show( false );
          }
          else if ( m_colLabelHeight == 0 )
          {
          }
          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();
          }
  
          m_colLabelHeight = height;
          CalcWindowSizes();
-        Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );
      }
  }
  
      }
  }
  
-
  void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
  {
      if ( m_labelBackgroundColour != colour )
      {
          m_labelBackgroundColour = colour;
          m_rowLabelWin->SetBackgroundColour( colour );
  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_cornerLabelWin->SetBackgroundColour( colour );
  
          if ( !GetBatchCount() )
          {
              m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
+            m_colWindow->Refresh();
              m_cornerLabelWin->Refresh();
          }
      }
              m_cornerLabelWin->Refresh();
          }
      }
@@ -5004,7 +6729,7 @@ void wxGrid::SetLabelTextColour( const wxColour& colour )
          if ( !GetBatchCount() )
          {
              m_rowLabelWin->Refresh();
          if ( !GetBatchCount() )
          {
              m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
+            m_colWindow->Refresh();
          }
      }
  }
          }
      }
  }
@@ -5015,18 +6740,33 @@ void wxGrid::SetLabelFont( const wxFont& font )
      if ( !GetBatchCount() )
      {
          m_rowLabelWin->Refresh();
      if ( !GetBatchCount() )
      {
          m_rowLabelWin->Refresh();
-        m_colLabelWin->Refresh();
+        m_colWindow->Refresh();
      }
  }
  
  void wxGrid::SetRowLabelAlignment( int horiz, int vert )
  {
      }
  }
  
  void wxGrid::SetRowLabelAlignment( int horiz, int vert )
  {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    // allow old (incorrect) defs to be used
+    switch ( horiz )
+    {
+        case wxLEFT:   horiz = wxALIGN_LEFT; break;
+        case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
+        case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+    }
+
+    switch ( vert )
+    {
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
+
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
      {
          m_rowLabelHorizAlign = horiz;
      }
  
      {
          m_rowLabelHorizAlign = horiz;
      }
  
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
      {
          m_rowLabelVertAlign = vert;
      }
      {
          m_rowLabelVertAlign = vert;
      }
@@ -5039,22 +6779,53 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert )
  
  void wxGrid::SetColLabelAlignment( int horiz, int vert )
  {
  
  void wxGrid::SetColLabelAlignment( int horiz, int vert )
  {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    // allow old (incorrect) defs to be used
+    switch ( horiz )
+    {
+        case wxLEFT:   horiz = wxALIGN_LEFT; break;
+        case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
+        case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+    }
+
+    switch ( vert )
+    {
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
+
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
      {
          m_colLabelHorizAlign = horiz;
      }
  
      {
          m_colLabelHorizAlign = horiz;
      }
  
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
      {
          m_colLabelVertAlign = vert;
      }
  
      if ( !GetBatchCount() )
      {
      {
          m_colLabelVertAlign = 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 )
  void wxGrid::SetRowLabelValue( int row, const wxString& s )
  {
      if ( m_table )
@@ -5062,13 +6833,13 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
          m_table->SetRowLabelValue( row, s );
          if ( !GetBatchCount() )
          {
          m_table->SetRowLabelValue( row, s );
          if ( !GetBatchCount() )
          {
-            wxRect rect = CellToRect( row, 0);
+            wxRect rect = CellToRect( row, 0 );
              if ( rect.height > 0 )
              {
                  CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
              if ( rect.height > 0 )
              {
                  CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
-                rect.x = m_left;
+                rect.x = 0;
                  rect.width = m_rowLabelWidth;
                  rect.width = m_rowLabelWidth;
-                m_rowLabelWin->Refresh( TRUE, &rect );
+                m_rowLabelWin->Refresh( true, &rect );
              }
          }
      }
              }
          }
      }
@@ -5081,13 +6852,20 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
          m_table->SetColLabelValue( col, s );
          if ( !GetBatchCount() )
          {
          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 = m_top;
-                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 );
+                }
              }
          }
      }
              }
          }
      }
@@ -5099,10 +6877,78 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
      {
          m_gridLineColour = colour;
  
      {
          m_gridLineColour = colour;
  
+        if ( GridLinesEnabled() )
+            RedrawGridLines();
+    }
+}
+
+void wxGrid::SetCellHighlightColour( const wxColour& colour )
+{
+    if ( m_cellHighlightColour != colour )
+    {
+        m_cellHighlightColour = colour;
+
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+        DrawCellHighlight(dc, attr);
+        attr->DecRef();
+    }
+}
+
+void wxGrid::SetCellHighlightPenWidth(int 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 ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+
+        wxRect rect = CellToRect(row, col);
+        m_gridWin->Refresh(true, &rect);
+    }
+}
+
+void wxGrid::SetCellHighlightROPenWidth(int 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 ( row == -1 || col == -1 ||
+                GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+
+        wxRect rect = CellToRect(row, col);
+        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() );
      }
          wxClientDC dc( m_gridWin );
          PrepareDC( dc );
          DrawAllGridLines( dc, wxRegion() );
      }
+    else // remove the grid lines
+    {
+        m_gridWin->Refresh();
+    }
  }
  
  void wxGrid::EnableGridLines( bool enable )
  }
  
  void wxGrid::EnableGridLines( bool enable )
@@ -5111,45 +6957,43 @@ void wxGrid::EnableGridLines( bool enable )
      {
          m_gridLinesEnabled = 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;
  }
  
  {
      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 m_rowHeights[row];
+    return GetRowHeight(row);
  }
  
  }
  
-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const
  {
      return m_defaultColWidth;
  }
  
  {
      return m_defaultColWidth;
  }
  
-int wxGrid::GetColSize( int col )
+int wxGrid::GetColSize( int col ) const
  {
  {
-    wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
+    wxCHECK_MSG( col >= 0 && col < m_numCols, 0, wxT("invalid column index") );
  
  
-    return m_colWidths[col];
+    return GetColWidth(col);
  }
  
  // ============================================================================
  }
  
  // ============================================================================
@@ -5164,6 +7008,9 @@ int wxGrid::GetColSize( int col )
  void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
  {
      m_defaultCellAttr->SetBackgroundColour(col);
  void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
  {
      m_defaultCellAttr->SetBackgroundColour(col);
+#ifdef __WXGTK__
+    m_gridWin->SetBackgroundColour(col);
+#endif
  }
  
  void wxGrid::SetDefaultCellTextColour( const wxColour& col )
  }
  
  void wxGrid::SetDefaultCellTextColour( const wxColour& col )
@@ -5176,132 +7023,206 @@ void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
      m_defaultCellAttr->SetAlignment(horiz, vert);
  }
  
      m_defaultCellAttr->SetAlignment(horiz, vert);
  }
  
+void wxGrid::SetDefaultCellOverflow( bool allow )
+{
+    m_defaultCellAttr->SetOverflow(allow);
+}
+
  void wxGrid::SetDefaultCellFont( const wxFont& font )
  {
      m_defaultCellAttr->SetFont(font);
  }
  
  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)
  {
  void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
  {
-    m_defaultCellAttr->SetRenderer(renderer);
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     renderer,
+                     GetDefaultEditorForType(wxGRID_VALUE_STRING));
+}
+
+void wxGrid::SetDefaultEditor(wxGridCellEditor *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();
  }
  
  {
      return m_defaultCellAttr->GetBackgroundColour();
  }
  
-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const
  {
      return m_defaultCellAttr->GetTextColour();
  }
  
  {
      return m_defaultCellAttr->GetTextColour();
  }
  
-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const
  {
      return m_defaultCellAttr->GetFont();
  }
  
  {
      return m_defaultCellAttr->GetFont();
  }
  
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const
  {
      m_defaultCellAttr->GetAlignment(horiz, vert);
  }
  
  {
      m_defaultCellAttr->GetAlignment(horiz, vert);
  }
  
+bool wxGrid::GetDefaultCellOverflow() const
+{
+    return m_defaultCellAttr->GetOverflow();
+}
+
  wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
  {
  wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
  {
-    return m_defaultCellAttr->GetRenderer();
+    return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
+}
+
+wxGridCellEditor *wxGrid::GetDefaultEditor() const
+{
+    return m_defaultCellAttr->GetEditor(NULL, 0, 0);
  }
  
  // ----------------------------------------------------------------------------
  // access to cell attributes
  // ----------------------------------------------------------------------------
  
  }
  
  // ----------------------------------------------------------------------------
  // access to cell attributes
  // ----------------------------------------------------------------------------
  
-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+wxColour wxGrid::GetCellBackgroundColour(int row, int col) const
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxColour colour = attr->GetBackgroundColour();
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxColour colour = attr->GetBackgroundColour();
-    attr->SafeDecRef();
+    attr->DecRef();
+
      return colour;
  }
  
      return colour;
  }
  
-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int row, int col ) const
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxColour colour = attr->GetTextColour();
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxColour colour = attr->GetTextColour();
-    attr->SafeDecRef();
+    attr->DecRef();
+
      return colour;
  }
  
      return colour;
  }
  
-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int row, int col ) const
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxFont font = attr->GetFont();
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      wxFont font = attr->GetFont();
-    attr->SafeDecRef();
+    attr->DecRef();
+
      return font;
  }
  
      return font;
  }
  
-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      attr->GetAlignment(horiz, vert);
  {
      wxGridCellAttr *attr = GetCellAttr(row, col);
      attr->GetAlignment(horiz, vert);
-    attr->SafeDecRef();
+    attr->DecRef();
+}
+
+bool wxGrid::GetCellOverflow( int row, int col ) const
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    bool allow = attr->GetOverflow();
+    attr->DecRef();
+
+    return allow;
+}
+
+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);
  {
      wxGridCellAttr* attr = GetCellAttr(row, col);
-    wxGridCellRenderer* renderer = attr->GetRenderer();
+    wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
      attr->DecRef();
      attr->DecRef();
+
      return renderer;
  }
  
      return renderer;
  }
  
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const
+{
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+    attr->DecRef();
+
+    return editor;
+}
+
+bool wxGrid::IsReadOnly(int row, int col) const
+{
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    bool isReadOnly = attr->IsReadOnly();
+    attr->DecRef();
+
+    return isReadOnly;
+}
+
  // ----------------------------------------------------------------------------
  // attribute support: cache, automatic provider creation, ...
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
  // attribute support: cache, automatic provider creation, ...
  // ----------------------------------------------------------------------------
  
-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const
  {
      if ( !m_table )
      {
  {
      if ( !m_table )
      {
-        return FALSE;
-    }
-
-    // RD:  Maybe m_table->CanHaveAttributes() would be better in case the
-    //      table is providing the attributes itself???  In which case
-    //      I don't think the grid should create a Provider object for the
-    //      table but the table should be smart enough to do that on its own.
-    if ( !m_table->GetAttrProvider() )
-    {
-        // use the default attr provider by default
-        // (another choice would be to just return FALSE thus forcing the user
-        // to it himself)
-        m_table->SetAttrProvider(new wxGridCellAttrProvider);
+        return false;
      }
  
      }
  
-    return TRUE;
+    return m_table->CanHaveAttributes();
  }
  
  void wxGrid::ClearAttrCache()
  {
      if ( m_attrCache.row != -1 )
      {
  }
  
  void wxGrid::ClearAttrCache()
  {
      if ( m_attrCache.row != -1 )
      {
-        m_attrCache.attr->SafeDecRef();
+        wxGridCellAttr *oldAttr = m_attrCache.attr;
+        m_attrCache.attr = NULL;
          m_attrCache.row = -1;
          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::CacheAttr(int row, int col, wxGridCellAttr *attr) const
  {
      }
  }
  
  void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
  {
-    wxGrid *self = (wxGrid *)this;  // const_cast
+    if ( attr != NULL )
+    {
+        wxGrid *self = (wxGrid *)this;  // const_cast
  
  
-    self->ClearAttrCache();
-    self->m_attrCache.row = row;
-    self->m_attrCache.col = col;
-    self->m_attrCache.attr = attr;
-    attr->SafeIncRef();
+        self->ClearAttrCache();
+        self->m_attrCache.row = row;
+        self->m_attrCache.col = col;
+        self->m_attrCache.attr = attr;
+        wxSafeIncRef(attr);
+    }
  }
  
  bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
  }
  
  bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
@@ -5309,34 +7230,45 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
      if ( row == m_attrCache.row && col == m_attrCache.col )
      {
          *attr = m_attrCache.attr;
      if ( row == m_attrCache.row && col == m_attrCache.col )
      {
          *attr = m_attrCache.attr;
-        (*attr)->SafeIncRef();
+        wxSafeIncRef(m_attrCache.attr);
  
  #ifdef DEBUG_ATTR_CACHE
          gs_nAttrCacheHits++;
  #endif
  
  
  #ifdef DEBUG_ATTR_CACHE
          gs_nAttrCacheHits++;
  #endif
  
-        return TRUE;
+        return true;
      }
      else
      {
  #ifdef DEBUG_ATTR_CACHE
          gs_nAttrCacheMisses++;
  #endif
      }
      else
      {
  #ifdef DEBUG_ATTR_CACHE
          gs_nAttrCacheMisses++;
  #endif
-        return FALSE;
+
+        return false;
      }
  }
  
  wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
  {
      }
  }
  
  wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
  {
-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) )
+    wxGridCellAttr *attr = NULL;
+    // Additional test to avoid looking at the cache e.g. for
+    // wxNoCellCoords, as this will confuse memory management.
+    if ( row >= 0 )
      {
      {
-        attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
-        CacheAttr(row, col, attr);
+        if ( !LookupAttr(row, col, &attr) )
+        {
+            attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
+                           : NULL;
+            CacheAttr(row, col, attr);
+        }
      }
      }
-    if (attr) {
+
+    if (attr)
+    {
          attr->SetDefAttr(m_defaultCellAttr);
          attr->SetDefAttr(m_defaultCellAttr);
-    } else {
+    }
+    else
+    {
          attr = m_defaultCellAttr;
          attr->IncRef();
      }
          attr = m_defaultCellAttr;
          attr->IncRef();
      }
@@ -5346,43 +7278,91 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
  
  wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
  {
  
  wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
  {
-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) || !attr )
+    wxGridCellAttr *attr = NULL;
+    bool canHave = ((wxGrid*)this)->CanHaveAttributes();
+
+    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 )
      {
      {
-        wxASSERT_MSG( m_table,
-                      _T("we may only be called if CanHaveAttributes() "
-                         "returned TRUE and then m_table should be !NULL") );
+        attr = new wxGridCellAttr(m_defaultCellAttr);
  
  
-        attr = m_table->GetAttr(row, col);
-        if ( !attr )
-        {
-            attr = new wxGridCellAttr;
+        // artificially inc the ref count to match DecRef() in caller
+        attr->IncRef();
+        m_table->SetAttr(attr, row, col);
+    }
  
  
-            // artificially inc the ref count to match DecRef() in caller
-            attr->IncRef();
+    return attr;
+}
  
  
-            m_table->SetAttr(attr, row, col);
-        }
+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetColFormatBool(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_BOOL);
+}
+
+void wxGrid::SetColFormatNumber(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
+}
  
  
-        CacheAttr(row, col, attr);
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
+{
+    wxString typeName = wxGRID_VALUE_FLOAT;
+    if ( (width != -1) || (precision != -1) )
+    {
+        typeName << wxT(':') << width << wxT(',') << precision;
      }
      }
-    attr->SetDefAttr(m_defaultCellAttr);
-    return attr;
+
+    SetColFormatCustom(col, typeName);
+}
+
+void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
+{
+    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);
+
  }
  
  // ----------------------------------------------------------------------------
  // setting cell attributes: this is forwarded to the table
  // ----------------------------------------------------------------------------
  
  }
  
  // ----------------------------------------------------------------------------
  // setting cell attributes: this is forwarded to the table
  // ----------------------------------------------------------------------------
  
+void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr)
+{
+    if ( CanHaveAttributes() )
+    {
+        m_table->SetAttr(attr, row, col);
+        ClearAttrCache();
+    }
+    else
+    {
+        wxSafeDecRef(attr);
+    }
+}
+
  void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
  {
      if ( CanHaveAttributes() )
      {
          m_table->SetRowAttr(attr, row);
  void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
  {
      if ( CanHaveAttributes() )
      {
          m_table->SetRowAttr(attr, row);
+        ClearAttrCache();
      }
      else
      {
      }
      else
      {
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
      }
  }
  
      }
  }
  
@@ -5391,10 +7371,11 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
      if ( CanHaveAttributes() )
      {
          m_table->SetColAttr(attr, col);
      if ( CanHaveAttributes() )
      {
          m_table->SetColAttr(attr, col);
+        ClearAttrCache();
      }
      else
      {
      }
      else
      {
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
      }
  }
  
      }
  }
  
@@ -5438,536 +7419,1338 @@ void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
      }
  }
  
      }
  }
  
-void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
+void wxGrid::SetCellOverflow( int row, int col, bool allow )
  {
      if ( CanHaveAttributes() )
      {
          wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
  {
      if ( CanHaveAttributes() )
      {
          wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetRenderer(renderer);
+        attr->SetOverflow(allow);
          attr->DecRef();
      }
  }
  
          attr->DecRef();
      }
  }
  
-// ----------------------------------------------------------------------------
-// row/col size
-// ----------------------------------------------------------------------------
-
-void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
+void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
  {
  {
-    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
-
-    if ( resizeExistingRows )
+    if ( CanHaveAttributes() )
      {
      {
-        int row;
-        int bottom = 0;
-        for ( row = 0;  row < m_numRows;  row++ )
+        int cell_rows, cell_cols;
+
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->GetSize(&cell_rows, &cell_cols);
+        attr->SetSize(num_rows, num_cols);
+        attr->DecRef();
+
+        // Cannot set the size of a cell to 0 or negative values
+        // While it is perfectly legal to do that, this function cannot
+        // handle all the possibilies, do it by hand by getting the CellAttr.
+        // You can only set the size of a cell to 1,1 or greater with this fn
+        wxASSERT_MSG( !((cell_rows < 1) || (cell_cols < 1)),
+                      wxT("wxGrid::SetCellSize setting cell size that is already part of another cell"));
+        wxASSERT_MSG( !((num_rows < 1) || (num_cols < 1)),
+                      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_cols > 1))
          {
          {
-            m_rowHeights[row] = m_defaultRowHeight;
-            bottom += m_defaultRowHeight;
-            m_rowBottoms[row] = bottom;
+            int i, j;
+            for (j=row; j < row + cell_rows; j++)
+            {
+                for (i=col; i < col + cell_cols; i++)
+                {
+                    if ((i != col) || (j != row))
+                    {
+                        wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
+                        attr_stub->SetSize( 1, 1 );
+                        attr_stub->DecRef();
+                    }
+                }
+            }
+        }
+
+        // mark the cells that will be covered by this cell to
+        // negative or zero values to point back at this cell
+        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 (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->DecRef();
+                    }
+                }
+            }
          }
          }
-        CalcDimensions();
      }
  }
  
      }
  }
  
-void wxGrid::SetRowSize( int row, int height )
+void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
  {
  {
-    wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
-
-    int i;
-
-    int h = wxMax( 0, height );
-    int diff = h - m_rowHeights[row];
-
-    m_rowHeights[row] = h;
-    for ( i = row;  i < m_numRows;  i++ )
+    if ( CanHaveAttributes() )
      {
      {
-        m_rowBottoms[i] += diff;
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetRenderer(renderer);
+        attr->DecRef();
      }
      }
-    CalcDimensions();
  }
  
  }
  
-void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
+void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor)
  {
  {
-    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
-
-    if ( resizeExistingCols )
+    if ( CanHaveAttributes() )
      {
      {
-        int col;
-        int right = 0;
-        for ( col = 0;  col < m_numCols;  col++ )
-        {
-            m_colWidths[col] = m_defaultColWidth;
-            right += m_defaultColWidth;
-            m_colRights[col] = right;
-        }
-        CalcDimensions();
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetEditor(editor);
+        attr->DecRef();
      }
  }
  
      }
  }
  
-void wxGrid::SetColSize( int col, int width )
+void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
  {
  {
-    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
-
-    int i;
-
-    int w = wxMax( 0, width );
-    int diff = w - m_colWidths[col];
-    m_colWidths[col] = w;
-
-    for ( i = col;  i < m_numCols;  i++ )
+    if ( CanHaveAttributes() )
      {
      {
-        m_colRights[i] += diff;
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetReadOnly(isReadOnly);
+        attr->DecRef();
      }
      }
-    CalcDimensions();
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// Data type registration
+// ----------------------------------------------------------------------------
  
  
-//
-// ------ cell value accessor functions
-//
+void wxGrid::RegisterDataType(const wxString& typeName,
+                              wxGridCellRenderer* renderer,
+                              wxGridCellEditor* editor)
+{
+    m_typeRegistry->RegisterDataType(typeName, renderer, editor);
+}
  
  
-void wxGrid::SetCellValue( int row, int col, const wxString& s )
+
+wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const
  {
  {
-    if ( m_table )
-    {
-        m_table->SetValue( row, col, s.c_str() );
-        if ( !GetBatchCount() )
-        {
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            DrawCell( dc, wxGridCellCoords(row, col) );
-        }
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultEditorForType(typeName);
+}
  
  
-#if 0  // TODO: edit in place
+wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const
+{
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultRendererForType(typeName);
+}
  
  
-        if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col )
-        {
-            SetEditControlValue( s );
-        }
-#endif
+wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+{
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
  
  
+        return NULL;
      }
      }
+
+    return m_typeRegistry->GetEditor(index);
  }
  
  }
  
+wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+{
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
  
  
-//
-// ------ Block, row and col selection
-//
+        return NULL;
+    }
  
  
-void wxGrid::SelectRow( int row, bool addToSelected )
+    return m_typeRegistry->GetRenderer(index);
+}
+
+// ----------------------------------------------------------------------------
+// row/col size
+// ----------------------------------------------------------------------------
+
+void wxGrid::DoDisableLineResize(int line, wxGridFixedIndicesSet *& setFixed)
  {
  {
-    wxRect r;
+    if ( !setFixed )
+    {
+        setFixed = new wxGridFixedIndicesSet;
+    }
+
+    setFixed->insert(line);
+}
  
  
-    if ( IsSelection() && addToSelected )
+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;
+}
+
+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, m_minAcceptableRowHeight );
+
+    if ( resizeExistingRows )
      {
      {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+        // since we are resizing all rows to the default row size,
+        // we can simply clear the row heights and row bottoms
+        // arrays (which also allows us to take advantage of
+        // some speed optimisations)
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();
+        if ( !GetBatchCount() )
+            CalcDimensions();
+    }
+}
  
  
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+void wxGrid::SetRowSize( int row, int height )
+{
+    wxCHECK_RET( row >= 0 && row < m_numRows, wxT("invalid row index") );
  
  
-        if ( oldTop > row )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
-        }
+    // 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());
+    }
  
  
-        if ( oldLeft > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
+    // See comment in SetColSize
+    if ( height < GetRowMinimalAcceptableHeight())
+        return;
  
  
-            m_selectedTopLeft.SetCol( 0 );
-        }
+    if ( m_rowHeights.IsEmpty() )
+    {
+        // need to really create the array
+        InitRowHeights();
+    }
  
  
-        if ( oldBottom < row )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( row );
-        }
+    int h = wxMax( 0, height );
+    int diff = h - m_rowHeights[row];
  
  
-        if ( oldRight < m_numCols - 1 )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
-                                                            oldRight + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetCol( m_numCols - 1 );
-        }
+    m_rowHeights[row] = h;
+    for ( int i = row; i < m_numRows; i++ )
+    {
+        m_rowBottoms[i] += diff;
+    }
  
  
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+    if ( !GetBatchCount() )
+        CalcDimensions();
+}
+
+void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
+{
+    // we dont allow zero default column width
+    m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );
+
+    if ( resizeExistingCols )
+    {
+        // since we are resizing all columns to the default column size,
+        // we can simply clear the col widths and col rights
+        // arrays (which also allows us to take advantage of
+        // some speed optimisations)
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        if ( !GetBatchCount() )
+            CalcDimensions();
      }
      }
-    else
+}
+
+void wxGrid::SetColSize( int col, int width )
+{
+    wxCHECK_RET( col >= 0 && col < m_numCols, wxT("invalid column index") );
+
+    // if < 0 then calculate new width from label
+    if ( width < 0 )
      {
      {
-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+        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;
  
  
-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
+    if ( m_colWidths.IsEmpty() )
+    {
+        // need to really create the array
+        InitColWidths();
      }
  
      }
  
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
+    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
  
  
-    GetEventHandler()->ProcessEvent(gridEvt);
+    for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )
+    {
+        m_colRights[GetColAt(colPos)] += diff;
+    }
+
+    if ( !GetBatchCount() )
+    {
+        CalcDimensions();
+        Refresh();
+    }
  }
  
  }
  
+void wxGrid::SetColMinimalWidth( int col, int width )
+{
+    if (width > GetColMinimalAcceptableWidth())
+    {
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+        m_colMinWidths[key] = width;
+    }
+}
  
  
-void wxGrid::SelectCol( int col, bool addToSelected )
+void wxGrid::SetRowMinimalHeight( int row, int width )
  {
  {
-    if ( IsSelection() && addToSelected )
+    if (width > GetRowMinimalAcceptableHeight())
      {
      {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+        m_rowMinHeights[key] = width;
+    }
+}
+
+int wxGrid::GetColMinimalWidth(int col) const
+{
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+    wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
+
+    return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
+}
+
+int wxGrid::GetRowMinimalHeight(int row) const
+{
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+    wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
+
+    return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
+}
+
+void wxGrid::SetColMinimalAcceptableWidth( int width )
+{
+    // We do allow a width of 0 since this gives us
+    // an easy way to temporarily 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, wxGridDirection direction)
+{
+    const bool column = direction == wxGRID_COLUMN;
+
+    wxClientDC dc(m_gridWin);
  
  
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    // cancel editing of cell
+    HideCellEditControl();
+    SaveEditControlValue();
  
  
-        if ( oldLeft > col )
+    // initialize both of them just to avoid compiler warnings
+    int row = -1,
+        col = -1;
+
+    wxCoord extent, extentMax = 0;
+    int max = column ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
+    {
+        if ( column )
          {
          {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldLeft - 1 ) );
-            m_selectedTopLeft.SetCol( col );
+            row = rowOrCol;
+            col = colOrRow;
          }
          }
-
-        if ( oldTop  > 0 )
+        else
          {
          {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            oldRight ) );
-            m_selectedTopLeft.SetRow( 0 );
+            row = colOrRow;
+            col = rowOrCol;
          }
  
          }
  
-        if ( oldRight < 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 )
          {
          {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            col            ) );
-            m_selectedBottomRight.SetCol( col );
+            // 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);
          }
  
          }
  
-        if ( oldBottom < m_numRows - 1 )
+        wxGridCellAttr *attr = GetCellAttr(row, col);
+        wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
+        if ( renderer )
          {
          {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldRight ) );
-            m_selectedBottomRight.SetRow( m_numRows - 1 );
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+
+            if ( span != CellSpan_None )
+            {
+                // 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();
          }
  
          }
  
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+        attr->DecRef();
+    }
+
+    // now also compare with the column label extent
+    wxCoord w, h;
+    dc.SetFont( GetLabelFont() );
+
+    if ( column )
+    {
+        dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );
+        if ( GetColLabelTextOrientation() == wxVERTICAL )
+            w = h;
+    }
+    else
+        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)
+        extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
      }
      else
      {
      }
      else
      {
-        wxRect r;
+        if ( column )
+            // leave some space around text
+            extentMax += 10;
+        else
+            extentMax += 6;
+    }
  
  
-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+    if ( column )
+    {
+        // 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));
  
  
-        m_selectedTopLeft.Set( 0, col );
-        m_selectedBottomRight.Set( m_numRows-1, col );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
+        SetColSize( col, extentMax );
+        if ( !GetBatchCount() )
+        {
+            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));
  
  
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
+        SetRowSize(row, extentMax);
+        if ( !GetBatchCount() )
+        {
+            int cw, ch, dummy;
+            m_gridWin->GetClientSize( &cw, &ch );
+            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 );
+        }
+    }
  
  
-    GetEventHandler()->ProcessEvent(gridEvt);
+    if ( setAsMin )
+    {
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);
+    }
  }
  
  }
  
+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);
  
  
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+        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 temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
+    int width = m_rowLabelWidth;
+
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);
  
  
-    if ( topRow > bottomRow )
+    for ( int col = 0; col < m_numCols; col++ )
      {
      {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
+        if ( !calcOnly )
+            AutoSizeColumn(col, setAsMin);
+
+        width += GetColWidth(col);
      }
  
      }
  
-    if ( leftCol > rightCol )
+    return width;
+}
+
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
+{
+    int height = m_colLabelHeight;
+
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);
+
+    for ( int row = 0; row < m_numRows; row++ )
      {
      {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
+        if ( !calcOnly )
+            AutoSizeRow(row, setAsMin);
+
+        height += GetRowHeight(row);
      }
  
      }
  
-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+    return height;
+}
+
+void wxGrid::AutoSize()
+{
+    wxGridUpdateLocker locker(this);
+
+    wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
+                SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
+
+    // we know that we're not going to have scrollbars so disable them now to
+    // avoid trouble in SetClientSize() which can otherwise set the correct
+    // client size but also leave space for (not needed any more) scrollbars
+    SetScrollbars(0, 0, 0, 0, 0, 0, true);
  
  
-    if ( m_selectedTopLeft != updateTopLeft ||
-         m_selectedBottomRight != updateBottomRight )
+    // restore the scroll rate parameters overwritten by SetScrollbars()
+    SetScrollRate(m_scrollLineX, m_scrollLineY);
+
+    SetClientSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight);
+}
+
+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+    // Hide the edit control, so it
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
      {
      {
-        // Compute two optimal update rectangles:
-        // Either one rectangle is a real subset of the
-        // other, or they are (almost) disjoint!
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
  
  
-        // Store intermediate values
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    // autosize row height depending on label text
+    SetRowSize(row, -1);
+    ForceRefresh();
+}
  
  
-        // 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;
-        }
+void wxGrid::AutoSizeColLabelSize( int col )
+{
+    // Hide the edit control, so it
+    // won't interfere with drag-shrinking.
+    if ( IsCellEditControlShown() )
+    {
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
  
  
-        // Now, either the stuff marked old is the outer
-        // rectangle or we don't have a situation where one
-        // is contained in the other.
+    // autosize column width depending on label text
+    SetColSize(col, -1);
+    ForceRefresh();
+}
  
  
-        if ( oldLeft < leftCol )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
-        }
+wxSize wxGrid::DoGetBestSize() const
+{
+    wxGrid *self = (wxGrid *)this;  // const_cast
+
+    // 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 ( oldTop  < topRow )
+    // 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(size.x + m_rowLabelWidth, size.y + m_colLabelHeight)
+            + GetWindowBorderSize();
+}
+
+void wxGrid::Fit()
+{
+    AutoSize();
+}
+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetCellValue( int row, int col, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetValue( row, col, s );
+        if ( !GetBatchCount() )
          {
          {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
+            int dummy;
+            wxRect rect( CellToRect( row, col ) );
+            rect.x = 0;
+            rect.width = m_gridWin->GetClientSize().GetWidth();
+            CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+            m_gridWin->Refresh( false, &rect );
          }
  
          }
  
-        if ( oldRight > rightCol )
+        if ( m_currentCellCoords.GetRow() == row &&
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlShown())
+             // Note: If we are using IsCellEditControlEnabled,
+             // this interacts badly with calling SetCellValue from
+             // an EVT_GRID_CELL_CHANGE handler.
          {
          {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
+            HideCellEditControl();
+            ShowCellEditControl(); // will reread data from table
          }
          }
+    }
+}
  
  
-        if ( oldBottom > bottomRow )
+// ----------------------------------------------------------------------------
+// block, row and column selection
+// ----------------------------------------------------------------------------
+
+void wxGrid::SelectRow( int row, bool addToSelected )
+{
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
+        ClearSelection();
+
+    m_selection->SelectRow(row);
+}
+
+void wxGrid::SelectCol( int col, bool addToSelected )
+{
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
+        ClearSelection();
+
+    m_selection->SelectCol(col);
+}
+
+void wxGrid::SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol,
+                         bool addToSelected)
+{
+    if ( !m_selection )
+        return;
+
+    if ( !addToSelected )
+        ClearSelection();
+
+    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 );
+    }
+}
+
+// ----------------------------------------------------------------------------
+// cell, row and col deselection
+// ----------------------------------------------------------------------------
+
+void wxGrid::DeselectLine(int line, const wxGridOperations& oper)
+{
+    if ( !m_selection )
+        return;
+
+    const wxGridSelectionModes mode = m_selection->GetSelectionMode();
+    if ( mode == oper.GetSelectionMode() ||
+            mode == wxGrid::wxGridSelectRowsOrColumns )
+    {
+        const wxGridCellCoords c(oper.MakeCoords(line, 0));
+        if ( m_selection->IsInSelection(c) )
+            m_selection->ToggleCellSelection(c);
+    }
+    else if ( mode != oper.Dual().GetSelectionMode() )
+    {
+        const int nOther = oper.Dual().GetNumberOfLines(this);
+        for ( int i = 0; i < nOther; i++ )
          {
          {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
+            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::DeselectRow(int row)
+{
+    DeselectLine(row, wxGridRowOperations());
+}
  
  
+void wxGrid::DeselectCol(int col)
+{
+    DeselectLine(col, wxGridColumnOperations());
+}
  
  
-        // Change Selection
-        m_selectedTopLeft = updateTopLeft;
-        m_selectedBottomRight = updateBottomRight;
+void wxGrid::DeselectCell( int row, int col )
+{
+    if ( m_selection && m_selection->IsInSelection(row, col) )
+        m_selection->ToggleCellSelection(row, col);
+}
  
  
-        // various Refresh() calls
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+bool wxGrid::IsSelection() const
+{
+    return ( m_selection && (m_selection->IsSelection() ||
+             ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+               m_selectedBlockBottomRight != wxGridNoCellCoords) ) );
+}
+
+bool wxGrid::IsInSelection( int row, int col ) const
+{
+    return ( m_selection && (m_selection->IsInSelection( row, col ) ||
+             ( 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;
      }
  
      }
  
-    // only generate an event if the block is not being selected by
-    // dragging the mouse (in which case the event will be generated in
-    // the mouse event handler)
-    if ( !m_isDragging )
+    return m_selection->m_cellSelection;
+}
+
+wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
+{
+    if (!m_selection)
      {
      {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        EVT_GRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
+        wxGridCellCoordsArray a;
+        return a;
+    }
  
  
-        GetEventHandler()->ProcessEvent(gridEvt);
+    return m_selection->m_blockSelectionTopLeft;
+}
+
+wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
+{
+    if (!m_selection)
+    {
+        wxGridCellCoordsArray a;
+        return a;
      }
      }
+
+    return m_selection->m_blockSelectionBottomRight;
  }
  
  }
  
-void wxGrid::SelectAll()
+wxArrayInt wxGrid::GetSelectedRows() const
  {
  {
-    m_selectedTopLeft.Set( 0, 0 );
-    m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
  
  
-    m_gridWin->Refresh();
+    return m_selection->m_rowSelection;
  }
  
  }
  
+wxArrayInt wxGrid::GetSelectedCols() const
+{
+    if (!m_selection)
+    {
+        wxArrayInt a;
+        return a;
+    }
+
+    return m_selection->m_colSelection;
+}
  
  void wxGrid::ClearSelection()
  {
  
  void wxGrid::ClearSelection()
  {
-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = 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.
  //
  
  // 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 wxGridCellCoords& topLeft,
+                                  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
      {
      }
      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
      {
      }
      else
      {
+        // If both inputs were "wxGridNoCellRect," then there's nothing to do.
          return wxGridNoCellRect;
      }
  
          return wxGridNoCellRect;
      }
  
-    // convert to scrolled coords
-    //
-    int left, top, right, bottom;
-    CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
-    CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+    // 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();
+    int rightCol = bottomRight.GetCol();
+    int bottomRow = bottomRight.GetRow();
+
+    if (left > right)
+    {
+        int tmp = left;
+        left = right;
+        right = tmp;
+
+        tmp = leftCol;
+        leftCol = rightCol;
+        rightCol = tmp;
+    }
  
  
+    if (top > bottom)
+    {
+        int tmp = top;
+        top = bottom;
+        bottom = tmp;
+
+        tmp = topRow;
+        topRow = bottomRow;
+        bottomRow = tmp;
+    }
+
+    // The following loop is ONLY necessary to detect and handle merged cells.
      int cw, ch;
      m_gridWin->GetClientSize( &cw, &ch );
  
      int cw, ch;
      m_gridWin->GetClientSize( &cw, &ch );
  
-    rect.SetLeft( wxMax(0, left) );
-    rect.SetTop( wxMax(0, top) );
-    rect.SetRight( wxMin(cw, right) );
-    rect.SetBottom( wxMin(ch, bottom) );
+    // 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);
  
  
-    return rect;
+    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 ( int i = visibleLeftCol; i <= visibleRightCol; i++ )
+        {
+            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
+            {
+                i = visibleRightCol; // jump over inner cells.
+            }
+        }
+    }
+
+    // Convert to scrolled coords
+    CalcScrolledPosition( left, top, &left, &top );
+    CalcScrolledPosition( right, bottom, &right, &bottom );
+
+    if (right < 0 || bottom < 0 || left > cw || top > ch)
+        return wxRect(0,0,0,0);
+
+    resultRect.SetLeft( wxMax(0, left) );
+    resultRect.SetTop( wxMax(0, top) );
+    resultRect.SetRight( wxMin(cw, right) );
+    resultRect.SetBottom( wxMin(ch, bottom) );
+
+    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());
+}
  
  
-//
-// ------ Grid event classes
-//
+void wxGrid::SetRowSizes(const wxGridSizesInfo& sizeInfo)
+{
+    DoSetSizes(sizeInfo, wxGridRowOperations());
+}
+
+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, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
  
  wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
  
  wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
-                          int row, int col, int x, int y,
+                          int row, int col, int x, int y, bool sel,
                            bool control, bool shift, bool alt, bool meta )
                            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_control = control;
-    m_shift = shift;
-    m_alt = alt;
-    m_meta = meta;
+    Init(row, col, x, y, sel);
  
      SetEventObject(obj);
  }
  
  
      SetEventObject(obj);
  }
  
-
-IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent )
+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 )
  
  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);
  }
  
  
  
      SetEventObject(obj);
  }
  
  
-IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent )
  
  wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                 const wxGridCellCoords& topLeft,
                                                 const wxGridCellCoords& bottomRight,
  
  wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                 const wxGridCellCoords& topLeft,
                                                 const wxGridCellCoords& bottomRight,
-                                               bool control, bool shift, bool alt, bool meta )
-        : wxNotifyEvent( type, id )
+                                               bool sel, bool control,
+                                               bool shift, bool alt, bool meta )
+        : wxNotifyEvent( type, id ),
+          wxKeyboardState(control, shift, alt, meta)
  {
  {
-    m_topLeft     = topLeft;
-    m_bottomRight = bottomRight;
-    m_control     = control;
-    m_shift       = shift;
-    m_alt         = alt;
-    m_meta        = meta;
+    Init(topLeft, bottomRight, sel);
+
+    SetEventObject(obj);
+}
  
  
+
+IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+
+wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
+                                                   wxObject* obj, int row,
+                                                   int col, wxControl* ctrl)
+    : wxCommandEvent(type, id)
+{
      SetEventObject(obj);
      SetEventObject(obj);
+    m_row = row;
+    m_col = col;
+    m_ctrl = ctrl;
+}
+
+
+// ----------------------------------------------------------------------------
+// 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();
  
  
-#endif // ifndef wxUSE_NEW_GRID
+        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