]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/grid.cpp
check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...
[wxWidgets.git] / src / generic / grid.cpp
index 9201252056a8beb305886638f21940faff83ec97..3e558a168aedaea70d501ada11438ee2dece933c 100644 (file)
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-// Name:        grid.cpp
+// Name:        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
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "grid.h"
 #endif
 
     #pragma implementation "grid.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
+// For compilers that support precompilatixon, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-#include "gridg.cpp"
-#else
+#if wxUSE_GRID
 
 #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"
 #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/grid.h"
 
 #include "wx/grid.h"
+#include "wx/generic/gridsel.h"
+
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
+#else
+    #define WXUNUSED_MOTIF(identifier)  identifier
+#endif
+
+#if defined(__WXGTK__)
+    #define WXUNUSED_GTK(identifier)    WXUNUSED(identifier)
+#else
+    #define WXUNUSED_GTK(identifier)    identifier
+#endif
 
 
+// Required for wxIs... functions
+#include <ctype.h>
 
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs,
+                                 class WXDLLIMPEXP_ADV);
 
 struct wxGridCellWithAttr
 {
 
 struct wxGridCellWithAttr
 {
@@ -67,20 +88,47 @@ struct wxGridCellWithAttr
 
     wxGridCellCoords coords;
     wxGridCellAttr  *attr;
 
     wxGridCellCoords coords;
     wxGridCellAttr  *attr;
+
+// Cannot do this:
+//  DECLARE_NO_COPY_CLASS(wxGridCellWithAttr)
+// without rewriting the macros, which require a public copy constructor.
 };
 
 };
 
-WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray,
+                              class WXDLLIMPEXP_ADV);
 
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
 
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
 {
 public:
     wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -92,14 +140,18 @@ private:
 
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
+    void OnChar( wxKeyEvent& );
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
 };
 
 
 };
 
 
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
 {
 public:
     wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -111,14 +163,18 @@ private:
 
     void OnPaint( wxPaintEvent &event );
     void OnMouseEvent( wxMouseEvent& event );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
+    void OnChar( wxKeyEvent& );
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
 };
 
 
 };
 
 
-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
 {
 public:
     wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -129,14 +185,18 @@ private:
     wxGrid *m_owner;
 
     void OnMouseEvent( wxMouseEvent& event );
     wxGrid *m_owner;
 
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
+    void OnChar( wxKeyEvent& );
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     DECLARE_EVENT_TABLE()
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
 };
 
 };
 
-class WXDLLEXPORT wxGridWindow : public wxPanel
+class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
 {
 public:
     wxGridWindow()
 {
 public:
     wxGridWindow()
@@ -150,23 +210,29 @@ public:
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );
-    ~wxGridWindow();
+    ~wxGridWindow(){}
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
+    wxGrid* GetOwner() { return m_owner; }
+
 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );
 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );
     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );
+    void OnKeyUp( wxKeyEvent& );
+    void OnChar( wxKeyEvent& );
     void OnEraseBackground( wxEraseEvent& );
     void OnEraseBackground( wxEraseEvent& );
-
+    void OnFocus( wxFocusEvent& );
 
     DECLARE_DYNAMIC_CLASS(wxGridWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridWindow)
 };
 
 
 };
 
 
@@ -174,26 +240,37 @@ private:
 class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
 public:
 class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
 public:
-    wxGridCellEditorEvtHandler()
-        : m_grid(0), m_editor(0)
-        { }
     wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
     wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
-        : m_grid(grid), m_editor(editor)
-        { }
+        : m_grid(grid),
+          m_editor(editor),
+          m_inSetFocus(false)
+    {
+    }
 
 
+    void OnKillFocus(wxFocusEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
 
     void OnKeyDown(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
 
+    void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; }
+
 private:
     wxGrid*             m_grid;
     wxGridCellEditor*   m_editor;
 private:
     wxGrid*             m_grid;
     wxGridCellEditor*   m_editor;
-    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
+
+    // Work around the fact that a focus kill event can be sent to
+    // a combobox within a set focus event.
+    bool                m_inSetFocus;
+
     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
+    DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
 };
 
 
 };
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler )
+IMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler)
+
 BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
 BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
+    EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus )
     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
 END_EVENT_TABLE()
     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
 END_EVENT_TABLE()
@@ -205,7 +282,7 @@ END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 
 // this class stores attributes set for cells
 // ----------------------------------------------------------------------------
 
 // this class stores attributes set for cells
-class WXDLLEXPORT wxGridCellAttrData
+class WXDLLIMPEXP_ADV wxGridCellAttrData
 {
 public:
     void SetAttr(wxGridCellAttr *attr, int row, int col);
 {
 public:
     void SetAttr(wxGridCellAttr *attr, int row, int col);
@@ -221,9 +298,11 @@ private:
 };
 
 // this class stores attributes set for rows or columns
 };
 
 // this class stores attributes set for rows or columns
-class WXDLLEXPORT wxGridRowOrColAttrData
+class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
 {
 public:
 {
 public:
+    // empty ctor to suppress warnings
+    wxGridRowOrColAttrData() { }
     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);
     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);
@@ -237,7 +316,7 @@ private:
 
 // NB: this is just a wrapper around 3 objects: one which stores cell
 //     attributes, and 2 others for row/col ones
 
 // NB: this is just a wrapper around 3 objects: one which stores cell
 //     attributes, and 2 others for row/col ones
-class WXDLLEXPORT wxGridCellAttrProviderData
+class WXDLLIMPEXP_ADV wxGridCellAttrProviderData
 {
 public:
     wxGridCellAttrData m_cellAttrs;
 {
 public:
     wxGridCellAttrData m_cellAttrs;
@@ -245,6 +324,66 @@ public:
                            m_colAttrs;
 };
 
                            m_colAttrs;
 };
 
+
+// ----------------------------------------------------------------------------
+// data structures used for the data type registry
+// ----------------------------------------------------------------------------
+
+struct wxGridDataTypeInfo
+{
+    wxGridDataTypeInfo(const wxString& typeName,
+                       wxGridCellRenderer* renderer,
+                       wxGridCellEditor* editor)
+        : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
+        { }
+
+    ~wxGridDataTypeInfo()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
+
+    wxString            m_typeName;
+    wxGridCellRenderer* m_renderer;
+    wxGridCellEditor*   m_editor;
+
+    DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo)
+};
+
+
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray,
+                                 class WXDLLIMPEXP_ADV);
+
+
+class WXDLLIMPEXP_ADV wxGridTypeRegistry
+{
+public:
+  wxGridTypeRegistry() {}
+    ~wxGridTypeRegistry();
+
+    void RegisterDataType(const wxString& typeName,
+                     wxGridCellRenderer* renderer,
+                     wxGridCellEditor* editor);
+
+    // find one of already registered data types
+    int FindRegisteredDataType(const wxString& typeName);
+
+    // try to FindRegisteredDataType(), if this fails and typeName is one of
+    // standard typenames, register it and return its index
+    int FindDataType(const wxString& typeName);
+
+    // try to FindDataType(), if it fails see if it is not one of already
+    // registered data types with some params in which case clone the
+    // registered data type and set params for it
+    int FindOrCloneDataType(const wxString& typeName);
+
+    wxGridCellRenderer* GetRenderer(int index);
+    wxGridCellEditor*   GetEditor(int index);
+
+private:
+    wxGridDataTypeInfoArray m_typeinfo;
+};
+
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
@@ -263,18 +402,52 @@ public:
     static size_t gs_nAttrCacheMisses = 0;
 #endif // DEBUG_ATTR_CACHE
 
     static size_t gs_nAttrCacheMisses = 0;
 #endif // DEBUG_ATTR_CACHE
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
 wxGridCellCoords wxGridNoCellCoords( -1, -1 );
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size
 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;
+// TODO: this doesn't work at all, grid cells have different sizes and approx
+//       calculations don't work as because of the size mismatch scrollbars
+//       sometimes fail to be shown when they should be or vice versa
+//
+//       The scroll bars may be a little flakey once in a while, but that is
+//       surely much less horrible than having scroll lines of only 1!!!
+//       -- Robin
+//
+//       Well, it's still seriously broken so it might be better but needs
+//       fixing anyhow
+//       -- Vadim
+static const size_t GRID_SCROLL_LINE_X = 15;  // 1;
+static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
+
+// the size of hash tables used a bit everywhere (the max number of elements
+// in these hash tables is the number of rows/columns)
+static const int GRID_HASH_SIZE = 100;
+
+#if 0
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static inline int GetScrollX(int x)
+{
+    return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X;
+}
+
+static inline int GetScrollY(int y)
+{
+    return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
+}
+#endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-
 // ----------------------------------------------------------------------------
 // wxGridCellEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellEditor
 // ----------------------------------------------------------------------------
@@ -282,6 +455,7 @@ static const size_t GRID_SCROLL_LINE = 10;
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;
+    m_attr = NULL;
 }
 
 
 }
 
 
@@ -290,10 +464,37 @@ wxGridCellEditor::~wxGridCellEditor()
     Destroy();
 }
 
     Destroy();
 }
 
+void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
+                              wxWindowID WXUNUSED(id),
+                              wxEvtHandler* evtHandler)
+{
+    if ( evtHandler )
+        m_control->PushEventHandler(evtHandler);
+}
+
+void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
+                                       wxGridCellAttr *attr)
+{
+    // erase the background because we might not fill the cell
+    wxClientDC dc(m_control->GetParent());
+    wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow);
+    if (gridWindow)
+        gridWindow->GetOwner()->PrepareDC(dc);
+
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+    dc.DrawRectangle(rectCell);
+
+    // redraw the control we just painted over
+    m_control->Refresh();
+}
 
 void wxGridCellEditor::Destroy()
 {
 
 void wxGridCellEditor::Destroy()
 {
-    if (m_control) {
+    if (m_control)
+    {
+        m_control->PopEventHandler(true /* delete it*/);
+
         m_control->Destroy();
         m_control = NULL;
     }
         m_control->Destroy();
         m_control = NULL;
     }
@@ -310,24 +511,17 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
         // set the colours/fonts if we have any
         if ( attr )
         {
         // set the colours/fonts if we have any
         if ( attr )
         {
-            if ( attr->HasTextColour() )
-            {
-                m_colFgOld = m_control->GetForegroundColour();
-                m_control->SetForegroundColour(attr->GetTextColour());
-            }
+            m_colFgOld = m_control->GetForegroundColour();
+            m_control->SetForegroundColour(attr->GetTextColour());
 
 
-            if ( attr->HasBackgroundColour() )
-            {
-                m_colBgOld = m_control->GetBackgroundColour();
-                m_control->SetBackgroundColour(attr->GetBackgroundColour());
-            }
-
-            if ( attr->HasFont() )
-            {
-                m_fontOld = m_control->GetFont();
-                m_control->SetFont(attr->GetFont());
-            }
+            m_colBgOld = m_control->GetBackgroundColour();
+            m_control->SetBackgroundColour(attr->GetBackgroundColour());
 
 
+// Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
+            m_fontOld = m_control->GetFont();
+            m_control->SetFont(attr->GetFont());
+#endif
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }
@@ -346,12 +540,14 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
-
+// Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }
         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }
+#endif
     }
 }
 
     }
 }
 
@@ -359,7 +555,7 @@ void wxGridCellEditor::SetSize(const wxRect& rect)
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
-    m_control->SetSize(rect);
+    m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
@@ -367,32 +563,132 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 
+bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    bool ctrl = event.ControlDown();
+    bool alt  = event.AltDown();
+#ifdef __WXMAC__
+    // On the Mac the Alt key is more like shift and is used for entry of
+    // valid characters, so check for Ctrl and Meta instead.
+    alt = event.MetaDown();
+#endif
+
+    // Assume it's not a valid char if ctrl or alt is down, but if both are
+    // down then it may be because of an AltGr key combination, so let them
+    // through in that case.
+    if ((ctrl || alt) && !(ctrl && alt))
+        return false;
+
+#if wxUSE_UNICODE
+    int key = event.GetUnicodeKey();
+    bool keyOk = true;
+
+    // if the unicode key code is not really a unicode character (it may
+    // be a function key or etc., the platforms appear to always give us a
+    // small value in this case) then fallback to the ascii key code but
+    // don't do anything for function keys or etc.
+    if (key <= 127)
+    {
+        key = event.GetKeyCode();
+        keyOk = (key <= 127);
+    }
+    return keyOk;
+#else // !wxUSE_UNICODE
+    int key = event.GetKeyCode();
+    if (key <= 255)
+        return true;
+    return false;
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+}
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
+{
+    event.Skip();
+}
+
+void wxGridCellEditor::StartingClick()
 {
 }
 
 {
 }
 
+#if wxUSE_TEXTCTRL
 
 
+// ----------------------------------------------------------------------------
+// wxGridCellTextEditor
+// ----------------------------------------------------------------------------
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
+    m_maxChars = 0;
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)
 {
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)
 {
-    m_control = new wxTextCtrl(parent, -1, "",
+    m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
-                               , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
+                               , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL
 #endif
 #endif
-        );
+                              );
 
 
-    if (evtHandler)
-        m_control->PushEventHandler(evtHandler);
+    // set max length allowed in the textctrl, if the parameter was set
+    if (m_maxChars != 0)
+    {
+        ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+    }
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
+
+void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
+                                           wxGridCellAttr * WXUNUSED(attr))
+{
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
 }
 
 }
 
+void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
+{
+    wxRect rect(rectOrig);
+
+    // Make the edit control large enough to allow for internal
+    // margins
+    //
+    // TODO: remove this if the text ctrl sizing is improved esp. for
+    // unix
+    //
+#if defined(__WXGTK__)
+    if (rect.x != 0)
+    {
+        rect.x += 1;
+        rect.y += 1;
+        rect.width -= 1;
+        rect.height -= 1;
+    }
+#else // !GTK
+    int extra_x = ( rect.x > 2 )? 2 : 1;
+
+// MB: treat MSW separately here otherwise the caret doesn't show
+// when the editor is in the first row.
+#if defined(__WXMSW__)
+    int extra_y = 2;
+#else
+    int extra_y = ( rect.y > 2 )? 2 : 1;
+#endif // MSW
+
+#if defined(__WXMOTIF__)
+    extra_x *= 2;
+    extra_y *= 2;
+#endif
+    rect.SetLeft( wxMax(0, rect.x - extra_x) );
+    rect.SetTop( wxMax(0, rect.y - extra_y) );
+    rect.SetRight( rect.GetRight() + 2*extra_x );
+    rect.SetBottom( rect.GetBottom() + 2*extra_y );
+#endif // GTK/!GTK
+
+    wxGridCellEditor::SetSize(rect);
+}
 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
@@ -400,29 +696,35 @@ void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
-    ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
-    ((wxTextCtrl*)m_control)->SetFocus();
-}
 
 
+    DoBeginEdit(m_startValue);
+}
 
 
+void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
+    Text()->SetInsertionPointEnd();
+    Text()->SetSelection(-1,-1);
+    Text()->SetFocus();
+}
 
 
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellTextEditor::EndEdit(int row, int col,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
-    bool changed = FALSE;
-    wxString value = ((wxTextCtrl*)m_control)->GetValue();
+    bool changed = false;
+    wxString value = Text()->GetValue();
     if (value != m_startValue)
     if (value != m_startValue)
-        changed = TRUE;
+        changed = true;
 
     if (changed)
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
 
     if (changed)
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
+    // No point in setting the text of the hidden control
+    //Text()->SetValue(m_startValue);
 
     return changed;
 }
 
     return changed;
 }
@@ -433,35 +735,70 @@ void wxGridCellTextEditor::Reset()
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
-    ((wxTextCtrl*)m_control)->SetValue(m_startValue);
-    ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
+    DoReset(m_startValue);
+}
+
+void wxGridCellTextEditor::DoReset(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
+    Text()->SetInsertionPointEnd();
 }
 
 }
 
+bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    return wxGridCellEditor::IsAcceptedKey(event);
+}
 
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 {
 
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    // Since this is now happening in the EVT_CHAR event EmulateKeyPress is no
+    // longer an appropriate way to get the character into the text control.
+    // Do it ourselves instead.  We know that if we get this far that we have
+    // a valid character, so not a whole lot of testing needs to be done.
+
+    wxTextCtrl* tc = Text();
+    wxChar ch;
+    long pos;
+
+#if wxUSE_UNICODE
+    ch = event.GetUnicodeKey();
+    if (ch <= 127)
+        ch = (wxChar)event.GetKeyCode();
+#else
+    ch = (wxChar)event.GetKeyCode();
+#endif
+    switch (ch)
+    {
+        case WXK_DELETE:
+            // delete the character at the cursor
+            pos = tc->GetInsertionPoint();
+            if (pos < tc->GetLastPosition())
+                tc->Remove(pos, pos+1);
+            break;
+
+        case WXK_BACK:
+            // delete the character before the cursor
+            pos = tc->GetInsertionPoint();
+            if (pos > 0)
+                tc->Remove(pos-1, pos);
+            break;
 
 
-    int code = event.KeyCode();
-    if (code >= 32 && code < 255) {
-        wxString st((char)code);
-        if (! event.ShiftDown())
-            st.LowerCase();
-        ((wxTextCtrl*)m_control)->AppendText(st);
+        default:
+            tc->WriteText(ch);
+            break;
     }
 }
 
     }
 }
 
-
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+                                         WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
 {
 #if defined(__WXMOTIF__) || defined(__WXGTK__)
     // wxMotif needs a little extra help...
 {
 #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 );
+    size_t pos = (size_t)( Text()->GetInsertionPoint() );
+    wxString s( Text()->GetValue() );
+    s = s.Left(pos) + wxT("\n") + s.Mid(pos);
+    Text()->SetValue(s);
+    Text()->SetInsertionPoint( pos );
 #else
     // the other ports can handle a Return key press
     //
 #else
     // the other ports can handle a Return key press
     //
@@ -469,5256 +806,9325 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
 #endif
 }
 
 #endif
 }
 
-
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+void wxGridCellTextEditor::SetParameters(const wxString& params)
 {
 {
-    switch ( event.KeyCode() )
+    if ( !params )
     {
     {
-        case WXK_ESCAPE:
-            m_editor->Reset();
-            m_grid->EnableCellEditControl(FALSE);
-            break;
-
-        case WXK_TAB:
-            event.Skip( m_grid->ProcessEvent( event ) );
-            break;
-
-        case WXK_RETURN:
-            if (!m_grid->ProcessEvent(event))
-                m_editor->HandleReturn(event);
-            break;
-
-
-        default:
-            event.Skip();
+        // reset to default
+        m_maxChars = 0;
+    }
+    else
+    {
+        long tmp;
+        if ( !params.ToLong(&tmp) )
+        {
+            wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str());
+        }
+        else
+        {
+            m_maxChars = (size_t)tmp;
+        }
     }
 }
 
     }
 }
 
-void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+// return the value in the text control
+wxString wxGridCellTextEditor::GetValue() const
 {
 {
-    switch ( event.KeyCode() )
-    {
-        case WXK_ESCAPE:
-        case WXK_TAB:
-        case WXK_RETURN:
-            break;
-
-        default:
-            event.Skip();
-    }
+  return Text()->GetValue();
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// wxGridCellRenderer
+// wxGridCellNumberEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int row, int col,
-                              bool isSelected)
+wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max)
 {
 {
-    dc.SetBackgroundMode( wxSOLID );
+    m_min = min;
+    m_max = max;
+}
 
 
-    if ( isSelected )
+void wxGridCellNumberEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
+{
+#if wxUSE_SPINCTRL
+    if ( HasRange() )
     {
     {
-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+        // create a spin ctrl
+        m_control = new wxSpinCtrl(parent, wxID_ANY, wxEmptyString,
+                                   wxDefaultPosition, wxDefaultSize,
+                                   wxSP_ARROW_KEYS,
+                                   m_min, m_max);
+
+        wxGridCellEditor::Create(parent, id, evtHandler);
     }
     else
     }
     else
+#endif
     {
     {
-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
-    }
+        // just a text control
+        wxGridCellTextEditor::Create(parent, id, evtHandler);
 
 
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle(rect);
+#if wxUSE_VALIDATORS
+        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+    }
 }
 
 }
 
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
-                                    wxGridCellAttr& attr,
-                                    wxDC& dc,
-                                    const wxRect& rectCell,
-                                    int row, int col,
-                                    bool isSelected)
+void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 {
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+    {
+        m_valueOld = table->GetValueAsLong(row, col);
+    }
+    else
+    {
+        m_valueOld = 0;
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToLong(&m_valueOld) && ! sValue.empty())
+        {
+            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+            return;
+        }
+    }
 
 
-    // now we only have to draw the text
-    dc.SetBackgroundMode( wxTRANSPARENT );
+#if wxUSE_SPINCTRL
+    if ( HasRange() )
+    {
+        Spin()->SetValue((int)m_valueOld);
+        Spin()->SetFocus();
+    }
+    else
+#endif
+    {
+        DoBeginEdit(GetString());
+    }
+}
 
 
-    // TODO some special colours for attr.IsReadOnly() case?
+bool wxGridCellNumberEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    bool changed;
+    long value = 0;
+    wxString text;
 
 
-    if ( isSelected )
+#if wxUSE_SPINCTRL
+    if ( HasRange() )
     {
     {
-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
+        value = Spin()->GetValue();
+        changed = value != m_valueOld;
+        if (changed)
+            text = wxString::Format(wxT("%ld"), value);
     }
     else
     }
     else
+#endif
     {
     {
-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
+        text = Text()->GetValue();
+        changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld);
     }
     }
-    dc.SetFont( attr.GetFont() );
-
-    int hAlign, vAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
 
 
-    wxRect rect = rectCell;
-    rect.x++;
-    rect.y++;
-    rect.width -= 2;
-    rect.height -= 2;
+    if ( changed )
+    {
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
+            grid->GetTable()->SetValueAsLong(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, text);
+    }
 
 
-    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                           rect, hAlign, vAlign);
+    return changed;
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellAttr
-// ----------------------------------------------------------------------------
-
-const wxColour& wxGridCellAttr::GetTextColour() const
+void wxGridCellNumberEditor::Reset()
 {
 {
-    if (HasTextColour())
-        return m_colText;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetTextColour();
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullColour;
+#if wxUSE_SPINCTRL
+    if ( HasRange() )
+    {
+        Spin()->SetValue((int)m_valueOld);
+    }
+    else
+#endif
+    {
+        DoReset(GetString());
     }
 }
 
     }
 }
 
-
-const wxColour& wxGridCellAttr::GetBackgroundColour() const
+bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event)
 {
 {
-    if (HasBackgroundColour())
-        return m_colBack;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetBackgroundColour();
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullColour;
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    {
+        int keycode = event.GetKeyCode();
+        if ( (keycode < 128) &&
+             (wxIsdigit(keycode) || keycode == '+' || keycode == '-'))
+        {
+            return true;
+        }
     }
     }
-}
 
 
+    return false;
+}
 
 
-const wxFont& wxGridCellAttr::GetFont() const
+void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 {
 {
-    if (HasFont())
-        return m_font;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetFont();
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return wxNullFont;
+    int keycode = event.GetKeyCode();
+    if ( !HasRange() )
+    {
+        if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-')
+        {
+            wxGridCellTextEditor::StartingKey(event);
+
+            // skip Skip() below
+            return;
+        }
+    }
+#if wxUSE_SPINCTRL
+    else
+    {
+        if ( wxIsdigit(keycode) )
+        {
+            wxSpinCtrl* spin = (wxSpinCtrl*)m_control;
+            spin->SetValue(keycode - '0');
+            spin->SetSelection(1,1);
+            return;
+        }
     }
     }
+#endif
+    event.Skip();
 }
 
 }
 
-
-void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
+void wxGridCellNumberEditor::SetParameters(const wxString& params)
 {
 {
-    if (HasAlignment()) {
-        if ( hAlign ) *hAlign = m_hAlign;
-        if ( vAlign ) *vAlign = m_vAlign;
-    }
-    else if (m_defGridAttr != this)
-        m_defGridAttr->GetAlignment(hAlign, vAlign);
-    else {
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
+    if ( !params )
+    {
+        // reset to default
+        m_min =
+        m_max = -1;
     }
     }
-}
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_min = (int)tmp;
 
 
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_max = (int)tmp;
 
 
-wxGridCellRenderer* wxGridCellAttr::GetRenderer() 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;
+                // skip the error message below
+                return;
+            }
+        }
+
+        wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
     }
 }
 
     }
 }
 
-wxGridCellEditor* wxGridCellAttr::GetEditor() const
+// return the value in the spin control if it is there (the text control otherwise)
+wxString wxGridCellNumberEditor::GetValue() 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;
+    wxString s;
+
+#if wxUSE_SPINCTRL
+    if( HasRange() )
+    {
+        long value = Spin()->GetValue();
+        s.Printf(wxT("%ld"), value);
+    }
+    else
+#endif
+    {
+        s = Text()->GetValue();
     }
     }
+
+    return s;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// wxGridCellAttrData
+// wxGridCellFloatEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
+wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
 {
 {
-    int n = FindIndex(row, col);
-    if ( n == wxNOT_FOUND )
+    m_width = width;
+    m_precision = precision;
+}
+
+void wxGridCellFloatEditor::Create(wxWindow* parent,
+                                   wxWindowID id,
+                                   wxEvtHandler* evtHandler)
+{
+    wxGridCellTextEditor::Create(parent, id, evtHandler);
+
+#if wxUSE_VALIDATORS
+    Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+}
+
+void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
     {
-        // add the attribute
-        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+        m_valueOld = table->GetValueAsDouble(row, col);
     }
     else
     {
     }
     else
     {
-        if ( attr )
-        {
-            // change the attribute
-            m_attrs[(size_t)n].attr = attr;
-        }
-        else
+        m_valueOld = 0.0;
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToDouble(&m_valueOld) && ! sValue.empty())
         {
         {
-            // remove this attribute
-            m_attrs.RemoveAt((size_t)n);
+            wxFAIL_MSG( _T("this cell doesn't have float value") );
+            return;
         }
     }
         }
     }
+
+    DoBeginEdit(GetString());
 }
 
 }
 
-wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
+bool wxGridCellFloatEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
 {
 {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    double value = 0.0;
+    wxString text(Text()->GetValue());
 
 
-    int n = FindIndex(row, col);
-    if ( n != wxNOT_FOUND )
+    if ( (text.empty() || text.ToDouble(&value)) && (value != m_valueOld) )
     {
     {
-        attr = m_attrs[(size_t)n].attr;
-        attr->IncRef();
-    }
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
+            grid->GetTable()->SetValueAsDouble(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, text);
 
 
-    return attr;
+        return true;
+    }
+    return false;
 }
 
 }
 
-void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
+void wxGridCellFloatEditor::Reset()
 {
 {
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxGridCellCoords& coords = m_attrs[n].coords;
-        wxCoord row = coords.GetRow();
-        if ((size_t)row >= pos)
-        {
-            if (numRows > 0)
-            {
-                // If rows inserted, include row counter where necessary
-                coords.SetRow(row + numRows);
-            }
-            else if (numRows < 0)
-            {
-                // If rows deleted ...
-                if ((size_t)row >= pos - numRows)
-                {
-                    // ...either decrement row counter (if row still exists)...
-                    coords.SetRow(row + numRows);
-                }
-                else
-                {
-                    // ...or remove the attribute
-                    m_attrs.RemoveAt((size_t)n);
-                    n--; count--;
-                }
-            }
-        }
-    }
+    DoReset(GetString());
 }
 
 }
 
-void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
+void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
 {
 {
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    int keycode = event.GetKeyCode();
+    char tmpbuf[2];
+    tmpbuf[0] = (char) keycode;
+    tmpbuf[1] = '\0';
+    wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL
+    bool is_decimal_point = ( strbuf ==
+       wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
+#else
+    bool is_decimal_point = ( strbuf == _T(".") );
+#endif
+    if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
+         || is_decimal_point )
     {
     {
-        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--;
-                }
-            }
-        }
+        wxGridCellTextEditor::StartingKey(event);
+
+        // skip Skip() below
+        return;
     }
     }
+
+    event.Skip();
 }
 
 }
 
-int wxGridCellAttrData::FindIndex(int row, int col) const
+void wxGridCellFloatEditor::SetParameters(const wxString& params)
 {
 {
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    if ( !params )
     {
     {
-        const wxGridCellCoords& coords = m_attrs[n].coords;
-        if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
-        {
-            return n;
-        }
+        // reset to default
+        m_width =
+        m_precision = -1;
     }
     }
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_width = (int)tmp;
 
 
-    return wxNOT_FOUND;
-}
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_precision = (int)tmp;
 
 
-// ----------------------------------------------------------------------------
-// wxGridRowOrColAttrData
-// ----------------------------------------------------------------------------
+                // skip the error message below
+                return;
+            }
+        }
 
 
-wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
-{
-    size_t count = m_attrs.Count();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        m_attrs[n]->DecRef();
+        wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
     }
 }
 
     }
 }
 
-wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
+wxString wxGridCellFloatEditor::GetString() const
 {
 {
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-
-    int n = m_rowsOrCols.Index(rowOrCol);
-    if ( n != wxNOT_FOUND )
+    wxString fmt;
+    if ( m_width == -1 )
     {
     {
-        attr = m_attrs[(size_t)n];
-        attr->IncRef();
+        // default width/precision
+        fmt = _T("%f");
     }
     }
-
-    return attr;
-}
-
-void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
-{
-    int n = m_rowsOrCols.Index(rowOrCol);
-    if ( n == wxNOT_FOUND )
+    else if ( m_precision == -1 )
     {
     {
-        // add the attribute
-        m_rowsOrCols.Add(rowOrCol);
-        m_attrs.Add(attr);
+        // default precision
+        fmt.Printf(_T("%%%d.f"), m_width);
     }
     else
     {
     }
     else
     {
-        if ( attr )
-        {
-            // change the attribute
-            m_attrs[(size_t)n] = attr;
-        }
-        else
-        {
-            // remove this attribute
-            m_attrs[(size_t)n]->DecRef();
-            m_rowsOrCols.RemoveAt((size_t)n);
-            m_attrs.RemoveAt((size_t)n);
-        }
+        fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
     }
     }
+
+    return wxString::Format(fmt, m_valueOld);
 }
 
 }
 
-void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols )
+bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
 {
 {
-    size_t count = m_attrs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
     {
     {
-        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--;
-                }
-            }
-        }
+        int keycode = event.GetKeyCode();
+        printf("%d\n", keycode);
+        // accept digits, 'e' as in '1e+6', also '-', '+', and '.'
+        char tmpbuf[2];
+        tmpbuf[0] = (char) keycode;
+        tmpbuf[1] = '\0';
+        wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL
+        bool is_decimal_point =
+            ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+                                          wxLOCALE_CAT_NUMBER) );
+#else
+        bool is_decimal_point = ( strbuf == _T(".") );
+#endif
+        if ( (keycode < 128) &&
+             (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
+              is_decimal_point || keycode == '+' || keycode == '-') )
+            return true;
     }
     }
+
+    return false;
 }
 
 }
 
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// wxGridCellAttrProvider
+// wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-wxGridCellAttrProvider::wxGridCellAttrProvider()
+void wxGridCellBoolEditor::Create(wxWindow* parent,
+                                  wxWindowID id,
+                                  wxEvtHandler* evtHandler)
 {
 {
-    m_data = (wxGridCellAttrProviderData *)NULL;
-}
+    m_control = new wxCheckBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               wxNO_BORDER);
 
 
-wxGridCellAttrProvider::~wxGridCellAttrProvider()
-{
-    delete m_data;
+    wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
 }
 
-void wxGridCellAttrProvider::InitData()
+void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {
 {
-    m_data = new wxGridCellAttrProviderData;
-}
+    bool resize = false;
+    wxSize size = m_control->GetSize();
+    wxCoord minSize = wxMin(r.width, r.height);
 
 
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
-{
-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-    if ( m_data )
+    // check if the checkbox is not too big/small for this cell
+    wxSize sizeBest = m_control->GetBestSize();
+    if ( !(size == sizeBest) )
     {
     {
-        // first look for the attribute of this specific cell
-        attr = m_data->m_cellAttrs.GetAttr(row, col);
-
-        if ( !attr )
-        {
-            // 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);
-        }
+        // reset to default size if it had been made smaller
+        size = sizeBest;
 
 
-        if ( !attr )
-        {
-            // finally try the row attributes
-            attr = m_data->m_rowAttrs.GetAttr(row);
-        }
+        resize = true;
     }
 
     }
 
-    return attr;
-}
+    if ( size.x >= minSize || size.y >= minSize )
+    {
+        // leave 1 pixel margin
+        size.x = size.y = minSize - 2;
 
 
-void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr,
-                                     int row, int col)
-{
-    if ( !m_data )
-        InitData();
+        resize = true;
+    }
 
 
-    m_data->m_cellAttrs.SetAttr(attr, row, col);
-}
+    if ( resize )
+    {
+        m_control->SetSize(size);
+    }
 
 
-void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row)
-{
-    if ( !m_data )
-        InitData();
+    // position it in the centre of the rectangle (TODO: support alignment?)
 
 
-    m_data->m_rowAttrs.SetAttr(attr, row);
-}
+#if defined(__WXGTK__) || defined (__WXMOTIF__)
+    // the checkbox without label still has some space to the right in wxGTK,
+    // so shift it to the right
+    size.x -= 8;
+#elif defined(__WXMSW__)
+    // here too, but in other way
+    size.x += 1;
+    size.y -= 2;
+#endif
 
 
-void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col)
-{
-    if ( !m_data )
-        InitData();
+    int hAlign = wxALIGN_CENTRE;
+    int vAlign = wxALIGN_CENTRE;
+    if (GetCellAttr())
+        GetCellAttr()->GetAlignment(& hAlign, & vAlign);
 
 
-    m_data->m_colAttrs.SetAttr(attr, col);
+    int x = 0, y = 0;
+    if (hAlign == wxALIGN_LEFT)
+    {
+        x = r.x + 2;
+#ifdef __WXMSW__
+        x += 2;
+#endif
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_RIGHT)
+    {
+        x = r.x + r.width - size.x - 2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_CENTRE)
+    {
+        x = r.x + r.width/2 - size.x/2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+
+    m_control->Move(x, y);
 }
 
 }
 
-void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows )
+void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 {
 {
-    if ( m_data )
-    {
-        m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
+    m_control->Show(show);
 
 
-        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
+    if ( show )
+    {
+        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
+        CBox()->SetBackgroundColour(colBg);
     }
 }
 
     }
 }
 
-void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
+void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 {
-    if ( m_data )
-    {
-        m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
 
 
-        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+    if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+    else
+    {
+        wxString cellval( grid->GetTable()->GetValue(row, col) );
+        m_startValue = !( !cellval || (cellval == wxT("0")) );
     }
     }
+    CBox()->SetValue(m_startValue);
+    CBox()->SetFocus();
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxGridTableBase
-// ----------------------------------------------------------------------------
+bool wxGridCellBoolEditor::EndEdit(int row, int col,
+                                   wxGrid* grid)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
 
 
-//////////////////////////////////////////////////////////////////////
-//
-// Abstract base class for grid data (the model)
-//
-IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
+    bool changed = false;
+    bool value = CBox()->GetValue();
+    if ( value != m_startValue )
+        changed = true;
 
 
+    if ( changed )
+    {
+        if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+            grid->GetTable()->SetValueAsBool(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+    }
 
 
-wxGridTableBase::wxGridTableBase()
-{
-    m_view = (wxGrid *) NULL;
-    m_attrProvider = (wxGridCellAttrProvider *) NULL;
+    return changed;
 }
 
 }
 
-wxGridTableBase::~wxGridTableBase()
+void wxGridCellBoolEditor::Reset()
 {
 {
-    delete m_attrProvider;
-}
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
 
 
-void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
-{
-    delete m_attrProvider;
-    m_attrProvider = attrProvider;
+    CBox()->SetValue(m_startValue);
 }
 
 }
 
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+void wxGridCellBoolEditor::StartingClick()
 {
 {
-    if ( m_attrProvider )
-        return m_attrProvider->GetAttr(row, col);
-    else
-        return (wxGridCellAttr *)NULL;
+    CBox()->SetValue(!CBox()->GetValue());
 }
 
 }
 
-void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
+bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
 {
 {
-    if ( m_attrProvider )
-    {
-        m_attrProvider->SetAttr(attr, row, col);
-    }
-    else
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
     {
     {
-        // as we take ownership of the pointer and don't store it, we must
-        // free it now
-        attr->SafeDecRef();
+        int keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_SPACE:
+            case '+':
+            case '-':
+                return true;
+        }
     }
     }
-}
 
 
-void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
-{
-    if ( m_attrProvider )
-    {
-        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();
-    }
+    return false;
 }
 
 }
 
-void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
+void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
 {
 {
-    if ( m_attrProvider )
-    {
-        m_attrProvider->SetColAttr(attr, col);
-    }
-    else
+    int keycode = event.GetKeyCode();
+    switch ( keycode )
     {
     {
-        // as we take ownership of the pointer and don't store it, we must
-        // free it now
-        attr->SafeDecRef();
+        case WXK_SPACE:
+            CBox()->SetValue(!CBox()->GetValue());
+            break;
+
+        case '+':
+            CBox()->SetValue(true);
+            break;
+
+        case '-':
+            CBox()->SetValue(false);
+            break;
     }
 }
 
     }
 }
 
-void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
+
+// return the value as "1" for true and the empty string for false
+wxString wxGridCellBoolEditor::GetValue() const
 {
 {
-    if ( m_attrProvider )
-    {
-        m_attrProvider->UpdateAttrRows( pos, numRows );
-    }
+  bool bSet = CBox()->GetValue();
+  return bSet ? _T("1") : wxEmptyString;
 }
 
 }
 
-void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices,
+                                               bool allowOthers)
+    : m_choices(choices),
+      m_allowOthers(allowOthers) { }
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+                                               const wxString choices[],
+                                               bool allowOthers)
+                      : m_allowOthers(allowOthers)
 {
 {
-    if ( m_attrProvider )
+    if ( count )
     {
     {
-        m_attrProvider->UpdateAttrCols( pos, numCols );
+        m_choices.Alloc(count);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add(choices[n]);
+        }
     }
 }
 
     }
 }
 
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
-                    "but your derived table class does not override this function") );
+    wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
+    editor->m_allowOthers = m_allowOthers;
+    editor->m_choices = m_choices;
 
 
-    return FALSE;
+    return editor;
 }
 
 }
 
-bool wxGridTableBase::AppendRows( size_t numRows )
+void wxGridCellChoiceEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
-                    "but your derived table class does not override this function"));
+    m_control = new wxComboBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               m_choices,
+                               m_allowOthers ? 0 : wxCB_READONLY);
 
 
-    return FALSE;
+    wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
 }
 
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
+                                             wxGridCellAttr * attr)
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
-                    "but your derived table class does not override this function"));
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
 
 
-    return FALSE;
+    // TODO: It doesn't actually fill the client area since the height of a
+    // combo always defaults to the standard...  Until someone has time to
+    // figure out the right rectangle to paint, just do it the normal way...
+    wxGridCellEditor::PaintBackground(rectCell, attr);
 }
 
 }
 
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
-                  "but your derived table class does not override this function"));
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
 
 
-    return FALSE;
-}
+    wxGridCellEditorEvtHandler* evtHandler = NULL;
+    if (m_control)
+        evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler);
 
 
-bool wxGridTableBase::AppendCols( size_t numCols )
-{
-    wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
-                   "but your derived table class does not override this function"));
+    // Don't immediately end if we get a kill focus event within BeginEdit
+    if (evtHandler)
+        evtHandler->SetInSetFocus(true);
 
 
-    return FALSE;
+    m_startValue = grid->GetTable()->GetValue(row, col);
+
+    if (m_allowOthers)
+        Combo()->SetValue(m_startValue);
+    else
+    {
+        // find the right position, or default to the first if not found
+        int pos = Combo()->FindString(m_startValue);
+        if (pos == wxNOT_FOUND)
+            pos = 0;
+        Combo()->SetSelection(pos);
+    }
+    Combo()->SetInsertionPointEnd();
+    Combo()->SetFocus();
+
+    if (evtHandler)
+        evtHandler->SetInSetFocus(false);
 }
 
 }
 
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridCellChoiceEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
-                    "but your derived table class does not override this function"));
+    wxString value = Combo()->GetValue();
+    if ( value == m_startValue )
+        return false;
 
 
-    return FALSE;
-}
+    grid->GetTable()->SetValue(row, col, value);
 
 
+    return true;
+}
 
 
-wxString wxGridTableBase::GetRowLabelValue( int row )
+void wxGridCellChoiceEditor::Reset()
 {
 {
-    wxString s;
-    s << row;
-    return s;
+    Combo()->SetValue(m_startValue);
+    Combo()->SetInsertionPointEnd();
 }
 
 }
 
-wxString wxGridTableBase::GetColLabelValue( int col )
+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
 {
 {
-    // default col labels are:
-    //   cols 0 to 25   : A-Z
-    //   cols 26 to 675 : AA-ZZ
-    //   etc.
-
-    wxString s;
-    unsigned int i, n;
-    for ( n = 1; ; n++ )
+    if ( !params )
     {
     {
-        s += (_T('A') + (wxChar)( col%26 ));
-        col = col/26 - 1;
-        if ( col < 0 ) break;
+        // what can we do?
+        return;
     }
 
     }
 
-    // reverse the string...
-    wxString s2;
-    for ( i = 0;  i < n;  i++ )
+    m_choices.Empty();
+
+    wxStringTokenizer tk(params, _T(','));
+    while ( tk.HasMoreTokens() )
     {
     {
-        s2 += s[n-i-1];
+        m_choices.Add(tk.GetNextToken());
     }
     }
-
-    return s2;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////
-//
-// Message class for the grid table to send requests and notifications
-// to the grid view
-//
-
-wxGridTableMessage::wxGridTableMessage()
-{
-    m_table = (wxGridTableBase *) NULL;
-    m_id = -1;
-    m_comInt1 = -1;
-    m_comInt2 = -1;
 }
 
 }
 
-wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
-                                        int commandInt1, int commandInt2 )
+// return the value in the text control
+wxString wxGridCellChoiceEditor::GetValue() const
 {
 {
-    m_table = table;
-    m_id = id;
-    m_comInt1 = commandInt1;
-    m_comInt2 = commandInt2;
+  return Combo()->GetValue();
 }
 
 }
 
+#endif // wxUSE_COMBOBOX
 
 
+// ----------------------------------------------------------------------------
+// wxGridCellEditorEvtHandler
+// ----------------------------------------------------------------------------
 
 
-//////////////////////////////////////////////////////////////////////
-//
-// A basic grid table for string data. An object of this class will
-// created by wxGrid if you don't specify an alternative table class.
-//
-
-WX_DEFINE_OBJARRAY(wxGridStringArray)
+void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
+{
+    // Don't disable the cell if we're just starting to edit it
+    if (m_inSetFocus)
+        return;
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
+    // accept changes
+    m_grid->DisableCellEditControl();
 
 
-wxGridStringTable::wxGridStringTable()
-        : wxGridTableBase()
-{
+    event.Skip();
 }
 
 }
 
-wxGridStringTable::wxGridStringTable( int numRows, int numCols )
-        : wxGridTableBase()
+void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 {
 {
-    int row, col;
+    switch ( event.GetKeyCode() )
+    {
+        case WXK_ESCAPE:
+            m_editor->Reset();
+            m_grid->DisableCellEditControl();
+            break;
 
 
-    m_data.Alloc( numRows );
+        case WXK_TAB:
+            m_grid->GetEventHandler()->ProcessEvent( event );
+            break;
 
 
-    wxArrayString sa;
-    sa.Alloc( numCols );
-    for ( col = 0;  col < numCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
+        case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
+            if (!m_grid->GetEventHandler()->ProcessEvent(event))
+                m_editor->HandleReturn(event);
+            break;
 
 
-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
+        default:
+            event.Skip();
     }
 }
 
     }
 }
 
-wxGridStringTable::~wxGridStringTable()
+void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {
 {
-}
+    switch ( event.GetKeyCode() )
+    {
+        case WXK_ESCAPE:
+        case WXK_TAB:
+        case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
+            break;
 
 
-long wxGridStringTable::GetNumberRows()
-{
-    return m_data.GetCount();
+        default:
+            event.Skip();
+    }
 }
 
 }
 
-long wxGridStringTable::GetNumberCols()
-{
-    if ( m_data.GetCount() > 0 )
-        return m_data[0].GetCount();
-    else
-        return 0;
-}
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
 
 
-wxString wxGridStringTable::GetValue( int row, int col )
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
 {
 {
-    // TODO: bounds checking
-    //
-    return m_data[row][col];
+    // nothing to do
 }
 
 }
 
-void wxGridStringTable::SetValue( int row, int col, const wxString& s )
+wxGridCellWorker::~wxGridCellWorker()
 {
 {
-    // TODO: bounds checking
-    //
-    m_data[row][col] = s;
 }
 
 }
 
-bool wxGridStringTable::IsEmptyCell( int row, int col )
-{
-    // TODO: bounds checking
-    //
-    return (m_data[row][col] == wxEmptyString);
-}
+// ============================================================================
+// renderer classes
+// ============================================================================
 
 
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer
+// ----------------------------------------------------------------------------
 
 
-void wxGridStringTable::Clear()
+void wxGridCellRenderer::Draw(wxGrid& grid,
+                              wxGridCellAttr& attr,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int WXUNUSED(row), int WXUNUSED(col),
+                              bool isSelected)
 {
 {
-    int row, col;
-    int numRows, numCols;
+    dc.SetBackgroundMode( wxSOLID );
 
 
-    numRows = m_data.GetCount();
-    if ( numRows > 0 )
+    // grey out fields if the grid is disabled
+    if( grid.IsEnabled() )
     {
     {
-        numCols = m_data[0].GetCount();
-
-        for ( row = 0;  row < numRows;  row++ )
+        if ( isSelected )
         {
         {
-            for ( col = 0;  col < numCols;  col++ )
-            {
-                m_data[row][col] = wxEmptyString;
-            }
+            dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+        }
+        else
+        {
+            dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
         }
     }
         }
     }
+    else
+    {
+        dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+    }
+
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle(rect);
 }
 
 }
 
+// ----------------------------------------------------------------------------
+// wxGridCellStringRenderer
+// ----------------------------------------------------------------------------
 
 
-bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
+void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
+                                                     wxGridCellAttr& attr,
+                                                     wxDC& dc,
+                                                     bool isSelected)
 {
 {
-    size_t row, col;
+    dc.SetBackgroundMode( wxTRANSPARENT );
 
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    // TODO some special colours for attr.IsReadOnly() case?
 
 
-    if ( pos >= curNumRows )
+    // different coloured text when the grid is disabled
+    if( grid.IsEnabled() )
     {
     {
-        return AppendRows( numRows );
+      if ( isSelected )
+      {
+          dc.SetTextBackground( grid.GetSelectionBackground() );
+          dc.SetTextForeground( grid.GetSelectionForeground() );
+      }
+      else
+      {
+          dc.SetTextBackground( attr.GetBackgroundColour() );
+          dc.SetTextForeground( attr.GetTextColour() );
+      }
     }
     }
-
-    wxArrayString sa;
-    sa.Alloc( curNumCols );
-    for ( col = 0;  col < curNumCols;  col++ )
+    else
     {
     {
-        sa.Add( wxEmptyString );
+      dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+      dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
     }
 
     }
 
-    for ( row = pos;  row < pos + numRows;  row++ )
+    dc.SetFont( attr.GetFont() );
+}
+
+wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+                                               wxDC& dc,
+                                               const wxString& text)
+{
+    wxCoord x = 0, y = 0, max_x = 0;
+    dc.SetFont(attr.GetFont());
+    wxStringTokenizer tk(text, _T('\n'));
+    while ( tk.HasMoreTokens() )
     {
     {
-        m_data.Insert( sa, row );
+        dc.GetTextExtent(tk.GetNextToken(), &x, &y);
+        max_x = wxMax(max_x, x);
     }
     }
-    UpdateAttrRows( pos, numRows );
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_INSERTED,
-                                pos,
-                                numRows );
 
 
-        GetView()->ProcessTableMessage( msg );
-    }
+    y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines.
 
 
-    return TRUE;
+    return wxSize(max_x, y);
 }
 
 }
 
-bool wxGridStringTable::AppendRows( size_t numRows )
+wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
 {
 {
-    size_t row, col;
+    return DoGetBestSize(attr, dc, grid.GetCellValue(row, col));
+}
 
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+void wxGridCellStringRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
+                                    wxDC& dc,
+                                    const wxRect& rectCell,
+                                    int row, int col,
+                                    bool isSelected)
+{
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
 
 
-    wxArrayString sa;
-    if ( curNumCols > 0 )
+    // erase only this cells background, overflow cells should have been erased
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+
+    int overflowCols = 0;
+
+    if (attr.GetOverflow())
     {
     {
-        sa.Alloc( curNumCols );
-        for ( col = 0;  col < curNumCols;  col++ )
+        int cols = grid.GetNumberCols();
+        int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
+        int cell_rows, cell_cols;
+        attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0
+        if ((best_width > rectCell.width) && (col < cols) && grid.GetTable())
         {
         {
-            sa.Add( wxEmptyString );
+            int i, c_cols, c_rows;
+            for (i = col+cell_cols; i < cols; i++)
+            {
+                bool is_empty = true;
+                for (int j=row; j<row+cell_rows; j++)
+                {
+                    // check w/ anchor cell for multicell block
+                    grid.GetCellSize(j, i, &c_rows, &c_cols);
+                    if (c_rows > 0) c_rows = 0;
+                    if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
+                    {
+                        is_empty = false;
+                        break;
+                    }
+                }
+                if (is_empty)
+                    rect.width += grid.GetColSize(i);
+                else
+                {
+                    i--;
+                    break;
+                }
+                if (rect.width >= best_width) break;
+            }
+            overflowCols = i - col - cell_cols + 1;
+            if (overflowCols >= cols) overflowCols = cols - 1;
         }
         }
-    }
-
-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
 
 
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_APPENDED,
-                                numRows );
+        if (overflowCols > 0) // redraw overflow cells w/ proper hilight
+        {
+            hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
+            wxRect clip = rect;
+            clip.x += rectCell.width;
+            // draw each overflow cell individually
+            int col_end = col+cell_cols+overflowCols;
+            if (col_end >= grid.GetNumberCols())
+                col_end = grid.GetNumberCols() - 1;
+            for (int i = col+cell_cols; i <= col_end; i++)
+            {
+                clip.width = grid.GetColSize(i) - 1;
+                dc.DestroyClippingRegion();
+                dc.SetClippingRegion(clip);
 
 
-        GetView()->ProcessTableMessage( msg );
-    }
+                SetTextColoursAndFont(grid, attr, dc,
+                        grid.IsInSelection(row,i));
 
 
-    return TRUE;
-}
+                grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                        rect, hAlign, vAlign);
+                clip.x += grid.GetColSize(i) - 1;
+            }
 
 
-bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
-{
-    size_t n;
+            rect = rectCell;
+            rect.Inflate(-1);
+            rect.width++;
+            dc.DestroyClippingRegion();
+        }
+    }
 
 
-    size_t curNumRows = m_data.GetCount();
+    // now we only have to draw the text
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
 
-    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;
-    }
+    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                           rect, hAlign, vAlign);
+}
 
 
-    if ( numRows > curNumRows - pos )
-    {
-        numRows = curNumRows - pos;
-    }
+// ----------------------------------------------------------------------------
+// wxGridCellNumberRenderer
+// ----------------------------------------------------------------------------
 
 
-    if ( numRows >= curNumRows )
+wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {
     {
-        m_data.Empty();  // don't release memory just yet
+        text.Printf(_T("%ld"), table->GetValueAsLong(row, col));
     }
     else
     {
     }
     else
     {
-        for ( n = 0;  n < numRows;  n++ )
-        {
-            m_data.Remove( pos );
-        }
-    }
-    UpdateAttrRows( pos, -((int)numRows) );
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_DELETED,
-                                pos,
-                                numRows );
-
-        GetView()->ProcessTableMessage( msg );
+        text = table->GetValue(row, col);
     }
 
     }
 
-    return TRUE;
+    return text;
 }
 
 }
 
-bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
+void wxGridCellNumberRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
+                                    wxDC& dc,
+                                    const wxRect& rectCell,
+                                    int row, int col,
+                                    bool isSelected)
 {
 {
-    size_t row, col;
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
 
-    if ( pos >= curNumCols )
-    {
-        return AppendCols( numCols );
-    }
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxALIGN_RIGHT;
 
 
-    for ( row = 0;  row < curNumRows;  row++ )
-    {
-        for ( col = pos;  col < pos + numCols;  col++ )
-        {
-            m_data[row].Insert( wxEmptyString, col );
-        }
-    }
-    UpdateAttrCols( pos, numCols );
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_INSERTED,
-                                pos,
-                                numCols );
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
 
 
-        GetView()->ProcessTableMessage( msg );
-    }
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
 
 
-    return TRUE;
+wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
 }
 
 }
 
-bool wxGridStringTable::AppendCols( size_t numCols )
+// ----------------------------------------------------------------------------
+// wxGridCellFloatRenderer
+// ----------------------------------------------------------------------------
+
+wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
+{
+    SetWidth(width);
+    SetPrecision(precision);
+}
+
+wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
 {
 {
-    size_t row, n;
+    wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer;
+    renderer->m_width = m_width;
+    renderer->m_precision = m_precision;
+    renderer->m_format = m_format;
 
 
-    size_t curNumRows = m_data.GetCount();
-    if ( !curNumRows )
+    return renderer;
+}
+
+wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
+
+    bool hasDouble;
+    double val;
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
     {
-        // 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;
+        val = table->GetValueAsDouble(row, col);
+        hasDouble = true;
+    }
+    else
+    {
+        text = table->GetValue(row, col);
+        hasDouble = text.ToDouble(&val);
     }
 
     }
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    if ( hasDouble )
     {
     {
-        for ( n = 0;  n < numCols;  n++ )
+        if ( !m_format )
         {
         {
-            m_data[row].Add( wxEmptyString );
+            if ( m_width == -1 )
+            {
+                if ( m_precision == -1 )
+                {
+                    // default width/precision
+                    m_format = _T("%f");
+                }
+                else
+                {
+                    m_format.Printf(_T("%%.%df"), m_precision);
+                }
+            }
+            else if ( m_precision == -1 )
+            {
+                // default precision
+                m_format.Printf(_T("%%%d.f"), m_width);
+            }
+            else
+            {
+                m_format.Printf(_T("%%%d.%df"), m_width, m_precision);
+            }
         }
         }
-    }
 
 
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_APPENDED,
-                                numCols );
+        text.Printf(m_format, val);
 
 
-        GetView()->ProcessTableMessage( msg );
     }
     }
+    //else: text already contains the string
 
 
-    return TRUE;
+    return text;
 }
 
 }
 
-bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
+void wxGridCellFloatRenderer::Draw(wxGrid& grid,
+                                   wxGridCellAttr& attr,
+                                   wxDC& dc,
+                                   const wxRect& rectCell,
+                                   int row, int col,
+                                   bool isSelected)
 {
 {
-    size_t row, n;
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
 
-    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;
-    }
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxALIGN_RIGHT;
 
 
-    if ( numCols > curNumCols - pos )
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
+
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
+
+wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
+                                            wxGridCellAttr& attr,
+                                            wxDC& dc,
+                                            int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
+
+void wxGridCellFloatRenderer::SetParameters(const wxString& params)
+{
+    if ( !params )
     {
     {
-        numCols = curNumCols - pos;
+        // reset to defaults
+        SetWidth(-1);
+        SetPrecision(-1);
     }
     }
-
-    for ( row = 0;  row < curNumRows;  row++ )
+    else
     {
     {
-        if ( numCols >= curNumCols )
+        wxString tmp = params.BeforeFirst(_T(','));
+        if ( !tmp.empty() )
         {
         {
-            m_data[row].Clear();
+            long width;
+            if ( tmp.ToLong(&width) )
+            {
+                SetWidth((int)width);
+            }
+            else
+            {
+                wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
+            }
         }
         }
-        else
+        tmp = params.AfterFirst(_T(','));
+        if ( !tmp.empty() )
         {
         {
-            for ( n = 0;  n < numCols;  n++ )
+            long precision;
+            if ( tmp.ToLong(&precision) )
+            {
+                SetPrecision((int)precision);
+            }
+            else
             {
             {
-                m_data[row].Remove( pos );
+                wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
             }
         }
     }
             }
         }
     }
-    UpdateAttrCols( pos, -((int)numCols) );
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_DELETED,
-                                pos,
-                                numCols );
+}
 
 
-        GetView()->ProcessTableMessage( msg );
-    }
 
 
-    return TRUE;
-}
+// ----------------------------------------------------------------------------
+// wxGridCellBoolRenderer
+// ----------------------------------------------------------------------------
 
 
-wxString wxGridStringTable::GetRowLabelValue( int row )
+wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
+
+// FIXME these checkbox size calculations are really ugly...
+
+// between checkmark and box
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
+
+wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
+                                           wxGridCellAttr& WXUNUSED(attr),
+                                           wxDC& WXUNUSED(dc),
+                                           int WXUNUSED(row),
+                                           int WXUNUSED(col))
 {
 {
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    // compute it only once (no locks for MT safeness in GUI thread...)
+    if ( !ms_sizeCheckMark.x )
     {
     {
-        // using default label
-        //
-        return wxGridTableBase::GetRowLabelValue( row );
-    }
-    else
-    {
-        return m_rowLabels[ row ];
+        // get checkbox size
+        wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);
+        wxSize size = checkbox->GetBestSize();
+        wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+
+        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+        checkSize -= size.y / 2;
+#endif
+
+        delete checkbox;
+
+        ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
     }
     }
+
+    return ms_sizeCheckMark;
 }
 
 }
 
-wxString wxGridStringTable::GetColLabelValue( int col )
+void wxGridCellBoolRenderer::Draw(wxGrid& grid,
+                                  wxGridCellAttr& attr,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int row, int col,
+                                  bool isSelected)
 {
 {
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
+
+    // draw a check mark in the centre (ignoring alignment - TODO)
+    wxSize size = GetBestSize(grid, attr, dc, row, col);
+
+    // don't draw outside the cell
+    wxCoord minSize = wxMin(rect.width, rect.height);
+    if ( size.x >= minSize || size.y >= minSize )
     {
     {
-        // using default label
-        //
-        return wxGridTableBase::GetColLabelValue( col );
+        // and even leave (at least) 1 pixel margin
+        size.x = size.y = minSize - 2;
     }
     }
-    else
+
+    // draw a border around checkmark
+    int vAlign, hAlign;
+    attr.GetAlignment(& hAlign, &vAlign);
+
+    wxRect rectBorder;
+    if (hAlign == wxALIGN_CENTRE)
     {
     {
-        return m_colLabels[ col ];
+        rectBorder.x = rect.x + rect.width/2 - size.x/2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
     }
     }
-}
-
-void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
-{
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    else if (hAlign == wxALIGN_LEFT)
     {
     {
-        int n = m_rowLabels.GetCount();
-        int i;
-        for ( i = n;  i <= row;  i++ )
-        {
-            m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
-        }
+        rectBorder.x = rect.x + 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
     }
     }
-
-    m_rowLabels[row] = value;
-}
-
-void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
-{
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    else if (hAlign == wxALIGN_RIGHT)
     {
     {
-        int n = m_colLabels.GetCount();
-        int i;
-        for ( i = n;  i <= col;  i++ )
-        {
-            m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
-        }
+        rectBorder.x = rect.x + rect.width - size.x - 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
     }
 
     }
 
-    m_colLabels[col] = value;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
+    bool value;
+    if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+        value = grid.GetTable()->GetValueAsBool(row, col);
+    else
+    {
+        wxString cellval( grid.GetTable()->GetValue(row, col) );
+        value = !( !cellval || (cellval == wxT("0")) );
+    }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
+    if ( value )
+    {
+        wxRect rectMark = rectBorder;
+#ifdef __WXMSW__
+        // MSW DrawCheckMark() is weird (and should probably be changed...)
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+        rectMark.x++;
+        rectMark.y++;
+#else // !MSW
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
+#endif // MSW/!MSW
 
 
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
-    EVT_PAINT( wxGridRowLabelWindow::OnPaint )
-    EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
-END_EVENT_TABLE()
+        dc.SetTextForeground(attr.GetTextColour());
+        dc.DrawCheckMark(rectMark);
+    }
 
 
-wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
-{
-    m_owner = parent;
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
+    dc.DrawRectangle(rectBorder);
 }
 
 }
 
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+// ----------------------------------------------------------------------------
+// wxGridCellAttr
+// ----------------------------------------------------------------------------
+
+void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
 {
 {
-    wxPaintDC dc(this);
+    m_nRef = 1;
 
 
-    // NO - don't do this because it will set both the x and y origin
-    // coords to match the parent scrolled window and we just want to
-    // set the y coord  - MB
-    //
-    // m_owner->PrepareDC( dc );
+    m_isReadOnly = Unset;
 
 
-    int x, y;
-    m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
-    dc.SetDeviceOrigin( 0, -y );
+    m_renderer = NULL;
+    m_editor = NULL;
 
 
-    m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawRowLabels( dc );
-}
+    m_attrkind = wxGridCellAttr::Cell;
 
 
+    m_sizeRows = m_sizeCols = 1;
+    m_overflow = UnsetOverflow;
 
 
-void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
-{
-    m_owner->ProcessRowLabelMouseEvent( event );
+    SetDefAttr(attrDefault);
 }
 
 }
 
-
-// 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 )
+wxGridCellAttr *wxGridCellAttr::Clone() const
 {
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
-}
+    wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr);
 
 
+    if ( HasTextColour() )
+        attr->SetTextColour(GetTextColour());
+    if ( HasBackgroundColour() )
+        attr->SetBackgroundColour(GetBackgroundColour());
+    if ( HasFont() )
+        attr->SetFont(GetFont());
+    if ( HasAlignment() )
+        attr->SetAlignment(m_hAlign, m_vAlign);
 
 
+    attr->SetSize( m_sizeRows, m_sizeCols );
 
 
-//////////////////////////////////////////////////////////////////////
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
+    }
+    if ( m_editor )
+    {
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
 
 
-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
-    EVT_PAINT( wxGridColLabelWindow::OnPaint )
-    EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
-END_EVENT_TABLE()
+    attr->SetKind( m_attrkind );
 
 
-wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
-                                            wxWindowID id,
-                                            const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
-{
-    m_owner = parent;
+    return attr;
 }
 
 }
 
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
 {
 {
-    wxPaintDC dc(this);
+    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 );
 
 
-    // NO - don't do this because it will set both the x and y origin
-    // coords to match the parent scrolled window and we just want to
-    // set the x coord  - MB
+    // Directly access member functions as GetRender/Editor don't just return
+    // m_renderer/m_editor
     //
     //
-    // m_owner->PrepareDC( dc );
-
-    int x, y;
-    m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
-    dc.SetDeviceOrigin( -x, 0 );
-
-    m_owner->CalcColLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawColLabels( dc );
-}
+    // Maybe add support for merge of Render and Editor?
+    if (!HasRenderer() && mergefrom->HasRenderer() )
+    {
+        m_renderer = mergefrom->m_renderer;
+        m_renderer->IncRef();
+    }
+    if ( !HasEditor() && mergefrom->HasEditor() )
+    {
+        m_editor =  mergefrom->m_editor;
+        m_editor->IncRef();
+    }
+    if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
+        SetReadOnly(mergefrom->IsReadOnly());
 
 
+    if (!HasOverflowMode()  && mergefrom->HasOverflowMode() )
+        SetOverflow(mergefrom->GetOverflow());
 
 
-void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
-{
-    m_owner->ProcessColLabelMouseEvent( event );
+    SetDefAttr(mergefrom->m_defGridAttr);
 }
 
 }
 
-
-// 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 wxGridCellAttr::SetSize(int num_rows, int num_cols)
 {
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
-}
-
-
+    // The size of a cell is normally 1,1
 
 
-//////////////////////////////////////////////////////////////////////
+    // If this cell is larger (2,2) then this is the top left cell
+    // the other cells that will be covered (lower right cells) must be
+    // set to negative or zero values such that
+    // row + num_rows of the covered cell points to the larger cell (this cell)
+    // same goes for the col + num_cols.
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
+    // Size of 0,0 is NOT valid, neither is <=0 and any positive value
 
 
-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
-    EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
-    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
-    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
-END_EVENT_TABLE()
+    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"));
 
 
-wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
-                                                  wxWindowID id,
-                                                  const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
-{
-    m_owner = parent;
+    m_sizeRows = num_rows;
+    m_sizeCols = num_cols;
 }
 
 }
 
-void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+const wxColour& wxGridCellAttr::GetTextColour() const
 {
 {
-    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 );
+    if (HasTextColour())
+    {
+        return m_colText;
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+    {
+        return m_defGridAttr->GetTextColour();
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
+    }
 }
 
 
 }
 
 
-void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
+const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
 {
-    m_owner->ProcessCornerLabelMouseEvent( event );
+    if (HasBackgroundColour())
+        return m_colBack;
+    else if (m_defGridAttr && m_defGridAttr != this)
+        return m_defGridAttr->GetBackgroundColour();
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
+    }
 }
 
 
 }
 
 
-// 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 )
+const wxFont& wxGridCellAttr::GetFont() const
 {
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if (HasFont())
+        return m_font;
+    else if (m_defGridAttr && m_defGridAttr != this)
+        return m_defGridAttr->GetFont();
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullFont;
+    }
 }
 
 
 }
 
 
-
-//////////////////////////////////////////////////////////////////////
-
-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
-
-BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
-    EVT_PAINT( wxGridWindow::OnPaint )
-    EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
-    EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
-    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" )
+void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 {
 {
-    m_owner = parent;
-    m_rowLabelWin = rowLblWin;
-    m_colLabelWin = colLblWin;
-    SetBackgroundColour( "WHITE" );
+    if (HasAlignment())
+    {
+        if ( hAlign ) *hAlign = m_hAlign;
+        if ( vAlign ) *vAlign = m_vAlign;
+    }
+    else if (m_defGridAttr && m_defGridAttr != this)
+        m_defGridAttr->GetAlignment(hAlign, vAlign);
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+    }
 }
 
 }
 
-
-wxGridWindow::~wxGridWindow()
+void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 {
 {
+    if ( num_rows ) *num_rows = m_sizeRows;
+    if ( num_cols ) *num_cols = m_sizeCols;
 }
 
 }
 
+// GetRenderer and GetEditor use a slightly different decision path about
+// which attribute to use.  If a non-default attr object has one then it is
+// used, otherwise the default editor or renderer is fetched from the grid and
+// used.  It should be the default for the data type of the cell.  If it is
+// NULL (because the table has a type that the grid does not have in its
+// registry,) then the grid's default editor or renderer is used.
 
 
-void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {
 {
-    wxPaintDC dc( this );
-    m_owner->PrepareDC( dc );
-    wxRegion reg = GetUpdateRegion();
-    m_owner->CalcCellsExposed( reg );
-    m_owner->DrawGridCellArea( dc );
-#if WXGRID_DRAW_LINES
-    m_owner->DrawAllGridLines( dc, reg );
-#endif
-}
+    wxGridCellRenderer *renderer;
+
+    if ( m_renderer && this != m_defGridAttr )
+    {
+        // use the cells renderer if it has one
+        renderer = m_renderer;
+        renderer->IncRef();
+    }
+    else // no non default cell renderer
+    {
+        // get default renderer for the data type
+        if ( grid )
+        {
+            // GetDefaultRendererForCell() will do IncRef() for us
+            renderer = grid->GetDefaultRendererForCell(row, col);
+        }
+        else
+        {
+            renderer = NULL;
+        }
+
+        if ( !renderer )
+        {
+            if (m_defGridAttr &&  this != m_defGridAttr )
+            {
+                // if we still don't have one then use the grid default
+                // (no need for IncRef() here neither)
+                renderer = m_defGridAttr->GetRenderer(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_renderer which we had decided not to use initially
+                renderer = m_renderer;
+                if ( renderer )
+                    renderer->IncRef();
+            }
+        }
+    }
 
 
+    // we're supposed to always find something
+    wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));
 
 
-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 );
+    return renderer;
 }
 
 }
 
+// same as above, except for s/renderer/editor/g
+wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
+{
+    wxGridCellEditor *editor;
 
 
-void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
+    if ( m_editor && this != m_defGridAttr )
+    {
+        // use the cells editor if it has one
+        editor = m_editor;
+        editor->IncRef();
+    }
+    else // no non default cell editor
+    {
+        // get default editor for the data type
+        if ( grid )
+        {
+            // GetDefaultEditorForCell() will do IncRef() for us
+            editor = grid->GetDefaultEditorForCell(row, col);
+        }
+        else
+        {
+            editor = NULL;
+        }
+
+        if ( !editor )
+        {
+            if ( m_defGridAttr && this != m_defGridAttr )
+            {
+                // if we still don't have one then use the grid default
+                // (no need for IncRef() here neither)
+                editor = m_defGridAttr->GetEditor(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_editor which we had decided not to use initially
+                editor = m_editor;
+                if ( editor )
+                    editor->IncRef();
+            }
+        }
+    }
+
+    // we're supposed to always find something
+    wxASSERT_MSG(editor, wxT("Missing default cell editor"));
+
+    return editor;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellAttrData
+// ----------------------------------------------------------------------------
+
+void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
 {
 {
-    m_owner->ProcessGridCellMouseEvent( event );
+    int n = FindIndex(row, col);
+    if ( n == wxNOT_FOUND )
+    {
+        // add the attribute
+        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+    }
+    else
+    {
+        // free the old attribute
+        m_attrs[(size_t)n].attr->DecRef();
+
+        if ( attr )
+        {
+            // change the attribute
+            m_attrs[(size_t)n].attr = attr;
+        }
+        else
+        {
+            // remove this attribute
+            m_attrs.RemoveAt((size_t)n);
+        }
+    }
 }
 
 }
 
+wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 
 
-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridWindow::OnKeyDown( wxKeyEvent& event )
+    int n = FindIndex(row, col);
+    if ( n != wxNOT_FOUND )
+    {
+        attr = m_attrs[(size_t)n].attr;
+        attr->IncRef();
+    }
+
+    return attr;
+}
+
+void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord row = coords.GetRow();
+        if ((size_t)row >= pos)
+        {
+            if (numRows > 0)
+            {
+                // If rows inserted, include row counter where necessary
+                coords.SetRow(row + numRows);
+            }
+            else if (numRows < 0)
+            {
+                // If rows deleted ...
+                if ((size_t)row >= pos - numRows)
+                {
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetRow(row + numRows);
+                }
+                else
+                {
+                    // ...or remove the attribute
+                    // No need to DecRef the attribute itself since this is
+                    // done be wxGridCellWithAttr's destructor!
+                    m_attrs.RemoveAt(n);
+                    n--; count--;
+                }
+            }
+        }
+    }
+}
+
+void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord col = coords.GetCol();
+        if ( (size_t)col >= pos )
+        {
+            if ( numCols > 0 )
+            {
+                // If rows inserted, include row counter where necessary
+                coords.SetCol(col + numCols);
+            }
+            else if (numCols < 0)
+            {
+                // If rows deleted ...
+                if ((size_t)col >= pos - numCols)
+                {
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetCol(col + numCols);
+                }
+                else
+                {
+                    // ...or remove the attribute
+                    // No need to DecRef the attribute itself since this is
+                    // done be wxGridCellWithAttr's destructor!
+                    m_attrs.RemoveAt(n);
+                    n--; count--;
+                }
+            }
+        }
+    }
+}
+
+int wxGridCellAttrData::FindIndex(int row, int col) const
 {
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        const wxGridCellCoords& coords = m_attrs[n].coords;
+        if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
+        {
+            return n;
+        }
+    }
+
+    return wxNOT_FOUND;
 }
 
 }
 
-void wxGridWindow::OnEraseBackground(wxEraseEvent&)
-{ }
+// ----------------------------------------------------------------------------
+// wxGridRowOrColAttrData
+// ----------------------------------------------------------------------------
 
 
+wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
+{
+    size_t count = m_attrs.Count();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_attrs[n]->DecRef();
+    }
+}
 
 
+wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 
 
+    int n = m_rowsOrCols.Index(rowOrCol);
+    if ( n != wxNOT_FOUND )
+    {
+        attr = m_attrs[(size_t)n];
+        attr->IncRef();
+    }
 
 
-//////////////////////////////////////////////////////////////////////
+    return attr;
+}
 
 
+void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
+{
+    int i = m_rowsOrCols.Index(rowOrCol);
+    if ( i == wxNOT_FOUND )
+    {
+        // add the attribute
+        m_rowsOrCols.Add(rowOrCol);
+        m_attrs.Add(attr);
+    }
+    else
+    {
+        size_t n = (size_t)i;
+        if ( attr )
+        {
+            // change the attribute
+            m_attrs[n]->DecRef();
+            m_attrs[n] = attr;
+        }
+        else
+        {
+            // remove this attribute
+            m_attrs[n]->DecRef();
+            m_rowsOrCols.RemoveAt(n);
+            m_attrs.RemoveAt(n);
+        }
+    }
+}
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
+void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        int & rowOrCol = m_rowsOrCols[n];
+        if ( (size_t)rowOrCol >= pos )
+        {
+            if ( numRowsOrCols > 0 )
+            {
+                // If rows inserted, include row counter where necessary
+                rowOrCol += numRowsOrCols;
+            }
+            else if ( numRowsOrCols < 0)
+            {
+                // If rows deleted, either decrement row counter (if row still exists)
+                if ((size_t)rowOrCol >= pos - numRowsOrCols)
+                    rowOrCol += numRowsOrCols;
+                else
+                {
+                    m_rowsOrCols.RemoveAt(n);
+                    m_attrs[n]->DecRef();
+                    m_attrs.RemoveAt(n);
+                    n--; count--;
+                }
+            }
+        }
+    }
+}
 
 
-BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
-    EVT_PAINT( wxGrid::OnPaint )
-    EVT_SIZE( wxGrid::OnSize )
-    EVT_KEY_DOWN( wxGrid::OnKeyDown )
-    EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
-END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// wxGridCellAttrProvider
+// ----------------------------------------------------------------------------
+
+wxGridCellAttrProvider::wxGridCellAttrProvider()
+{
+    m_data = (wxGridCellAttrProviderData *)NULL;
+}
+
+wxGridCellAttrProvider::~wxGridCellAttrProvider()
+{
+    delete m_data;
+}
+
+void wxGridCellAttrProvider::InitData()
+{
+    m_data = new wxGridCellAttrProviderData;
+}
+
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+                                                wxGridCellAttr::wxAttrKind  kind ) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    if ( m_data )
+    {
+        switch(kind)
+        {
+            case (wxGridCellAttr::Any):
+                //Get cached merge attributes.
+                // Currenlty not used as no cache implemented as not mutiable
+                // attr = m_data->m_mergeAttr.GetAttr(row, col);
+                if(!attr)
+                {
+                    //Basicaly implement old version.
+                    //Also check merge cache, so we don't have to re-merge every time..
+                    wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
+                    wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
+                    wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
+
+                    if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){
+                        // Two or more are non NULL
+                        attr = new wxGridCellAttr;
+                        attr->SetKind(wxGridCellAttr::Merged);
+
+                        //Order important..
+                        if(attrcell){
+                            attr->MergeWith(attrcell);
+                            attrcell->DecRef();
+                        }
+                        if(attrcol){
+                            attr->MergeWith(attrcol);
+                            attrcol->DecRef();
+                        }
+                        if(attrrow){
+                            attr->MergeWith(attrrow);
+                            attrrow->DecRef();
+                        }
+                        //store merge attr if cache implemented
+                        //attr->IncRef();
+                        //m_data->m_mergeAttr.SetAttr(attr, row, col);
+                    }
+                    else
+                    {
+                        // one or none is non null return it or null.
+                        if(attrrow) attr = attrrow;
+                        if(attrcol)
+                        {
+                            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;
+        }
+    }
+    return attr;
+}
+
+void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr,
+                                     int row, int col)
+{
+    if ( !m_data )
+        InitData();
+
+    m_data->m_cellAttrs.SetAttr(attr, row, col);
+}
+
+void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row)
+{
+    if ( !m_data )
+        InitData();
+
+    m_data->m_rowAttrs.SetAttr(attr, row);
+}
+
+void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col)
+{
+    if ( !m_data )
+        InitData();
+
+    m_data->m_colAttrs.SetAttr(attr, col);
+}
+
+void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows )
+{
+    if ( m_data )
+    {
+        m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
+
+        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
+    }
+}
+
+void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
+{
+    if ( m_data )
+    {
+        m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
+
+        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
+
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+    size_t count = m_typeinfo.Count();
+    for ( size_t i = 0; i < count; i++ )
+        delete m_typeinfo[i];
+}
+
+
+void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
+                                          wxGridCellRenderer* renderer,
+                                          wxGridCellEditor* editor)
+{
+    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+
+    // is it already registered?
+    int loc = FindRegisteredDataType(typeName);
+    if ( loc != wxNOT_FOUND )
+    {
+        delete m_typeinfo[loc];
+        m_typeinfo[loc] = info;
+    }
+    else
+    {
+        m_typeinfo.Add(info);
+    }
+}
+
+int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)
+{
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( typeName == m_typeinfo[i]->m_typeName )
+        {
+            return i;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+{
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_STRING )
+        {
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
+        } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+        if ( typeName == wxGRID_VALUE_BOOL )
+        {
+            RegisterDataType(wxGRID_VALUE_BOOL,
+                             new wxGridCellBoolRenderer,
+                             new wxGridCellBoolEditor);
+        } else
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_NUMBER )
+        {
+            RegisterDataType(wxGRID_VALUE_NUMBER,
+                             new wxGridCellNumberRenderer,
+                             new wxGridCellNumberEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_FLOAT )
+        {
+            RegisterDataType(wxGRID_VALUE_FLOAT,
+                             new wxGridCellFloatRenderer,
+                             new wxGridCellFloatEditor);
+        } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+        if ( typeName == wxGRID_VALUE_CHOICE )
+        {
+            RegisterDataType(wxGRID_VALUE_CHOICE,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellChoiceEditor);
+        } else
+#endif // wxUSE_COMBOBOX
+        {
+            return wxNOT_FOUND;
+        }
+
+        // we get here only if just added the entry for this type, so return
+        // the last index
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
+{
+    int index = FindDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // the first part of the typename is the "real" type, anything after ':'
+        // are the parameters for the renderer
+        index = FindDataType(typeName.BeforeFirst(_T(':')));
+        if ( index == wxNOT_FOUND )
+        {
+            return wxNOT_FOUND;
+        }
+
+        wxGridCellRenderer *renderer = GetRenderer(index);
+        wxGridCellRenderer *rendererOld = renderer;
+        renderer = renderer->Clone();
+        rendererOld->DecRef();
+
+        wxGridCellEditor *editor = GetEditor(index);
+        wxGridCellEditor *editorOld = editor;
+        editor = editor->Clone();
+        editorOld->DecRef();
+
+        // do it even if there are no parameters to reset them to defaults
+        wxString params = typeName.AfterFirst(_T(':'));
+        renderer->SetParameters(params);
+        editor->SetParameters(params);
+
+        // register the new typename
+        RegisterDataType(typeName, renderer, editor);
+
+        // we just registered it, it's the last one
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+{
+    wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+    if (renderer)
+        renderer->IncRef();
+    return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+    wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+    if (editor)
+        editor->IncRef();
+    return editor;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridTableBase
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
+
+
+wxGridTableBase::wxGridTableBase()
+{
+    m_view = (wxGrid *) NULL;
+    m_attrProvider = (wxGridCellAttrProvider *) NULL;
+}
+
+wxGridTableBase::~wxGridTableBase()
+{
+    delete m_attrProvider;
+}
+
+void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
+{
+    delete m_attrProvider;
+    m_attrProvider = attrProvider;
+}
+
+bool wxGridTableBase::CanHaveAttributes()
+{
+    if ( ! GetAttrProvider() )
+    {
+        // use the default attr provider by default
+        SetAttrProvider(new wxGridCellAttrProvider);
+    }
+    return true;
+}
+
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)
+{
+    if ( m_attrProvider )
+        return m_attrProvider->GetAttr(row, col, kind);
+    else
+        return (wxGridCellAttr *)NULL;
+}
+
+
+void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
+{
+    if ( m_attrProvider )
+    {
+        attr->SetKind(wxGridCellAttr::Cell);
+        m_attrProvider->SetAttr(attr, row, col);
+    }
+    else
+    {
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
+    }
+}
+
+void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
+{
+    if ( m_attrProvider )
+    {
+        attr->SetKind(wxGridCellAttr::Row);
+        m_attrProvider->SetRowAttr(attr, row);
+    }
+    else
+    {
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
+    }
+}
+
+void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
+{
+    if ( m_attrProvider )
+    {
+        attr->SetKind(wxGridCellAttr::Col);
+        m_attrProvider->SetColAttr(attr, col);
+    }
+    else
+    {
+        // as we take ownership of the pointer and don't store it, we must
+        // free it now
+        wxSafeDecRef(attr);
+    }
+}
+
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
+
+    return false;
+}
+
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
+
+    return false;
+}
+
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
+
+    return false;
+}
+
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
+
+    return false;
+}
+
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
+
+    return false;
+}
+
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
+
+    return false;
+}
+
+
+wxString wxGridTableBase::GetRowLabelValue( int row )
+{
+    wxString s;
+    s << row + 1; // RD: Starting the rows at zero confuses users, no matter
+                  //     how much it makes sense to us geeks.
+    return s;
+}
+
+wxString wxGridTableBase::GetColLabelValue( int col )
+{
+    // default col labels are:
+    //   cols 0 to 25   : A-Z
+    //   cols 26 to 675 : AA-ZZ
+    //   etc.
+
+    wxString s;
+    unsigned int i, n;
+    for ( n = 1; ; n++ )
+    {
+        s += (wxChar) (_T('A') + (wxChar)( col%26 ));
+        col = col/26 - 1;
+        if ( col < 0 ) break;
+    }
+
+    // reverse the string...
+    wxString s2;
+    for ( i = 0;  i < n;  i++ )
+    {
+        s2 += s[n-i-1];
+    }
+
+    return s2;
+}
+
+
+wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return wxGRID_VALUE_STRING;
+}
+
+bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
+                                     const wxString& typeName )
+{
+    return typeName == wxGRID_VALUE_STRING;
+}
+
+bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
+{
+    return CanGetValueAs(row, col, typeName);
+}
+
+long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return 0;
+}
+
+double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return 0.0;
+}
+
+bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return false;
+}
+
+void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
+                                      long WXUNUSED(value) )
+{
+}
+
+void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col),
+                                        double WXUNUSED(value) )
+{
+}
+
+void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
+                                      bool WXUNUSED(value) )
+{
+}
+
+
+void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName) )
+{
+    return NULL;
+}
+
+void  wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName),
+                                         void* WXUNUSED(value) )
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+//
+// Message class for the grid table to send requests and notifications
+// to the grid view
+//
+
+wxGridTableMessage::wxGridTableMessage()
+{
+    m_table = (wxGridTableBase *) NULL;
+    m_id = -1;
+    m_comInt1 = -1;
+    m_comInt2 = -1;
+}
+
+wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
+                                        int commandInt1, int commandInt2 )
+{
+    m_table = table;
+    m_id = id;
+    m_comInt1 = commandInt1;
+    m_comInt2 = commandInt2;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+//
+// A basic grid table for string data. An object of this class will
+// created by wxGrid if you don't specify an alternative table class.
+//
+
+WX_DEFINE_OBJARRAY(wxGridStringArray)
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
+
+wxGridStringTable::wxGridStringTable()
+        : wxGridTableBase()
+{
+}
+
+wxGridStringTable::wxGridStringTable( int numRows, int numCols )
+        : wxGridTableBase()
+{
+    m_data.Alloc( numRows );
+
+    wxArrayString sa;
+    sa.Alloc( numCols );
+    sa.Add( wxEmptyString, numCols );
+
+    m_data.Add( sa, numRows );
+}
+
+wxGridStringTable::~wxGridStringTable()
+{
+}
+
+int wxGridStringTable::GetNumberRows()
+{
+    return m_data.GetCount();
+}
+
+int wxGridStringTable::GetNumberCols()
+{
+    if ( m_data.GetCount() > 0 )
+        return m_data[0].GetCount();
+    else
+        return 0;
+}
+
+wxString wxGridStringTable::GetValue( int row, int col )
+{
+    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 wxEmptyString,
+                 _T("invalid row or column index in wxGridStringTable") );
+
+    return m_data[row][col];
+}
+
+void wxGridStringTable::SetValue( int row, int col, const wxString& value )
+{
+    wxCHECK_RET( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 _T("invalid row or column index in wxGridStringTable") );
+
+    m_data[row][col] = value;
+}
+
+bool wxGridStringTable::IsEmptyCell( int row, int col )
+{
+    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 true,
+                  _T("invalid row or column index in wxGridStringTable") );
+
+    return (m_data[row][col] == wxEmptyString);
+}
+
+void wxGridStringTable::Clear()
+{
+    int row, col;
+    int numRows, numCols;
+
+    numRows = m_data.GetCount();
+    if ( numRows > 0 )
+    {
+        numCols = m_data[0].GetCount();
+
+        for ( row = 0;  row < numRows;  row++ )
+        {
+            for ( col = 0;  col < numCols;  col++ )
+            {
+                m_data[row][col] = wxEmptyString;
+            }
+        }
+    }
+}
+
+
+bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
+{
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+
+    if ( pos >= curNumRows )
+    {
+        return AppendRows( numRows );
+    }
+
+    wxArrayString sa;
+    sa.Alloc( curNumCols );
+    sa.Add( wxEmptyString, curNumCols );
+    m_data.Insert( sa, pos, numRows );
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_ROWS_INSERTED,
+                                pos,
+                                numRows );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+bool wxGridStringTable::AppendRows( size_t numRows )
+{
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+
+    wxArrayString sa;
+    if ( curNumCols > 0 )
+    {
+        sa.Alloc( curNumCols );
+        sa.Add( wxEmptyString, curNumCols );
+    }
+
+    m_data.Add( sa, numRows );
+
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_ROWS_APPENDED,
+                                numRows );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
+{
+    size_t curNumRows = m_data.GetCount();
+
+    if ( pos >= curNumRows )
+    {
+        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 )
+    {
+        numRows = curNumRows - pos;
+    }
+
+    if ( numRows >= curNumRows )
+    {
+        m_data.Clear();
+    }
+    else
+    {
+        m_data.RemoveAt( pos, numRows );
+    }
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_ROWS_DELETED,
+                                pos,
+                                numRows );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
+{
+    size_t row, col;
+
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+
+    if ( pos >= curNumCols )
+    {
+        return AppendCols( numCols );
+    }
+
+    for ( row = 0;  row < curNumRows;  row++ )
+    {
+        for ( col = pos;  col < pos + numCols;  col++ )
+        {
+            m_data[row].Insert( wxEmptyString, col );
+        }
+    }
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_COLS_INSERTED,
+                                pos,
+                                numCols );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+bool wxGridStringTable::AppendCols( size_t numCols )
+{
+    size_t row;
+
+    size_t curNumRows = m_data.GetCount();
+#if 0
+    if ( !curNumRows )
+    {
+        // TODO: something better than this ?
+        //
+        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
+        return false;
+    }
+#endif
+
+    for ( row = 0;  row < curNumRows;  row++ )
+    {
+        m_data[row].Add( wxEmptyString, numCols );
+    }
+
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_COLS_APPENDED,
+                                numCols );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
+{
+    size_t row;
+
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+
+    if ( pos >= curNumCols )
+    {
+        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;
+    }
+
+    if ( numCols > curNumCols - pos )
+    {
+        numCols = curNumCols - pos;
+    }
+
+    for ( row = 0;  row < curNumRows;  row++ )
+    {
+        if ( numCols >= curNumCols )
+        {
+            m_data[row].Clear();
+        }
+        else
+        {
+            m_data[row].RemoveAt( pos, numCols );
+        }
+    }
+    if ( GetView() )
+    {
+        wxGridTableMessage msg( this,
+                                wxGRIDTABLE_NOTIFY_COLS_DELETED,
+                                pos,
+                                numCols );
+
+        GetView()->ProcessTableMessage( msg );
+    }
+
+    return true;
+}
+
+wxString wxGridStringTable::GetRowLabelValue( int row )
+{
+    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    {
+        // using default label
+        //
+        return wxGridTableBase::GetRowLabelValue( row );
+    }
+    else
+    {
+        return m_rowLabels[ row ];
+    }
+}
+
+wxString wxGridStringTable::GetColLabelValue( int col )
+{
+    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    {
+        // using default label
+        //
+        return wxGridTableBase::GetColLabelValue( col );
+    }
+    else
+    {
+        return m_colLabels[ col ];
+    }
+}
+
+void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
+{
+    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    {
+        int n = m_rowLabels.GetCount();
+        int i;
+        for ( i = n;  i <= row;  i++ )
+        {
+            m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
+        }
+    }
+
+    m_rowLabels[row] = value;
+}
+
+void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
+{
+    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    {
+        int n = m_colLabels.GetCount();
+        int i;
+        for ( i = n;  i <= col;  i++ )
+        {
+            m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
+        }
+    }
+
+    m_colLabels[col] = value;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
+    EVT_PAINT( wxGridRowLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
+    EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
+    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
+    EVT_CHAR ( wxGridRowLabelWindow::OnChar )
+END_EVENT_TABLE()
+
+wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
+                                            wxWindowID id,
+                                            const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+{
+    m_owner = parent;
+}
+
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+
+    // NO - don't do this because it will set both the x and y origin
+    // coords to match the parent scrolled window and we just want to
+    // set the y coord  - MB
+    //
+    // m_owner->PrepareDC( dc );
+
+    int x, y;
+    m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
+    dc.SetDeviceOrigin( 0, -y );
+
+    wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawRowLabels( dc , rows );
+}
+
+
+void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessRowLabelMouseEvent( event );
+}
+
+
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+    EVT_PAINT( wxGridColLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel)
+    EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
+    EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
+    EVT_CHAR ( wxGridColLabelWindow::OnChar )
+END_EVENT_TABLE()
+
+wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
+                                            wxWindowID id,
+                                            const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+{
+    m_owner = parent;
+}
+
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+
+    // NO - don't do this because it will set both the x and y origin
+    // coords to match the parent scrolled window and we just want to
+    // set the x coord  - MB
+    //
+    // m_owner->PrepareDC( dc );
+
+    int x, y;
+    m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
+    dc.SetDeviceOrigin( -x, 0 );
+
+    wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawColLabels( dc , cols );
+}
+
+
+void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessColLabelMouseEvent( event );
+}
+
+void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
+    EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
+    EVT_CHAR ( wxGridCornerLabelWindow::OnChar )
+END_EVENT_TABLE()
+
+wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
+                                                  wxWindowID id,
+                                                  const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+{
+    m_owner = parent;
+}
+
+void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+
+    int client_height = 0;
+    int client_width = 0;
+    GetClientSize( &client_width, &client_height );
+
+    // VZ: any reason for this ifdef? (FIXME)
+#ifdef __WXGTK__
+    wxRect rect;
+    rect.SetX( 1 );
+    rect.SetY( 1 );
+    rect.SetWidth( client_width - 2 );
+    rect.SetHeight( client_height - 2 );
+
+    wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
+#else // !__WXGTK__
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
+    dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
+    dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
+    dc.DrawLine( 0, 0, client_width, 0 );
+    dc.DrawLine( 0, 0, 0, client_height );
+
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 1, 1, client_width-1, 1 );
+    dc.DrawLine( 1, 1, 1, client_height-1 );
+#endif // __WXGTK__/!__WXGTK__
+}
+
+
+void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessCornerLabelMouseEvent( event );
+}
+
+
+void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
+    EVT_PAINT( wxGridWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
+    EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
+    EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridWindow::OnKeyUp )
+    EVT_CHAR ( wxGridWindow::OnChar )
+    EVT_SET_FOCUS( wxGridWindow::OnFocus )
+    EVT_KILL_FOCUS( wxGridWindow::OnFocus )
+    EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
+END_EVENT_TABLE()
+
+wxGridWindow::wxGridWindow( wxGrid *parent,
+                            wxGridRowLabelWindow *rowLblWin,
+                            wxGridColLabelWindow *colLblWin,
+                            wxWindowID id,
+                            const wxPoint &pos,
+                            const wxSize &size )
+            : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE,
+                        wxT("grid window") )
+
+{
+    m_owner = parent;
+    m_rowLabelWin = rowLblWin;
+    m_colLabelWin = colLblWin;
+}
+
+
+void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxPaintDC dc( this );
+    m_owner->PrepareDC( dc );
+    wxRegion reg = GetUpdateRegion();
+    wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc , DirtyCells);
+#if WXGRID_DRAW_LINES
+    m_owner->DrawAllGridLines( dc, reg );
+#endif
+    m_owner->DrawGridSpace( dc );
+    m_owner->DrawHighlight( dc , DirtyCells );
+}
+
+
+void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
+{
+    wxWindow::ScrollWindow( dx, dy, rect );
+    m_rowLabelWin->ScrollWindow( 0, dy, rect );
+    m_colLabelWin->ScrollWindow( dx, 0, rect );
+}
+
+
+void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
+        SetFocus();
+
+    m_owner->ProcessGridCellMouseEvent( event );
+}
+
+void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+// 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 )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+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)
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
+}
+
+//////////////////////////////////////////////////////////////////////
+
+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
+
+// Internal helper macros for simpler use of that function
+
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+                           const wxArrayInt& BorderArray, int nMax,
+                           bool clipToMinMax);
+
+#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
+                                          m_minAcceptableColWidth, \
+                                          m_colRights, m_numCols, true)
+#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
+                                          m_minAcceptableRowHeight, \
+                                          m_rowBottoms, m_numRows, true)
+/////////////////////////////////////////////////////////////////////
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGridStyle )
+
+wxBEGIN_FLAGS( wxGridStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxGridStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGrid)
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGrid)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+/*
+ TODO : Expose more information of a list's layout etc. via appropriate objects (\81à la NotebookPageInfo)
+*/
+#else
+IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
+#endif
+
+BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
+    EVT_PAINT( wxGrid::OnPaint )
+    EVT_SIZE( wxGrid::OnSize )
+    EVT_KEY_DOWN( wxGrid::OnKeyDown )
+    EVT_KEY_UP( wxGrid::OnKeyUp )
+    EVT_CHAR ( wxGrid::OnChar )
+    EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
+END_EVENT_TABLE()
+
+wxGrid::wxGrid()
+{
+    // in order to make sure that a size event is not
+    // trigerred in a unfinished state
+    m_cornerLabelWin = NULL ;
+    m_rowLabelWin = NULL ;
+    m_colLabelWin = NULL ;
+    m_gridWin = NULL ;
+}
+
+wxGrid::wxGrid( wxWindow *parent,
+                 wxWindowID id,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxString& name )
+  : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
+    m_colMinWidths(GRID_HASH_SIZE),
+    m_rowMinHeights(GRID_HASH_SIZE)
+{
+    Create();
+    SetBestFittingSize(size);
+}
+
+bool wxGrid::Create(wxWindow *parent, wxWindowID id,
+                          const wxPoint& pos, const wxSize& size,
+                          long style, const wxString& name)
+{
+    if (!wxScrolledWindow::Create(parent, id, pos, size,
+                                  style | wxWANTS_CHARS , name))
+        return false;
+
+    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+
+    Create() ;
+    SetBestFittingSize(size);
+
+    return true;
+}
+
+
+wxGrid::~wxGrid()
+{
+    // Must do this or ~wxScrollHelper will pop the wrong event handler
+    SetTargetWindow(this);
+    ClearAttrCache();
+    wxSafeDecRef(m_defaultCellAttr);
+
+#ifdef DEBUG_ATTR_CACHE
+    size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
+    wxPrintf(_T("wxGrid attribute cache statistics: "
+                "total: %u, hits: %u (%u%%)\n"),
+             total, gs_nAttrCacheHits,
+             total ? (gs_nAttrCacheHits*100) / total : 0);
+#endif
+
+    if (m_ownTable)
+        delete m_table;
+
+    delete m_typeRegistry;
+    delete m_selection;
+}
+
+
+//
+// ----- 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
+
+#if _USE_VISATTR
+#include "wx/listbox.h"
+#endif
+
+void wxGrid::Create()
+{
+    m_created = false;    // set to true by CreateGrid
+
+    m_table        = (wxGridTableBase *) NULL;
+    m_ownTable     = false;
+
+    m_cellEditCtrlEnabled = false;
+
+    m_defaultCellAttr = new wxGridCellAttr();
+
+    // Set default cell attributes
+    m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+    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_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
+    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+
+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
+    m_selection = NULL;
+
+    // subwindow components that make up the wxGrid
+    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+                                                    wxID_ANY,
+                                                    wxDefaultPosition,
+                                                    wxDefaultSize );
+
+    m_rowLabelWin = new wxGridRowLabelWindow( this,
+                                              wxID_ANY,
+                                              wxDefaultPosition,
+                                              wxDefaultSize );
+
+    m_colLabelWin = new wxGridColLabelWindow( this,
+                                              wxID_ANY,
+                                              wxDefaultPosition,
+                                              wxDefaultSize );
+
+    m_gridWin = new wxGridWindow( this,
+                                  m_rowLabelWin,
+                                  m_colLabelWin,
+                                  wxID_ANY,
+                                  wxDefaultPosition,
+                                  wxDefaultSize );
+
+    SetTargetWindow( m_gridWin );
+
+#if _USE_VISATTR
+    wxColour gfg = gva.colFg;
+    wxColour gbg = gva.colBg;
+    wxColour lfg = lva.colFg;
+    wxColour lbg = lva.colBg;
+#else
+    wxColour gfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    wxColour gbg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
+    wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
+#endif
+    m_cornerLabelWin->SetOwnForegroundColour(lfg);
+    m_cornerLabelWin->SetOwnBackgroundColour(lbg);
+    m_rowLabelWin->SetOwnForegroundColour(lfg);
+    m_rowLabelWin->SetOwnBackgroundColour(lbg);
+    m_colLabelWin->SetOwnForegroundColour(lfg);
+    m_colLabelWin->SetOwnBackgroundColour(lbg);
+
+    m_gridWin->SetOwnForegroundColour(gfg);
+    m_gridWin->SetOwnBackgroundColour(gbg);
+
+    Init();
+}
+
+
+bool wxGrid::CreateGrid( int numRows, int numCols,
+                         wxGrid::wxGridSelectionModes selmode )
+{
+    wxCHECK_MSG( !m_created,
+                 false,
+                 wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
+
+    m_numRows = numRows;
+    m_numCols = numCols;
+
+    m_table = new wxGridStringTable( m_numRows, m_numCols );
+    m_table->SetView( this );
+    m_ownTable = true;
+    m_selection = new wxGridSelection( this, selmode );
+
+    CalcDimensions();
+
+    m_created = true;
+
+    return m_created;
+}
+
+void wxGrid::SetSelectionMode(wxGrid::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, wxGrid::wxGridSelectCells,
+                 wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
+
+    return m_selection->GetSelectionMode();
+}
+
+bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
+                       wxGrid::wxGridSelectionModes selmode )
+{
+    if ( m_created )
+    {
+        // stop all processing
+        m_created = false;
+
+        if (m_ownTable)
+        {
+            wxGridTableBase *t=m_table;
+            m_table=0;
+            delete t;
+        }
+        delete m_selection;
+
+        m_table=0;
+        m_selection=0;
+        m_numRows=0;
+        m_numCols=0;
+    }
+    if (table)
+    {
+        m_numRows = table->GetNumberRows();
+        m_numCols = table->GetNumberCols();
+
+        m_table = table;
+        m_table->SetView( this );
+        if (takeOwnership)
+            m_ownTable = true;
+        m_selection = new wxGridSelection( this, selmode );
+
+        CalcDimensions();
+
+        m_created = true;
+    }
+
+    return m_created;
+}
+
+
+void wxGrid::Init()
+{
+    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") );
+
+    // 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( wxBOLD );
+
+    m_rowLabelHorizAlign = wxALIGN_CENTRE;
+    m_rowLabelVertAlign  = wxALIGN_CENTRE;
+
+    m_colLabelHorizAlign = wxALIGN_CENTRE;
+    m_colLabelVertAlign  = wxALIGN_CENTRE;
+    m_colLabelTextOrientation = wxHORIZONTAL;
+
+    m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
+    m_defaultRowHeight = m_gridWin->GetCharHeight();
+
+    m_minAcceptableColWidth  = WXGRID_MIN_COL_WIDTH;
+    m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT;
+
+#if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
+    m_defaultRowHeight += 8;
+#else
+    m_defaultRowHeight += 4;
+#endif
+
+    m_gridLineColour = wxColour( 192,192,192 );
+    m_gridLinesEnabled = true;
+    m_cellHighlightColour = *wxBLACK;
+    m_cellHighlightPenWidth = 2;
+    m_cellHighlightROPenWidth = 1;
+
+    m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
+    m_winCapture = (wxWindow *)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_waitForSlowClick = false;
+
+    m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
+    m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
+
+    m_currentCellCoords = wxGridNoCellCoords;
+
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;
+    m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+
+    m_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 but this will be done later...
+// ----------------------------------------------------------------------------
+
+void wxGrid::InitRowHeights()
+{
+    m_rowHeights.Empty();
+    m_rowBottoms.Empty();
+
+    m_rowHeights.Alloc( m_numRows );
+    m_rowBottoms.Alloc( m_numRows );
+
+    int rowBottom = 0;
+
+    m_rowHeights.Add( m_defaultRowHeight, m_numRows );
+
+    for ( int i = 0;  i < m_numRows;  i++ )
+    {
+        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 );
+    int colRight = 0;
+
+    m_colWidths.Add( m_defaultColWidth, m_numCols );
+
+    for ( int i = 0;  i < m_numCols;  i++ )
+    {
+        colRight += m_defaultColWidth;
+        m_colRights.Add( colRight );
+    }
+}
+
+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() ? col * m_defaultColWidth
+                                 : m_colRights[col] - m_colWidths[col];
+}
+
+int wxGrid::GetColRight(int col) const
+{
+    return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+                                 : m_colRights[col];
+}
+
+int wxGrid::GetRowHeight(int row) const
+{
+    return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row];
+}
+
+int wxGrid::GetRowTop(int row) const
+{
+    return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight
+                                  : m_rowBottoms[row] - m_rowHeights[row];
+}
+
+int wxGrid::GetRowBottom(int row) const
+{
+    return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight
+                                  : m_rowBottoms[row];
+}
+
+void wxGrid::CalcDimensions()
+{
+    int cw, ch;
+    GetClientSize( &cw, &ch );
+
+    if ( m_rowLabelWin->IsShown() )
+        cw -= m_rowLabelWidth;
+    if ( m_colLabelWin->IsShown() )
+        ch -= m_colLabelHeight;
+
+    // grid total size
+    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+    // 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();
+    }
+
+    // preserve (more or less) the previous position
+    int x, y;
+    GetViewStart( &x, &y );
+
+    // ensure the position is valid for the new scroll ranges
+    if ( x >= w )
+        x = wxMax( w - 1, 0 );
+    if ( y >= h )
+        y = wxMax( h - 1, 0 );
+
+    // do set scrollbar parameters
+    SetScrollbars( m_scrollLineX, m_scrollLineY,
+                   GetScrollX(w), GetScrollY(h), x, y,
+                   GetBatchCount() != 0);
+
+    // if our OnSize() hadn't been called (it would if we have scrollbars), we
+    // still must reposition the children
+    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 );
+
+    if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
+        m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
+
+    if (  m_colLabelWin && m_colLabelWin->IsShown() )
+        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+
+    if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
+        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+
+    if ( m_gridWin && m_gridWin->IsShown() )
+        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+}
+
+
+// this is called when the grid table sends a message to say that it
+// has been redimensioned
+//
+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();
+#if 0
+    // if we were using the default widths/heights so far, we must change them
+    // now
+    if ( m_colWidths.IsEmpty() )
+    {
+        InitColWidths();
+    }
+
+    if ( m_rowHeights.IsEmpty() )
+    {
+        InitRowHeights();
+    }
+#endif
+
+    switch ( msg.GetId() )
+    {
+        case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numRows = msg.GetCommandInt2();
+
+            m_numRows += numRows;
+
+            if ( !m_rowHeights.IsEmpty() )
+            {
+                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 );
+            }
+
+            if ( m_selection )
+                m_selection->UpdateRows( pos, numRows );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrRows( pos, numRows );
+
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+        {
+            int numRows = msg.GetCommandInt();
+            int oldNumRows = m_numRows;
+            m_numRows += numRows;
+
+            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 );
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numRows = msg.GetCommandInt2();
+            m_numRows -= numRows;
+
+            if ( !m_rowHeights.IsEmpty() )
+            {
+                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;
+                }
+            }
+            if ( !m_numRows )
+            {
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetRow() >= m_numRows )
+                    m_currentCellCoords.Set( 0, 0 );
+            }
+
+            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
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numCols = msg.GetCommandInt2();
+            m_numCols += numCols;
+
+            if ( !m_colWidths.IsEmpty() )
+            {
+                m_colWidths.Insert( m_defaultColWidth, pos, numCols );
+                m_colRights.Insert( 0, pos, numCols );
+
+                int right = 0;
+                if ( pos > 0 ) right = m_colRights[pos-1];
+
+                for ( i = pos;  i < m_numCols;  i++ )
+                {
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+
+            if ( m_selection )
+                m_selection->UpdateCols( pos, numCols );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrCols( pos, numCols );
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colLabelWin->Refresh();
+            }
+
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+        {
+            int numCols = msg.GetCommandInt();
+            int oldNumCols = m_numCols;
+            m_numCols += numCols;
+            if ( !m_colWidths.IsEmpty() )
+            {
+                m_colWidths.Add( m_defaultColWidth, numCols );
+                m_colRights.Add( 0, numCols );
+
+                int right = 0;
+                if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+
+                for ( i = oldNumCols;  i < m_numCols;  i++ )
+                {
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colLabelWin->Refresh();
+            }
+        }
+        result = true;
+        break;
+
+        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numCols = msg.GetCommandInt2();
+            m_numCols -= numCols;
+
+            if ( !m_colWidths.IsEmpty() )
+            {
+                m_colWidths.RemoveAt( pos, numCols );
+                m_colRights.RemoveAt( pos, numCols );
+
+                int w = 0;
+                for ( i = 0;  i < m_numCols;  i++ )
+                {
+                    w += m_colWidths[i];
+                    m_colRights[i] = w;
+                }
+            }
+            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_colLabelWin->Refresh();
+            }
+        }
+        result = true;
+        break;
+    }
+
+    if (result && !GetBatchCount() )
+        m_gridWin->Refresh();
+    return result;
+}
+
+
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+{
+    wxRegionIterator iter( reg );
+    wxRect r;
+
+    wxArrayInt  rowlabels;
+
+    int top, bottom;
+    while ( iter )
+    {
+        r = iter.GetRect();
+
+        // TODO: remove this when we can...
+        // There is a bug in wxMotif that gives garbage update
+        // rectangles if you jump-scroll a long way by clicking the
+        // scrollbar with middle button.  This is a work-around
+        //
+#if defined(__WXMOTIF__)
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+        if ( r.GetTop() > ch ) r.SetTop( 0 );
+        r.SetBottom( wxMin( r.GetBottom(), ch ) );
+#endif
+
+        // logical bounds of update region
+        //
+        int dummy;
+        CalcUnscrolledPosition( 0, r.GetTop(), &dummy, &top );
+        CalcUnscrolledPosition( 0, r.GetBottom(), &dummy, &bottom );
+
+        // find the row labels within these bounds
+        //
+        int row;
+        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        {
+            if ( GetRowBottom(row) < top )
+                continue;
+
+            if ( GetRowTop(row) > bottom )
+                break;
+
+            rowlabels.Add( row );
+        }
+
+        ++iter;
+    }
+
+    return rowlabels;
+}
+
+
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+{
+    wxRegionIterator iter( reg );
+    wxRect r;
+
+    wxArrayInt colLabels;
+
+    int left, right;
+    while ( iter )
+    {
+        r = iter.GetRect();
+
+        // TODO: remove this when we can...
+        // There is a bug in wxMotif that gives garbage update
+        // rectangles if you jump-scroll a long way by clicking the
+        // scrollbar with middle button.  This is a work-around
+        //
+#if defined(__WXMOTIF__)
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+        r.SetRight( wxMin( r.GetRight(), cw ) );
+#endif
+
+        // logical bounds of update region
+        //
+        int dummy;
+        CalcUnscrolledPosition( r.GetLeft(), 0, &left, &dummy );
+        CalcUnscrolledPosition( r.GetRight(), 0, &right, &dummy );
+
+        // find the cells within these bounds
+        //
+        int col;
+        for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+        {
+            if ( GetColRight(col) < left )
+                continue;
+
+            if ( GetColLeft(col) > right )
+                break;
+
+            colLabels.Add( col );
+        }
+
+        ++iter;
+    }
+    return colLabels;
+}
+
+
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
+{
+    wxRegionIterator iter( reg );
+    wxRect r;
+
+    wxGridCellCoordsArray  cellsExposed;
+
+    int left, top, right, bottom;
+    while ( iter )
+    {
+        r = iter.GetRect();
+
+        // TODO: remove this when we can...
+        // There is a bug in wxMotif that gives garbage update
+        // rectangles if you jump-scroll a long way by clicking the
+        // scrollbar with middle button.  This is a work-around
+        //
+#if defined(__WXMOTIF__)
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+        if ( r.GetTop() > ch ) r.SetTop( 0 );
+        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+        r.SetRight( wxMin( r.GetRight(), cw ) );
+        r.SetBottom( wxMin( r.GetBottom(), ch ) );
+#endif
+
+        // logical bounds of update region
+        //
+        CalcUnscrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
+        CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
+
+        // find the cells within these bounds
+        //
+        int row, col;
+        for ( row = internalYToRow(top);  row < m_numRows;  row++ )
+        {
+            if ( GetRowBottom(row) <= top )
+                continue;
+
+            if ( GetRowTop(row) > bottom )
+                break;
+
+            for ( col = internalXToCol(left);  col < m_numCols;  col++ )
+            {
+                if ( GetColRight(col) <= left )
+                    continue;
+
+                if ( GetColLeft(col) > right )
+                    break;
+
+                cellsExposed.Add( wxGridCellCoords( row, col ) );
+            }
+        }
+
+        ++iter;
+    }
+
+    return cellsExposed;
+}
+
+
+void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
+{
+    int x, y, row;
+    wxPoint pos( event.GetPosition() );
+    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+
+    if ( event.Dragging() )
+    {
+        if (!m_isDragging)
+        {
+            m_isDragging = true;
+            m_rowLabelWin->CaptureMouse();
+        }
+
+        if ( event.LeftIsDown() )
+        {
+            switch( m_cursorMode )
+            {
+                case 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,
+                               GetRowTop(m_dragRowOrCol) +
+                               GetRowMinimalHeight(m_dragRowOrCol) );
+                    dc.SetLogicalFunction(wxINVERT);
+                    if ( m_dragLastPos >= 0 )
+                    {
+                        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+                    }
+                    dc.DrawLine( left, y, left+cw, y );
+                    m_dragLastPos = y;
+                }
+                break;
+
+                case WXGRID_CURSOR_SELECT_ROW:
+                {
+                    if ( (row = YToRow( y )) >= 0 )
+                    {
+                        if ( m_selection )
+                        {
+                            m_selection->SelectRow( row,
+                                                    event.ControlDown(),
+                                                    event.ShiftDown(),
+                                                    event.AltDown(),
+                                                    event.MetaDown() );
+                        }
+                    }
+                }
+                break;
+
+                // default label to suppress warnings about "enumeration value
+                // 'xxx' not handled in switch
+                default:
+                    break;
+            }
+        }
+        return;
+    }
+
+    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
+    //
+    if ( event.Entering() || event.Leaving() )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
+    }
+
+
+    // ------------ Left button pressed
+    //
+    else if ( event.LeftDown() )
+    {
+        // don't send a label click event for a hit on the
+        // edge of the row label - this is probably the user
+        // wanting to resize the row
+        //
+        if ( YToEdgeOfRow(y) < 0 )
+        {
+            row = YToRow(y);
+            if ( row >= 0  &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
+            {
+                if ( !event.ShiftDown() && !event.ControlDown() )
+                    ClearSelection();
+                if ( m_selection )
+                {
+                    if ( event.ShiftDown() )
+                    {
+                        m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                                  0,
+                                                  row,
+                                                  GetNumberCols() - 1,
+                                                  event.ControlDown(),
+                                                  event.ShiftDown(),
+                                                  event.AltDown(),
+                                                  event.MetaDown() );
+                    }
+                    else
+                    {
+                        m_selection->SelectRow( row,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+                }
+
+                ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
+            }
+        }
+        else
+        {
+            // starting to drag-resize a row
+            //
+            if ( CanDragRowSize() )
+                ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
+        }
+    }
+
+
+    // ------------ Left double click
+    //
+    else if (event.LeftDClick() )
+    {
+        int row = YToEdgeOfRow(y);
+        if ( row < 0 )
+        {
+            row = YToRow(y);
+            if ( row >=0 &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+            {
+                // no default action at the moment
+            }
+        }
+        else
+        {
+            // adjust row height depending on label text
+            AutoSizeRowLabelSize( row );
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+            m_dragLastPos  = -1;
+        }
+    }
+
+
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+        {
+            DoEndDragResizeRow();
+
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+        }
+
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
+        m_dragLastPos = -1;
+    }
+
+
+    // ------------ Right button down
+    //
+    else if ( event.RightDown() )
+    {
+        row = YToRow(y);
+        if ( row >=0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() )
+    {
+        row = YToRow(y);
+        if ( row >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ No buttons down and mouse moving
+    //
+    else if ( event.Moving() )
+    {
+        m_dragRowOrCol = YToEdgeOfRow( y );
+        if ( m_dragRowOrCol >= 0 )
+        {
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            {
+                // don't capture the mouse yet
+                if ( CanDragRowSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false);
+            }
+        }
+        else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false);
+        }
+    }
+}
+
+
+void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
+{
+    int x, y, col;
+    wxPoint pos( event.GetPosition() );
+    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+
+    if ( event.Dragging() )
+    {
+        if (!m_isDragging)
+        {
+            m_isDragging = true;
+            m_colLabelWin->CaptureMouse();
+        }
+
+        if ( event.LeftIsDown() )
+        {
+            switch( m_cursorMode )
+            {
+                case WXGRID_CURSOR_RESIZE_COL:
+                {
+                    int cw, ch, dummy, top;
+                    m_gridWin->GetClientSize( &cw, &ch );
+                    CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+                    wxClientDC dc( m_gridWin );
+                    PrepareDC( dc );
+
+                    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;
+                }
+                break;
+
+                case WXGRID_CURSOR_SELECT_COL:
+                {
+                    if ( (col = XToCol( x )) >= 0 )
+                    {
+                        if ( m_selection )
+                        {
+                            m_selection->SelectCol( col,
+                                                    event.ControlDown(),
+                                                    event.ShiftDown(),
+                                                    event.AltDown(),
+                                                    event.MetaDown() );
+                        }
+                    }
+                }
+                break;
+
+                // default label to suppress warnings about "enumeration value
+                // 'xxx' not handled in switch
+                default:
+                    break;
+            }
+        }
+        return;
+    }
+
+    if ( m_isDragging && (event.Entering() || event.Leaving()) )
+        return;
+
+    if (m_isDragging)
+    {
+        if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
+        m_isDragging = false;
+    }
+
+    // ------------ Entering or leaving the window
+    //
+    if ( event.Entering() || event.Leaving() )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+    }
+
+
+    // ------------ 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 )
+        {
+            col = XToCol(x);
+            if ( col >= 0  &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
+            {
+                if ( !event.ShiftDown() && !event.ControlDown() )
+                    ClearSelection();
+                if ( m_selection )
+                {
+                    if ( event.ShiftDown() )
+                    {
+                        m_selection->SelectBlock( 0,
+                                                  m_currentCellCoords.GetCol(),
+                                                  GetNumberRows() - 1, col,
+                                                  event.ControlDown(),
+                                                  event.ShiftDown(),
+                                                  event.AltDown(),
+                                                  event.MetaDown() );
+                    }
+                    else
+                    {
+                        m_selection->SelectCol( col,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+                }
+
+                ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+            }
+        }
+        else
+        {
+            // starting to drag-resize a col
+            //
+            if ( CanDragColSize() )
+                ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
+        }
+    }
+
+
+    // ------------ Left double click
+    //
+    if ( event.LeftDClick() )
+    {
+        int col = XToEdgeOfCol(x);
+        if ( col < 0 )
+        {
+            col = XToCol(x);
+            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
+            AutoSizeColLabelSize( col );
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+            m_dragLastPos  = -1;
+        }
+    }
+
+
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        {
+            DoEndDragResizeCol();
+
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+        }
+
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+        m_dragLastPos  = -1;
+    }
+
+
+    // ------------ Right button down
+    //
+    else if ( event.RightDown() )
+    {
+        col = XToCol(x);
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() )
+    {
+        col = XToCol(x);
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ No buttons down and mouse moving
+    //
+    else if ( event.Moving() )
+    {
+        m_dragRowOrCol = XToEdgeOfCol( x );
+        if ( m_dragRowOrCol >= 0 )
+        {
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            {
+                // don't capture the cursor yet
+                if ( CanDragColSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, false);
+            }
+        }
+        else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, false);
+        }
+    }
+}
+
+
+void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
+{
+    if ( event.LeftDown() )
+    {
+        // indicate corner label by having both row and
+        // col args == -1
+        //
+        if ( !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) )
+        {
+            SelectAll();
+        }
+    }
+
+    else if ( event.LeftDClick() )
+    {
+        SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
+    }
+
+    else if ( event.RightDown() )
+    {
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+    else if ( event.RightDClick() )
+    {
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+}
+
+void wxGrid::ChangeCursorMode(CursorMode mode,
+                              wxWindow *win,
+                              bool captureMouse)
+{
+#ifdef __WXDEBUG__
+    static const wxChar *cursorModes[] =
+    {
+        _T("SELECT_CELL"),
+        _T("RESIZE_ROW"),
+        _T("RESIZE_COL"),
+        _T("SELECT_ROW"),
+        _T("SELECT_COL")
+    };
+
+    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__
+
+    if ( mode == m_cursorMode &&
+         win == m_winCapture &&
+         captureMouse == (m_winCapture != NULL))
+        return;
+
+    if ( !win )
+    {
+        // by default use the grid itself
+        win = m_gridWin;
+    }
+
+    if ( m_winCapture )
+    {
+        if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+        m_winCapture = (wxWindow *)NULL;
+    }
+
+    m_cursorMode = mode;
+
+    switch ( m_cursorMode )
+    {
+        case WXGRID_CURSOR_RESIZE_ROW:
+            win->SetCursor( m_rowResizeCursor );
+            break;
+
+        case WXGRID_CURSOR_RESIZE_COL:
+            win->SetCursor( m_colResizeCursor );
+            break;
+
+        default:
+            win->SetCursor( *wxSTANDARD_CURSOR );
+    }
+
+    // we need to capture mouse when resizing
+    bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ||
+                  m_cursorMode == WXGRID_CURSOR_RESIZE_COL;
+
+    if ( captureMouse && resize )
+    {
+        win->CaptureMouse();
+        m_winCapture = win;
+    }
+}
+
+void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
+{
+    int x, y;
+    wxPoint pos( event.GetPosition() );
+    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+
+    wxGridCellCoords coords;
+    XYToCell( x, y, coords );
+
+    int cell_rows, cell_cols;
+    bool isFirstDrag = !m_isDragging;
+    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() )
+    {
+        //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 ( IsCellEditControlShown() )
+            {
+                HideCellEditControl();
+                SaveEditControlValue();
+            }
+
+            // Have we captured the mouse yet?
+            if (! m_winCapture)
+            {
+                m_winCapture = m_gridWin;
+                m_winCapture->CaptureMouse();
+            }
+
+            if ( coords != wxGridNoCellCoords )
+            {
+                if ( event.ControlDown() )
+                {
+                    if ( m_selectingKeyboard == wxGridNoCellCoords)
+                        m_selectingKeyboard = coords;
+                    HighlightBlock ( m_selectingKeyboard, coords );
+                }
+                else if ( CanDragCell() )
+                {
+                    if ( isFirstDrag )
+                    {
+                        if ( m_selectingKeyboard == wxGridNoCellCoords)
+                            m_selectingKeyboard = coords;
+
+                        SendEvent( wxEVT_GRID_CELL_BEGIN_DRAG,
+                                   coords.GetRow(),
+                                   coords.GetCol(),
+                                   event );
+                    }
+                }
+                else
+                {
+                    if ( !IsSelection() )
+                    {
+                        HighlightBlock( coords, coords );
+                    }
+                    else
+                    {
+                        HighlightBlock( m_currentCellCoords, 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 - also on GTK.
+                }
+            }
+        }
+        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, GetRowTop(m_dragRowOrCol) +
+                          GetRowMinimalHeight(m_dragRowOrCol) );
+            dc.SetLogicalFunction(wxINVERT);
+            if ( m_dragLastPos >= 0 )
+            {
+                dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+            }
+            dc.DrawLine( left, y, left+cw, y );
+            m_dragLastPos = y;
+        }
+        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, 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;
+        }
+
+        return;
+    }
+
+    m_isDragging = false;
+    m_startDragPos = wxDefaultPosition;
+
+    // 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() )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+    }
+    else
+#endif // 0
+
+    // ------------ Left button pressed
+    //
+    if ( event.LeftDown() && coords != wxGridNoCellCoords )
+    {
+        if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+                       coords.GetRow(),
+                       coords.GetCol(),
+                       event ) )
+        {
+            if ( !event.ControlDown() )
+                ClearSelection();
+            if ( event.ShiftDown() )
+            {
+                if ( m_selection )
+                {
+                    m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                              m_currentCellCoords.GetCol(),
+                                              coords.GetRow(),
+                                              coords.GetCol(),
+                                              event.ControlDown(),
+                                              event.ShiftDown(),
+                                              event.AltDown(),
+                                              event.MetaDown() );
+                }
+            }
+            else if ( XToEdgeOfCol(x) < 0  &&
+                      YToEdgeOfRow(y) < 0 )
+            {
+                DisableCellEditControl();
+                MakeCellVisible( coords );
+
+                if ( event.ControlDown() )
+                {
+                    if ( m_selection )
+                    {
+                        m_selection->ToggleCellSelection( coords.GetRow(),
+                                                          coords.GetCol(),
+                                                          event.ControlDown(),
+                                                          event.ShiftDown(),
+                                                          event.AltDown(),
+                                                          event.MetaDown() );
+                    }
+                    m_selectingTopLeft = wxGridNoCellCoords;
+                    m_selectingBottomRight = wxGridNoCellCoords;
+                    m_selectingKeyboard = coords;
+                }
+                else
+                {
+                    m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
+                    SetCurrentCell( coords );
+                    if ( m_selection )
+                    {
+                        if ( m_selection->GetSelectionMode() !=
+                                wxGrid::wxGridSelectCells )
+                        {
+                            HighlightBlock( coords, coords );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    // ------------ Left double click
+    //
+    else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+
+        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
+        {
+            if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+                             coords.GetRow(),
+                             coords.GetCol(),
+                             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;
+            }
+        }
+
+    }
+
+
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+        {
+            if (m_winCapture)
+            {
+                if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                m_winCapture = NULL;
+            }
+
+            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+            {
+                ClearSelection();
+                EnableCellEditControl();
+
+                wxGridCellAttr* attr = GetCellAttr(coords);
+                wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+                editor->StartingClick();
+                editor->DecRef();
+                attr->DecRef();
+
+                m_waitForSlowClick = false;
+            }
+            else if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
+            {
+                if ( m_selection )
+                {
+                    m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                              m_selectingTopLeft.GetCol(),
+                                              m_selectingBottomRight.GetRow(),
+                                              m_selectingBottomRight.GetCol(),
+                                              event.ControlDown(),
+                                              event.ShiftDown(),
+                                              event.AltDown(),
+                                              event.MetaDown() );
+                }
+
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
+
+                // Show the edit control, if it has been hidden for
+                // drag-shrinking.
+                ShowCellEditControl();
+            }
+        }
+        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            DoEndDragResizeRow();
+
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+        }
+        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            DoEndDragResizeCol();
+
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+        }
+
+        m_dragLastPos = -1;
+    }
+
+
+    // ------------ Right button down
+    //
+    else if ( event.RightDown() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
+                         coords.GetRow(),
+                         coords.GetCol(),
+                         event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
+                         coords.GetRow(),
+                         coords.GetCol(),
+                         event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+    // ------------ Moving and no button action
+    //
+    else if ( event.Moving() && !event.IsButton() )
+    {
+        if( coords.GetRow() < 0 || coords.GetCol() < 0 )
+        {
+            // out of grid cell area
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            return;
+        }
+
+        int dragRow = YToEdgeOfRow( y );
+        int dragCol = XToEdgeOfCol( x );
+
+        // 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 ( dragRow >= 0 )
+        {
+            m_dragRowOrCol = dragRow;
+
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            {
+                if ( CanDragRowSize() && CanDragGridSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
+            }
+
+            if ( dragCol >= 0 )
+            {
+                m_dragRowOrCol = dragCol;
+            }
+
+            return;
+        }
+
+        if ( dragCol >= 0 )
+        {
+            m_dragRowOrCol = dragCol;
+
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            {
+                if ( CanDragColSize() && CanDragGridSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
+            }
+
+            return;
+        }
+
+        // Neither on a row or col edge
+        //
+        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        }
+    }
+}
+
+
+void wxGrid::DoEndDragResizeRow()
+{
+    if ( m_dragLastPos >= 0 )
+    {
+        // erase the last line and resize the row
+        //
+        int cw, ch, left, dummy;
+        m_gridWin->GetClientSize( &cw, &ch );
+        CalcUnscrolledPosition( 0, 0, &left, &dummy );
+
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        dc.SetLogicalFunction( wxINVERT );
+        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+        HideCellEditControl();
+        SaveEditControlValue();
+
+        int rowTop = GetRowTop(m_dragRowOrCol);
+        SetRowSize( m_dragRowOrCol,
+                    wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) );
+
+        if ( !GetBatchCount() )
+        {
+            // Only needed to get the correct rect.y:
+            wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
+            rect.x = 0;
+            CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+            rect.width = m_rowLabelWidth;
+            rect.height = ch - rect.y;
+            m_rowLabelWin->Refresh( true, &rect );
+            rect.width = cw;
+            // if there is a multicell block, paint all of it
+            if (m_table)
+            {
+                int i, cell_rows, cell_cols, subtract_rows = 0;
+                int leftCol = XToCol(left);
+                int rightCol = internalXToCol(left+cw);
+                if (leftCol >= 0)
+                {
+                    for (i=leftCol; i<rightCol; i++)
+                    {
+                        GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
+                        if (cell_rows < subtract_rows)
+                            subtract_rows = cell_rows;
+                    }
+                    rect.y = GetRowTop(m_dragRowOrCol + subtract_rows);
+                    CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+                    rect.height = ch - rect.y;
+                }
+            }
+            m_gridWin->Refresh( false, &rect );
+        }
+
+        ShowCellEditControl();
+    }
+}
+
+
+void wxGrid::DoEndDragResizeCol()
+{
+    if ( m_dragLastPos >= 0 )
+    {
+        // erase the last line and resize the col
+        //
+        int cw, ch, dummy, top;
+        m_gridWin->GetClientSize( &cw, &ch );
+        CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        dc.SetLogicalFunction( wxINVERT );
+        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+        HideCellEditControl();
+        SaveEditControlValue();
+
+        int colLeft = GetColLeft(m_dragRowOrCol);
+        SetColSize( m_dragRowOrCol,
+                    wxMax( m_dragLastPos - colLeft,
+                           GetColMinimalWidth(m_dragRowOrCol) ) );
+
+        if ( !GetBatchCount() )
+        {
+            // Only needed to get the correct rect.x:
+            wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
+            rect.y = 0;
+            CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+            rect.width = cw - rect.x;
+            rect.height = m_colLabelHeight;
+            m_colLabelWin->Refresh( true, &rect );
+            rect.height = ch;
+            // if there is a multicell block, paint all of it
+            if (m_table)
+            {
+                int i, cell_rows, cell_cols, subtract_cols = 0;
+                int topRow = YToRow(top);
+                int bottomRow = internalYToRow(top+cw);
+                if (topRow >= 0)
+                {
+                    for (i=topRow; i<bottomRow; i++)
+                    {
+                        GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
+                        if (cell_cols < subtract_cols)
+                            subtract_cols = cell_cols;
+                    }
+                    rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
+                    CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+                    rect.width = cw - rect.x;
+                }
+            }
+            m_gridWin->Refresh( false, &rect );
+        }
 
 
-wxGrid::wxGrid( wxWindow *parent,
-                 wxWindowID id,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxString& name )
-  : wxScrolledWindow( parent, id, pos, size, style, name )
-{
-    Create();
+        ShowCellEditControl();
+    }
 }
 
 
 }
 
 
-wxGrid::~wxGrid()
-{
-    ClearAttrCache();
-    m_defaultCellAttr->SafeDecRef();
-
-#ifdef DEBUG_ATTR_CACHE
-    size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
-    wxPrintf(_T("wxGrid attribute cache statistics: "
-                "total: %u, hits: %u (%u%%)\n"),
-             total, gs_nAttrCacheHits,
-             total ? (gs_nAttrCacheHits*100) / total : 0);
-#endif
-
-    if (m_ownTable)
-        delete m_table;
-}
-
 
 //
 
 //
-// ----- internal init and update functions
+// ------ interaction with data model
 //
 //
-
-void wxGrid::Create()
+bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
 {
 {
-    m_created = FALSE;    // set to TRUE by CreateGrid
-    m_displayed = TRUE; // FALSE;  // set to TRUE by OnPaint
-
-    m_table        = (wxGridTableBase *) NULL;
-    m_ownTable     = FALSE;
-
-    m_cellEditCtrlEnabled = FALSE;
-
-    m_defaultCellAttr = new wxGridCellAttr;
-    m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
-    // RD:  Should we fill the default attrs now or is waiting until Init() okay?
-
+    switch ( msg.GetId() )
+    {
+        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
+            return GetModelValues();
 
 
-    m_numRows = 0;
-    m_numCols = 0;
-    m_currentCellCoords = wxGridNoCellCoords;
+        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
+            return SetModelValues();
 
 
-    m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+        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 );
 
 
-    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-                                                    -1,
-                                                    wxDefaultPosition,
-                                                    wxDefaultSize );
+        default:
+            return false;
+    }
+}
 
 
-    m_rowLabelWin = new wxGridRowLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
 
 
-    m_colLabelWin = new wxGridColLabelWindow( this,
-                                              -1,
-                                              wxDefaultPosition,
-                                              wxDefaultSize );
 
 
-    m_gridWin = new wxGridWindow( this,
-                                  m_rowLabelWin,
-                                  m_colLabelWin,
-                                  -1,
-                                  wxDefaultPosition,
-                                  wxDefaultSize );
+// 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 )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
 
 
-    SetTargetWindow( m_gridWin );
+        m_table->Clear();
+        if ( !GetBatchCount() ) m_gridWin->Refresh();
+    }
 }
 
 
 }
 
 
-bool wxGrid::CreateGrid( int numRows, int numCols )
+bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
 {
-    if ( m_created )
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
     {
     {
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
+        wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
+        return false;
     }
     }
-    else
+
+    if ( m_table )
     {
     {
-        m_numRows = numRows;
-        m_numCols = numCols;
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
 
 
-        m_table = new wxGridStringTable( m_numRows, m_numCols );
-        m_table->SetView( this );
-        m_ownTable = TRUE;
-        Init();
-        m_created = TRUE;
-    }
+        bool done = m_table->InsertRows( pos, numRows );
+        return done;
 
 
-    return m_created;
+        // the table will have sent the results of the insert row
+        // operation to this view object as a grid table message
+    }
+    return false;
 }
 
 }
 
-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
+
+bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
 {
 {
-    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?
+    // TODO: something with updateLabels flag
 
 
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
-    }
-    else
+    if ( !m_created )
     {
     {
-        m_numRows = table->GetNumberRows();
-        m_numCols = table->GetNumberCols();
-
-        m_table = table;
-        m_table->SetView( this );
-        if (takeOwnership)
-            m_ownTable = TRUE;
-        Init();
-        m_created = TRUE;
+        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
+        return false;
     }
 
     }
 
-    return m_created;
+    if ( m_table )
+    {
+        bool done = m_table && m_table->AppendRows( numRows );
+        return done;
+        // the table will have sent the results of the append row
+        // operation to this view object as a grid table message
+    }
+    return false;
 }
 
 
 }
 
 
-void wxGrid::Init()
+bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
 {
 {
-    int i;
-
-    if ( m_numRows <= 0 )
-        m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
-
-    if ( m_numCols <= 0 )
-        m_numCols = WXGRID_DEFAULT_NUMBER_COLS;
-
-    m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+    // TODO: something with updateLabels flag
 
 
-    if ( m_rowLabelWin )
+    if ( !m_created )
     {
     {
-        m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
+        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
+        return false;
     }
     }
-    else
+
+    if ( m_table )
     {
     {
-        m_labelBackgroundColour = wxColour( _T("WHITE") );
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        bool done = m_table->DeleteRows( pos, numRows );
+        return done;
+        // the table will have sent the results of the delete row
+        // operation to this view object as a grid table message
     }
     }
+    return false;
+}
 
 
-    m_labelTextColour = wxColour( _T("BLACK") );
 
 
-    // init attr cache
-    m_attrCache.row = -1;
+bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
 
 
-    // TODO: something better than this ?
-    //
-    m_labelFont = this->GetFont();
-    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
+        return false;
+    }
 
 
-    m_rowLabelHorizAlign = wxLEFT;
-    m_rowLabelVertAlign  = wxCENTRE;
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
 
 
-    m_colLabelHorizAlign = wxCENTRE;
-    m_colLabelVertAlign  = wxTOP;
+        bool done = m_table->InsertCols( pos, numCols );
+        return done;
+        // the table will have sent the results of the insert col
+        // operation to this view object as a grid table message
+    }
+    return false;
+}
 
 
-    m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
-    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::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
 
 
-    m_rowHeights.Alloc( m_numRows );
-    m_rowBottoms.Alloc( m_numRows );
-    int rowBottom = 0;
-    for ( i = 0;  i < m_numRows;  i++ )
+    if ( !m_created )
     {
     {
-        m_rowHeights.Add( m_defaultRowHeight );
-        rowBottom += m_defaultRowHeight;
-        m_rowBottoms.Add( rowBottom );
+        wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
+        return false;
     }
 
     }
 
-    m_colWidths.Alloc( m_numCols );
-    m_colRights.Alloc( m_numCols );
-    int colRight = 0;
-    for ( i = 0;  i < m_numCols;  i++ )
+    if ( m_table )
     {
     {
-        m_colWidths.Add( m_defaultColWidth );
-        colRight += m_defaultColWidth;
-        m_colRights.Add( colRight );
+        bool done = m_table->AppendCols( numCols );
+        return done;
+        // the table will have sent the results of the append col
+        // operation to this view object as a grid table message
     }
     }
+    return false;
+}
 
 
-    // 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));
-
-
-    m_gridLineColour = wxColour( 128, 128, 255 );
-    m_gridLinesEnabled = TRUE;
 
 
-    m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
-    m_winCapture = (wxWindow *)NULL;
-    m_dragLastPos  = -1;
-    m_dragRowOrCol = -1;
-    m_isDragging = FALSE;
-    m_startDragPos = wxDefaultPosition;
+bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
 
 
-    m_waitForSlowClick = FALSE;
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
+        return false;
+    }
 
 
-    m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
-    m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
 
 
-    m_currentCellCoords = wxGridNoCellCoords;
+        bool done = m_table->DeleteCols( pos, numCols );
+        return done;
+        // the table will have sent the results of the delete col
+        // operation to this view object as a grid table message
+    }
+    return false;
+}
 
 
-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
-    m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
-    m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 
 
-    m_editable = TRUE;  // default for whole grid
 
 
-    m_inOnKeyDown = FALSE;
-    m_batchCount = 0;
+//
+// ----- event handlers
+//
 
 
+// Generate a grid event based on a mouse event and
+// return the result of ProcessEvent()
+//
+int wxGrid::SendEvent( const wxEventType type,
+                        int row, int col,
+                        wxMouseEvent& mouseEv )
+{
+   bool claimed;
+   bool vetoed;
+
+   if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
+   {
+       int rowOrCol = (row == -1 ? col : row);
+
+       wxGridSizeEvent gridEvt( GetId(),
+               type,
+               this,
+               rowOrCol,
+               mouseEv.GetX() + GetRowLabelSize(),
+               mouseEv.GetY() + GetColLabelSize(),
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else if ( type == wxEVT_GRID_RANGE_SELECT )
+   {
+       // Right now, it should _never_ end up here!
+       wxGridRangeSelectEvent gridEvt( GetId(),
+               type,
+               this,
+               m_selectingTopLeft,
+               m_selectingBottomRight,
+               true,
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else
+   {
+       wxGridEvent gridEvt( GetId(),
+               type,
+               this,
+               row, col,
+               mouseEv.GetX() + GetRowLabelSize(),
+               mouseEv.GetY() + GetColLabelSize(),
+               false,
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+       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;
 }
 
 
 }
 
 
-void wxGrid::CalcDimensions()
+// Generate a grid event of specified type and return the result
+// of ProcessEvent().
+//
+int wxGrid::SendEvent( const wxEventType type,
+                        int row, int col )
 {
 {
-    int cw, ch;
-    GetClientSize( &cw, &ch );
+   bool claimed;
+   bool vetoed;
 
 
-    if ( m_numRows > 0  &&  m_numCols > 0 )
+    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
     {
-        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 );
-    }
-}
-
-
-void wxGrid::CalcWindowSizes()
-{
-    int cw, ch;
-    GetClientSize( &cw, &ch );
+        int rowOrCol = (row == -1 ? col : row);
 
 
-    if ( m_cornerLabelWin->IsShown() )
-        m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
+        wxGridSizeEvent gridEvt( GetId(),
+                                 type,
+                                 this,
+                                 rowOrCol );
 
 
-    if ( m_colLabelWin->IsShown() )
-        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();
+    }
+    else
+    {
+        wxGridEvent gridEvt( GetId(),
+                             type,
+                             this,
+                             row, col );
 
 
-    if ( m_rowLabelWin->IsShown() )
-        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();
+     }
 
 
-    if ( m_gridWin->IsShown() )
-        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+    // A Veto'd event may not be `claimed' so test this first
+    if (vetoed) return -1;
+    return claimed ? 1 : 0;
 }
 
 
 }
 
 
-// this is called when the grid table sends a message to say that it
-// has been redimensioned
-//
-bool wxGrid::Redimension( wxGridTableMessage& msg )
+void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 {
-    int i;
+    wxPaintDC dc(this);  // needed to prevent zillions of paint events on MSW
+}
 
 
-    switch ( msg.GetId() )
+void wxGrid::Refresh(bool eraseb, const wxRect* rect)
+{
+    // Don't do anything if between Begin/EndBatch...
+    // EndBatch() will do all this on the last nested one anyway.
+    if (! GetBatchCount())
     {
     {
-        case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Insert( m_defaultRowHeight, pos );
-                m_rowBottoms.Insert( 0, pos );
-            }
-            m_numRows += 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;
-            }
-            CalcDimensions();
-        }
-        return TRUE;
+        // Refresh to get correct scrolled position:
+        wxScrolledWindow::Refresh(eraseb,rect);
 
 
-        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+        if (rect)
         {
         {
-            int numRows = msg.GetCommandInt();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Add( m_defaultRowHeight );
-                m_rowBottoms.Add( 0 );
-            }
+            int rect_x, rect_y, rectWidth, rectHeight;
+            int width_label, width_cell, height_label, height_cell;
+            int x, y;
 
 
-            int oldNumRows = m_numRows;
-            m_numRows += numRows;
+            //Copy rectangle can get scroll offsets..
+            rect_x = rect->GetX();
+            rect_y = rect->GetY();
+            rectWidth = rect->GetWidth();
+            rectHeight = rect->GetHeight();
+
+            width_label = m_rowLabelWidth - rect_x;
+            if (width_label > rectWidth) width_label = rectWidth;
 
 
-            int bottom = 0;
-            if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+            height_label = m_colLabelHeight - rect_y;
+            if (height_label > rectHeight) height_label = rectHeight;
 
 
-            for ( i = oldNumRows;  i < m_numRows;  i++ )
+            if (rect_x > m_rowLabelWidth)
             {
             {
-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                x = rect_x - m_rowLabelWidth;
+                width_cell = rectWidth;
             }
             }
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
+            else
             {
             {
-                m_rowHeights.Remove( pos );
-                m_rowBottoms.Remove( pos );
+                x = 0;
+                width_cell = rectWidth - (m_rowLabelWidth - rect_x);
             }
             }
-            m_numRows -= numRows;
 
 
-            if ( !m_numRows )
+            if (rect_y > m_colLabelHeight)
             {
             {
-                m_numCols = 0;
-                m_colWidths.Clear();
-                m_colRights.Clear();
-                m_currentCellCoords = wxGridNoCellCoords;
+                y = rect_y - m_colLabelHeight;
+                height_cell = rectHeight;
             }
             else
             {
             }
             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;
-                }
+                y = 0;
+                height_cell = rectHeight - (m_colLabelHeight - rect_y);
             }
 
             }
 
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
+            // Paint corner label part intersecting rect.
+            if ( width_label > 0 && height_label > 0 )
             {
             {
-                m_colWidths.Insert( m_defaultColWidth, pos );
-                m_colRights.Insert( 0, pos );
+                wxRect anotherrect(rect_x, rect_y, width_label, height_label);
+                m_cornerLabelWin->Refresh(eraseb, &anotherrect);
             }
             }
-            m_numCols += numCols;
 
 
-            int right = 0;
-            if ( pos > 0 ) right = m_colRights[pos-1];
-
-            for ( i = pos;  i < m_numCols;  i++ )
+            // Paint col labels part intersecting rect.
+            if ( width_cell > 0 && height_label > 0 )
             {
             {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                wxRect anotherrect(x, rect_y, width_cell, height_label);
+                m_colLabelWin->Refresh(eraseb, &anotherrect);
             }
             }
-            CalcDimensions();
-        }
-        return TRUE;
 
 
-        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
-        {
-            int numCols = msg.GetCommandInt();
-            for ( i = 0;  i < numCols;  i++ )
+            // Paint row labels part intersecting rect.
+            if ( width_label > 0 && height_cell > 0 )
             {
             {
-                m_colWidths.Add( m_defaultColWidth );
-                m_colRights.Add( 0 );
+                wxRect anotherrect(rect_x, y, width_label, height_cell);
+                m_rowLabelWin->Refresh(eraseb, &anotherrect);
             }
 
             }
 
-            int oldNumCols = m_numCols;
-            m_numCols += numCols;
-
-            int right = 0;
-            if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
-
-            for ( i = oldNumCols;  i < m_numCols;  i++ )
+            // Paint cell area part intersecting rect.
+            if ( width_cell > 0 && height_cell > 0 )
             {
             {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                wxRect anotherrect(x, y, width_cell, height_cell);
+                m_gridWin->Refresh(eraseb, &anotherrect);
             }
             }
-            CalcDimensions();
         }
         }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+        else
         {
         {
-            size_t pos = msg.GetCommandInt();
-            int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Remove( pos );
-                m_colRights.Remove( pos );
-            }
-            m_numCols -= numCols;
-
-            if ( !m_numCols )
-            {
-#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;
-            }
-            else
-            {
-                if ( m_currentCellCoords.GetCol() >= m_numCols )
-                    m_currentCellCoords.Set( 0, 0 );
-
-                int w = 0;
-                for ( i = 0;  i < m_numCols;  i++ )
-                {
-                    w += m_colWidths[i];
-                    m_colRights[i] = w;
-                }
-            }
-            CalcDimensions();
+            m_cornerLabelWin->Refresh(eraseb, NULL);
+            m_colLabelWin->Refresh(eraseb, NULL);
+            m_rowLabelWin->Refresh(eraseb, NULL);
+            m_gridWin->Refresh(eraseb, NULL);
         }
         }
-        return TRUE;
     }
     }
-
-    return FALSE;
 }
 
 }
 
-
-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+void wxGrid::OnSize( wxSizeEvent& event )
 {
 {
-    wxRegionIterator iter( reg );
-    wxRect r;
-
-    m_rowLabelsExposed.Empty();
-
-    int top, bottom;
-    while ( iter )
-    {
-        r = iter.GetRect();
-
-        // TODO: remove this when we can...
-        // There is a bug in wxMotif that gives garbage update
-        // rectangles if you jump-scroll a long way by clicking the
-        // scrollbar with middle button.  This is a work-around
-        //
-#if defined(__WXMOTIF__)
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetTop() > ch ) r.SetTop( 0 );
-        r.SetBottom( wxMin( r.GetBottom(), ch ) );
-#endif
-
-        // logical bounds of update region
-        //
-        int dummy;
-        CalcUnscrolledPosition( 0, r.GetTop(), &dummy, &top );
-        CalcUnscrolledPosition( 0, r.GetBottom(), &dummy, &bottom );
-
-        // find the row labels within these bounds
-        //
-        int row;
-        int rowTop;
-        for ( row = 0;  row < m_numRows;  row++ )
-        {
-            if ( m_rowBottoms[row] < top ) continue;
-
-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
-
-            m_rowLabelsExposed.Add( row );
-        }
+    // position the child windows
+    CalcWindowSizes();
 
 
-        iter++ ;
-    }
+    // don't call CalcDimensions() from here, the base class handles the size
+    // changes itself
+    event.Skip();
 }
 
 
 }
 
 
-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+void wxGrid::OnKeyDown( wxKeyEvent& event )
 {
 {
-    wxRegionIterator iter( reg );
-    wxRect r;
-
-    m_colLabelsExposed.Empty();
-
-    int left, right;
-    while ( iter )
+    if ( m_inOnKeyDown )
     {
     {
-        r = iter.GetRect();
-
-        // TODO: remove this when we can...
-        // There is a bug in wxMotif that gives garbage update
-        // rectangles if you jump-scroll a long way by clicking the
-        // scrollbar with middle button.  This is a work-around
-        //
-#if defined(__WXMOTIF__)
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
-        r.SetRight( wxMin( r.GetRight(), cw ) );
-#endif
-
-        // logical bounds of update region
-        //
-        int dummy;
-        CalcUnscrolledPosition( r.GetLeft(), 0, &left, &dummy );
-        CalcUnscrolledPosition( r.GetRight(), 0, &right, &dummy );
-
-        // find the cells within these bounds
+        // shouldn't be here - we are going round in circles...
         //
         //
-        int col;
-        int colLeft;
-        for ( col = 0;  col < m_numCols;  col++ )
-        {
-            if ( m_colRights[col] < left ) continue;
-
-            colLeft = m_colRights[col] - m_colWidths[col];
-            if ( colLeft > right ) break;
-
-            m_colLabelsExposed.Add( col );
-        }
-
-        iter++ ;
+        wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
     }
     }
-}
-
 
 
-void wxGrid::CalcCellsExposed( wxRegion& reg )
-{
-    wxRegionIterator iter( reg );
-    wxRect r;
+    m_inOnKeyDown = true;
 
 
-    m_cellsExposed.Empty();
-    m_rowsExposed.Empty();
-    m_colsExposed.Empty();
+    // propagate the event up and see if it gets processed
+    //
+    wxWindow *parent = GetParent();
+    wxKeyEvent keyEvt( event );
+    keyEvt.SetEventObject( parent );
 
 
-    int left, top, right, bottom;
-    while ( iter )
+    if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
     {
     {
-        r = iter.GetRect();
-
-        // TODO: remove this when we can...
-        // There is a bug in wxMotif that gives garbage update
-        // rectangles if you jump-scroll a long way by clicking the
-        // scrollbar with middle button.  This is a work-around
-        //
-#if defined(__WXMOTIF__)
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
-        if ( r.GetTop() > ch ) r.SetTop( 0 );
-        if ( r.GetLeft() > cw ) r.SetLeft( 0 );
-        r.SetRight( wxMin( r.GetRight(), cw ) );
-        r.SetBottom( wxMin( r.GetBottom(), ch ) );
-#endif
-
-        // logical bounds of update region
-        //
-        CalcUnscrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
-        CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
 
 
-        // find the cells within these bounds
+        // try local handlers
         //
         //
-        int row, col;
-        int colLeft, rowTop;
-        for ( row = 0;  row < m_numRows;  row++ )
+        switch ( event.GetKeyCode() )
         {
         {
-            if ( m_rowBottoms[row] <= top ) continue;
-
-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
-
-            m_rowsExposed.Add( row );
-
-            for ( col = 0;  col < m_numCols;  col++ )
-            {
-                if ( m_colRights[col] <= left ) continue;
-
-                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 ) );
-            }
-        }
-
-        iter++ ;
-    }
-}
-
+            case WXK_UP:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorUpBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorUp( event.ShiftDown() );
+                }
+                break;
 
 
-void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
-{
-    int x, y, row;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+            case WXK_DOWN:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorDownBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorDown( event.ShiftDown() );
+                }
+                break;
 
 
-    if ( event.Dragging() )
-    {
-        m_isDragging = TRUE;
+            case WXK_LEFT:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorLeftBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorLeft( event.ShiftDown() );
+                }
+                break;
 
 
-        if ( event.LeftIsDown() )
-        {
-            switch( m_cursorMode )
-            {
-                case WXGRID_CURSOR_RESIZE_ROW:
+            case WXK_RIGHT:
+                if ( event.ControlDown() )
                 {
                 {
-                    int cw, ch, left, dummy;
-                    m_gridWin->GetClientSize( &cw, &ch );
-                    CalcUnscrolledPosition( 0, 0, &left, &dummy );
+                    MoveCursorRightBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorRight( event.ShiftDown() );
+                }
+                break;
 
 
-                    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 )
+            case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
+                if ( event.ControlDown() )
+                {
+                    event.Skip();  // to let the edit control have the return
+                }
+                else
+                {
+                    if ( GetGridCursorRow() < GetNumberRows()-1 )
                     {
                     {
-                        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+                        MoveCursorDown( event.ShiftDown() );
+                    }
+                    else
+                    {
+                        // at the bottom of a column
+                        DisableCellEditControl();
                     }
                     }
-                    dc.DrawLine( left, y, left+cw, y );
-                    m_dragLastPos = y;
                 }
                 break;
 
                 }
                 break;
 
-                case WXGRID_CURSOR_SELECT_ROW:
-                    if ( (row = YToRow( y )) >= 0  &&
-                         !IsInSelection( row, 0 ) )
+            case WXK_ESCAPE:
+                ClearSelection();
+                break;
+
+            case WXK_TAB:
+                if (event.ShiftDown())
+                {
+                    if ( GetGridCursorCol() > 0 )
+                    {
+                        MoveCursorLeft( false );
+                    }
+                    else
+                    {
+                        // at left of grid
+                        DisableCellEditControl();
+                    }
+                }
+                else
+                {
+                    if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {
                     {
-                        SelectRow( row, TRUE );
+                        MoveCursorRight( false );
                     }
                     }
+                    else
+                    {
+                        // at right of grid
+                        DisableCellEditControl();
+                    }
+                }
+                break;
 
 
-                // default label to suppress warnings about "enumeration value
-                // 'xxx' not handled in switch
-                default:
-                    break;
-            }
-        }
-        return;
-    }
+            case WXK_HOME:
+                if ( event.ControlDown() )
+                {
+                    MakeCellVisible( 0, 0 );
+                    SetCurrentCell( 0, 0 );
+                }
+                else
+                {
+                    event.Skip();
+                }
+                break;
 
 
-    m_isDragging = FALSE;
+            case WXK_END:
+                if ( event.ControlDown() )
+                {
+                    MakeCellVisible( m_numRows-1, m_numCols-1 );
+                    SetCurrentCell( m_numRows-1, m_numCols-1 );
+                }
+                else
+                {
+                    event.Skip();
+                }
+                break;
 
 
+            case WXK_PRIOR:
+                MovePageUp();
+                break;
 
 
-    // ------------ Entering or leaving the window
-    //
-    if ( event.Entering() || event.Leaving() )
-    {
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
-    }
+            case WXK_NEXT:
+                MovePageDown();
+                break;
 
 
+            case WXK_SPACE:
+                if ( event.ControlDown() )
+                {
+                    if ( m_selection )
+                    {
+                        m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+                                                          m_currentCellCoords.GetCol(),
+                                                          event.ControlDown(),
+                                                          event.ShiftDown(),
+                                                          event.AltDown(),
+                                                          event.MetaDown() );
+                    }
+                    break;
+                }
+                if ( !IsEditable() )
+                {
+                    MoveCursorRight( false );
+                    break;
+                }
+                // Otherwise fall through to default
 
 
-    // ------------ 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 = YToRow(y);
-            if ( row >= 0  &&
-                 !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
-            {
-                SelectRow( row, event.ShiftDown() );
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
-            }
-        }
-        else
-        {
-            // starting to drag-resize a row
-            //
-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
+            default:
+                event.Skip();
+                break;
         }
     }
 
         }
     }
 
+    m_inOnKeyDown = false;
+}
 
 
-    // ------------ Left double click
+void wxGrid::OnKeyUp( wxKeyEvent& event )
+{
+    // try local handlers
     //
     //
-    else if (event.LeftDClick() )
+    if ( event.GetKeyCode() == WXK_SHIFT )
     {
     {
-        if ( YToEdgeOfRow(y) < 0 )
+        if ( m_selectingTopLeft != wxGridNoCellCoords &&
+             m_selectingBottomRight != wxGridNoCellCoords )
         {
         {
-            row = YToRow(y);
-            SendEvent(  EVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+            if ( m_selection )
+            {
+                m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                          m_selectingTopLeft.GetCol(),
+                                          m_selectingBottomRight.GetRow(),
+                                          m_selectingBottomRight.GetCol(),
+                                          event.ControlDown(),
+                                          true,
+                                          event.AltDown(),
+                                          event.MetaDown() );
+            }
         }
         }
-    }
 
 
+        m_selectingTopLeft = wxGridNoCellCoords;
+        m_selectingBottomRight = wxGridNoCellCoords;
+        m_selectingKeyboard = wxGridNoCellCoords;
+    }
+}
 
 
-    // ------------ Left button released
-    //
-    else if ( event.LeftUp() )
+void wxGrid::OnChar( wxKeyEvent& event )
+{
+    // is it possible to edit the current cell at all?
+    if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
     {
     {
-        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+        // 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) )
         {
         {
-            DoEndDragResizeRow();
+            // ensure cell is visble
+            MakeCellVisible(row, col);
+            EnableCellEditControl();
 
 
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+            // 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();
         }
 
         }
 
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
-        m_dragLastPos = -1;
+        editor->DecRef();
+        attr->DecRef();
     }
     }
-
-
-    // ------------ Right button down
-    //
-    else if ( event.RightDown() )
+    else
     {
     {
-        row = YToRow(y);
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
-        {
-            // no default action at the moment
-        }
+        event.Skip();
     }
     }
+}
 
 
 
 
-    // ------------ Right double click
-    //
-    else if ( event.RightDClick() )
+void wxGrid::OnEraseBackground(wxEraseEvent&)
+{
+}
+
+void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
+{
+    if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
     {
     {
-        row = YToRow(y);
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
-        {
-            // no default action at the moment
-        }
+        // the event has been intercepted - do nothing
+        return;
     }
 
     }
 
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
 
 
-    // ------------ No buttons down and mouse moving
-    //
-    else if ( event.Moving() )
+    if ( m_currentCellCoords != wxGridNoCellCoords )
     {
     {
-        m_dragRowOrCol = YToEdgeOfRow( y );
-        if ( m_dragRowOrCol >= 0 )
+        DisableCellEditControl();
+
+        if ( IsVisible( m_currentCellCoords, false ) )
         {
         {
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            wxRect r;
+            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            if ( !m_gridLinesEnabled )
             {
             {
-                // don't capture the mouse yet
-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+                r.x--;
+                r.y--;
+                r.width++;
+                r.height++;
             }
             }
-        }
-        else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-        {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE);
+
+            wxGridCellCoordsArray cells = CalcCellsExposed( r );
+
+            // Otherwise refresh redraws the highlight!
+            m_currentCellCoords = coords;
+
+            DrawGridCellArea(dc,cells);
+            DrawAllGridLines( dc, r );
         }
     }
         }
     }
+
+    m_currentCellCoords = coords;
+
+    wxGridCellAttr* attr = GetCellAttr(coords);
+    DrawCellHighlight(dc, attr);
+    attr->DecRef();
 }
 
 
 }
 
 
-void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 {
 {
-    int x, y, col;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+    int temp;
+    wxGridCellCoords updateTopLeft, updateBottomRight;
 
 
-    if ( event.Dragging() )
+    if ( m_selection )
     {
     {
-        m_isDragging = TRUE;
-
-        if ( event.LeftIsDown() )
+        if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
         {
         {
-            switch( m_cursorMode )
-            {
-                case WXGRID_CURSOR_RESIZE_COL:
-                {
-                    int cw, ch, dummy, top;
-                    m_gridWin->GetClientSize( &cw, &ch );
-                    CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
-                    wxClientDC dc( m_gridWin );
-                    PrepareDC( dc );
-                    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;
-                }
-                break;
-
-                case WXGRID_CURSOR_SELECT_COL:
-                    if ( (col = XToCol( x )) >= 0  &&
-                         !IsInSelection( 0, col ) )
-                    {
-                        SelectCol( col, TRUE );
-                    }
-
-                // default label to suppress warnings about "enumeration value
-                // 'xxx' not handled in switch
-                default:
-                    break;
-            }
+            leftCol = 0;
+            rightCol = GetNumberCols() - 1;
         }
         }
-        return;
+        else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+        {
+            topRow = 0;
+            bottomRow = GetNumberRows() - 1;
+        }
+    }
+
+    if ( topRow > bottomRow )
+    {
+        temp = topRow;
+        topRow = bottomRow;
+        bottomRow = temp;
     }
 
     }
 
-    m_isDragging = FALSE;
+    if ( leftCol > rightCol )
+    {
+        temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;
+    }
 
 
+    updateTopLeft = wxGridCellCoords( topRow, leftCol );
+    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
 
 
-    // ------------ Entering or leaving the window
-    //
-    if ( event.Entering() || event.Leaving() )
+    // First the case that we selected a completely new area
+    if ( m_selectingTopLeft == wxGridNoCellCoords ||
+         m_selectingBottomRight == wxGridNoCellCoords )
     {
     {
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+        wxRect rect;
+        rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
+                                  wxGridCellCoords ( bottomRow, rightCol ) );
+        m_gridWin->Refresh( false, &rect );
     }
     }
+    // Now handle changing an existing selection area.
+    else if ( m_selectingTopLeft != updateTopLeft ||
+              m_selectingBottomRight != updateBottomRight )
+    {
+        // 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_selectingTopLeft.GetCol();
+        wxCoord oldTop    = m_selectingTopLeft.GetRow();
+        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldBottom = m_selectingBottomRight.GetRow();
 
 
-    // ------------ 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 )
+        // Determine the outer/inner coordinates.
+        if (oldLeft > leftCol)
         {
         {
-            col = XToCol(x);
-            if ( col >= 0  &&
-                 !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
-            {
-                SelectCol( col, event.ShiftDown() );
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
-            }
+            temp = oldLeft;
+            oldLeft = leftCol;
+            leftCol = temp;
         }
         }
-        else
+        if (oldTop > topRow )
         {
         {
-            // starting to drag-resize a col
-            //
-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
+            temp = oldTop;
+            oldTop = topRow;
+            topRow = temp;
+        }
+        if (oldRight < rightCol )
+        {
+            temp = oldRight;
+            oldRight = rightCol;
+            rightCol = temp;
+        }
+        if (oldBottom < bottomRow)
+        {
+            temp = oldBottom;
+            oldBottom = bottomRow;
+            bottomRow = temp;
         }
         }
-    }
 
 
+        // Now, either the stuff marked old is the outer
+        // rectangle or we don't have a situation where one
+        // is contained in the other.
 
 
-    // ------------ Left double click
-    //
-    if ( event.LeftDClick() )
-    {
-        if ( XToEdgeOfCol(x) < 0 )
+        if ( oldLeft < leftCol )
         {
         {
-            col = XToCol(x);
-            SendEvent(  EVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
+            // 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 ( oldTop  < topRow )
+        {
+            // Refresh the newly selected or deselected
+            // area above the old or new selection.
+            need_refresh[1] = true;
+            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            leftCol ),
+                                         wxGridCellCoords ( topRow - 1,
+                                                            rightCol ) );
+        }
 
 
-    // ------------ Left button released
-    //
-    else if ( event.LeftUp() )
-    {
-        if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        if ( oldRight > rightCol )
         {
         {
-            DoEndDragResizeCol();
+            // 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 ) );
+        }
 
 
-            // Note: we are ending the event *after* doing
-            // default processing in this case
-            //
-            SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+        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 ) );
         }
 
         }
 
-        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
-        m_dragLastPos  = -1;
+        // 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_selectingTopLeft = updateTopLeft;
+    m_selectingBottomRight = updateBottomRight;
+}
 
 
+//
+// ------ functions to get/send data (see also public functions)
+//
 
 
-    // ------------ Right button down
-    //
-    else if ( event.RightDown() )
+bool wxGrid::GetModelValues()
+{
+    // Hide the editor, so it won't hide a changed value.
+    HideCellEditControl();
+
+    if ( m_table )
     {
     {
-        col = XToCol(x);
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
-        {
-            // no default action at the moment
-        }
+        // all we need to do is repaint the grid
+        //
+        m_gridWin->Refresh();
+        return true;
     }
 
     }
 
+    return false;
+}
 
 
-    // ------------ Right double click
-    //
-    else if ( event.RightDClick() )
-    {
-        col = XToCol(x);
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
-        {
-            // no default action at the moment
-        }
-    }
 
 
+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();
 
 
-    // ------------ No buttons down and mouse moving
-    //
-    else if ( event.Moving() )
+    if ( m_table )
     {
     {
-        m_dragRowOrCol = XToEdgeOfCol( x );
-        if ( m_dragRowOrCol >= 0 )
+        for ( row = 0;  row < m_numRows;  row++ )
         {
         {
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            for ( col = 0;  col < m_numCols;  col++ )
             {
             {
-                // don't capture the cursor yet
-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+                m_table->SetValue( row, col, GetCellValue(row, col) );
             }
         }
             }
         }
-        else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-        {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE);
-        }
+
+        return true;
     }
     }
+
+    return false;
 }
 
 
 }
 
 
-void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
+
+// Note - this function only draws cells that are in the list of
+// exposed cells (usually set from the update region by
+// CalcExposedCells)
+//
+void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
 {
 {
-    if ( event.LeftDown() )
+    if ( !m_numRows || !m_numCols ) return;
+
+    int i, numCells = cells.GetCount();
+    int row, col, cell_rows, cell_cols;
+    wxGridCellCoordsArray redrawCells;
+
+    for ( i = numCells-1; i >= 0;  i-- )
     {
     {
-        // indicate corner label by having both row and
-        // col args == -1
-        //
-        if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) )
+        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 )
         {
         {
-            SelectAll();
+            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 );
+            }
+            continue; // don't bother drawing this cell
         }
         }
-    }
-
-    else if ( event.LeftDClick() )
-    {
-        SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
-    }
 
 
-    else if ( event.RightDown() )
-    {
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
+        // If this cell is empty, find cell to left that might want to overflow
+        if (m_table && m_table->IsEmptyCell(row, col))
         {
         {
-            // no default action at the moment
+            for ( int l = 0; l < cell_rows; l++ )
+            {
+                // find a cell in this row to left alreay 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] );
     }
 
     }
 
-    else if ( event.RightDClick() )
+    numCells = redrawCells.GetCount();
+
+    for ( i = numCells - 1; i >= 0;  i-- )
     {
     {
-        if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
-        {
-            // no default action at the moment
-        }
+        DrawCell( dc, redrawCells[i] );
     }
 }
 
     }
 }
 
-void wxGrid::ChangeCursorMode(CursorMode mode,
-                              wxWindow *win,
-                              bool captureMouse)
+
+void wxGrid::DrawGridSpace( wxDC& dc )
 {
 {
-#ifdef __WXDEBUG__
-    static const wxChar *cursorModes[] =
-    {
-        _T("SELECT_CELL"),
-        _T("RESIZE_ROW"),
-        _T("RESIZE_COL"),
-        _T("SELECT_ROW"),
-        _T("SELECT_COL")
-    };
+  int cw, ch;
+  m_gridWin->GetClientSize( &cw, &ch );
 
 
-    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__
+  int right, bottom;
+  CalcUnscrolledPosition( cw, ch, &right, &bottom );
 
 
-    if ( mode == m_cursorMode )
-        return;
+  int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
+  int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
 
 
-    if ( !win )
-    {
-        // by default use the grid itself
-        win = m_gridWin;
-    }
+  if ( right > rightCol || bottom > bottomRow )
+  {
+      int left, top;
+      CalcUnscrolledPosition( 0, 0, &left, &top );
 
 
-    if ( m_winCapture )
-    {
-        m_winCapture->ReleaseMouse();
-        m_winCapture = (wxWindow *)NULL;
-    }
+      dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+      dc.SetPen( *wxTRANSPARENT_PEN );
 
 
-    m_cursorMode = mode;
+      if ( right > rightCol )
+      {
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+      }
 
 
-    switch ( m_cursorMode )
-    {
-        case WXGRID_CURSOR_RESIZE_ROW:
-            win->SetCursor( m_rowResizeCursor );
-            break;
+      if ( bottom > bottomRow )
+      {
+          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+      }
+  }
+}
 
 
-        case WXGRID_CURSOR_RESIZE_COL:
-            win->SetCursor( m_colResizeCursor );
-            break;
 
 
-        default:
-            win->SetCursor( *wxSTANDARD_CURSOR );
-    }
+void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
+{
+    int row = coords.GetRow();
+    int col = coords.GetCol();
+
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        return;
+
+    // we draw the cell border ourselves
+#if !WXGRID_DRAW_LINES
+    if ( m_gridLinesEnabled )
+        DrawCellBorder( dc, coords );
+#endif
+
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+
+    bool isCurrent = coords == m_currentCellCoords;
 
 
-    // we need to capture mouse when resizing
-    bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ||
-                  m_cursorMode == WXGRID_CURSOR_RESIZE_COL;
+    wxRect rect = CellToRect( row, col );
 
 
-    if ( captureMouse && resize )
+    // 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() )
     {
     {
-        win->CaptureMouse();
-        m_winCapture = win;
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->PaintBackground(rect, attr);
+        editor->DecRef();
+    }
+    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::ProcessGridCellMouseEvent( wxMouseEvent& event )
+void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 {
 {
-    int x, y;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+    int row = m_currentCellCoords.GetRow();
+    int col = m_currentCellCoords.GetCol();
 
 
-    wxGridCellCoords coords;
-    XYToCell( x, y, coords );
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        return;
 
 
-    if ( event.Dragging() )
+    wxRect rect = CellToRect(row, col);
+
+    // 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
+
+    int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth;
+
+    if (penWidth > 0)
     {
     {
-        //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
+        // The center of th drawn line is where the position/width/height of
+        // the rectangle is actually at, (on wxMSW atr least,) so we will
+        // reduce the size of the rectangle to compensate for the thickness of
+        // the line.  If this is too strange on non wxMSW platforms then
+        // please #ifdef this appropriately.
+        rect.x += penWidth/2;
+        rect.y += penWidth/2;
+        rect.width -= penWidth-1;
+        rect.height -= penWidth-1;
 
 
-        // 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();
+        // Now draw the rectangle
+        // use the cellHighlightColour if the cell is inside a selection, this
+        // will ensure the cell is always visible.
+        dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(rect);
+    }
 
 
-            // Have we captured the mouse yet?
-            if (! m_winCapture) {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
-            }
+#if 0
+        // VZ: my experiments with 3d borders...
 
 
-            if ( coords != wxGridNoCellCoords )
-            {
-                if ( !IsSelection() )
-                {
-                    SelectBlock( coords, coords );
-                }
-                else
-                {
-                    SelectBlock( m_currentCellCoords, coords );
-                }
+        // how to properly set colours for arbitrary bg?
+        wxCoord x1 = rect.x,
+                y1 = rect.y,
+                x2 = rect.x + rect.width -1,
+                y2 = rect.y + rect.height -1;
 
 
-                if (! IsVisible(coords)) {
-                    MakeCellVisible(coords);
-                    // TODO: need to introduce a delay or something here.  The
-                    // scrolling is way to fast, at least on MSW.
-                }
-            }
-        }
-        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
-        {
-            int cw, ch, left, dummy;
-            m_gridWin->GetClientSize( &cw, &ch );
-            CalcUnscrolledPosition( 0, 0, &left, &dummy );
+        dc.SetPen(*wxWHITE_PEN);
+        dc.DrawLine(x1, y1, x2, y1);
+        dc.DrawLine(x1, y1, x1, y2);
 
 
-            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 );
+        dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
+        dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
 
 
-            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;
-        }
+        dc.SetPen(*wxBLACK_PEN);
+        dc.DrawLine(x1, y2, x2, y2);
+        dc.DrawLine(x2, y1, x2, y2+1);
+#endif // 0
+}
 
 
+
+void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
+{
+    int row = coords.GetRow();
+    int col = coords.GetCol();
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
         return;
-    }
 
 
-    m_isDragging = FALSE;
-    m_startDragPos = wxDefaultPosition;
+    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+
+    wxRect rect = CellToRect( row, col );
+
+    // right hand border
+    //
+    dc.DrawLine( rect.x + rect.width, rect.y,
+                 rect.x + rect.width, rect.y + rect.height + 1 );
 
 
+    // bottom border
+    //
+    dc.DrawLine( rect.x,              rect.y + rect.height,
+                 rect.x + rect.width, rect.y + rect.height);
+}
 
 
-    if ( coords != wxGridNoCellCoords )
+void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)
+{
+    // This if block was previously in wxGrid::OnPaint but that doesn't
+    // seem to get called under wxGTK - MB
+    //
+    if ( m_currentCellCoords == wxGridNoCellCoords  &&
+         m_numRows && m_numCols )
     {
     {
-        // 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() )
-        {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
-        }
-        else
-#endif // 0
+        m_currentCellCoords.Set(0, 0);
+    }
 
 
-        // ------------ Left button pressed
-        //
-        if ( event.LeftDown() )
+    if ( IsCellEditControlShown() )
+    {
+        // don't show highlight when the edit control is shown
+        return;
+    }
+
+    // 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 ( cells[n] == m_currentCellCoords )
         {
         {
-            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);
-                        // VZ: this is done by the call above, so why do it
-                        //     again? please remove this line if it's ok
-                        //ShowCellEditControl();
-                        m_waitForSlowClick = FALSE;
-                    }
-                    else {
-                        SetCurrentCell( coords );
-                        m_waitForSlowClick = TRUE;
-                    }
-                }
-            }
+            wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+            DrawCellHighlight(dc, attr);
+            attr->DecRef();
+
+            break;
         }
         }
+    }
+}
 
 
+// TODO: remove this ???
+// This is used to redraw all grid lines e.g. when the grid line colour
+// has been changed
+//
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
+{
+#if !WXGRID_DRAW_LINES
+    return;
+#endif
 
 
-        // ------------ 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 );
-            }
-        }
+    if ( !m_gridLinesEnabled ||
+         !m_numRows ||
+         !m_numCols ) return;
 
 
+    int top, bottom, left, right;
 
 
-        // ------------ 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 );
-                }
+#if 0  //#ifndef __WXGTK__
+    if (reg.IsEmpty())
+    {
+      int cw, ch;
+      m_gridWin->GetClientSize(&cw, &ch);
 
 
-                // 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();
+      // 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 );
+    }
+#else
+      int cw, ch;
+      m_gridWin->GetClientSize(&cw, &ch);
+      CalcUnscrolledPosition( 0, 0, &left, &top );
+      CalcUnscrolledPosition( cw, ch, &right, &bottom );
+#endif
 
 
-                // 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();
+    // avoid drawing grid lines past the last row and col
+    //
+    right = wxMin( right, GetColRight(m_numCols - 1) );
+    bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
 
-                // Note: we are ending the event *after* doing
-                // default processing in this case
-                //
-                SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
-            }
+    // no gridlines inside multicells, clip them out
+    int leftCol   = internalXToCol(left);
+    int topRow    = internalYToRow(top);
+    int rightCol  = internalXToCol(right);
+    int bottomRow = internalYToRow(bottom);
 
 
-            m_dragLastPos = -1;
-        }
+#ifndef __WXMAC__
+    // CS: I don't know why suddenly unscrolled coordinates are used for clipping
+    wxRegion clippedcells(0, 0, cw, ch);
 
 
+    int i, j, cell_rows, cell_cols;
+    wxRect rect;
 
 
-        // ------------ Right button down
-        //
-        else if ( event.RightDown() )
+    for (j=topRow; j<bottomRow; j++)
+    {
+        for (i=leftCol; i<rightCol; i++)
         {
         {
-            EnableCellEditControl( FALSE );
-            if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
+            GetCellSize( j, i, &cell_rows, &cell_cols );
+            if ((cell_rows > 1) || (cell_cols > 1))
             {
             {
-                // no default action at the moment
+                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);
             }
         }
             }
         }
+    }
+#else
+    wxRegion clippedcells( left , top, right - left, bottom - top);
 
 
+    int i, j, cell_rows, cell_cols;
+    wxRect rect;
 
 
-        // ------------ Right double click
-        //
-        else if ( event.RightDClick() )
+    for (j=topRow; j<bottomRow; j++)
+    {
+        for (i=leftCol; i<rightCol; i++)
         {
         {
-            EnableCellEditControl( FALSE );
-            if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
+            GetCellSize( j, i, &cell_rows, &cell_cols );
+            if ((cell_rows > 1) || (cell_cols > 1))
             {
             {
-                // no default action at the moment
+                rect = CellToRect(j,i);
+                clippedcells.Subtract(rect);
             }
             }
-        }
-
-        // ------------ Moving and no button action
-        //
-        else if ( event.Moving() && !event.IsButton() )
-        {
-            int dragRow = YToEdgeOfRow( y );
-            int dragCol = XToEdgeOfCol( x );
-
-            // Dragging on the corner of a cell to resize in both
-            // directions is not implemented yet...
-            //
-            if ( dragRow >= 0  &&  dragCol >= 0 )
+            else if ((cell_rows < 0) || (cell_cols < 0))
             {
             {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                return;
+                rect = CellToRect(j+cell_rows, i+cell_cols);
+                clippedcells.Subtract(rect);
             }
             }
+        }
+    }
+#endif
+    dc.SetClippingRegion( clippedcells );
 
 
-            if ( dragRow >= 0 )
-            {
-                m_dragRowOrCol = dragRow;
+    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
 
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
-                }
+    // horizontal grid lines
+    //
+    // already declared above - int i;
+    for ( i = internalYToRow(top); i < m_numRows; i++ )
+    {
+        int bot = GetRowBottom(i) - 1;
 
 
-                return;
-            }
+        if ( bot > bottom )
+        {
+            break;
+        }
 
 
-            if ( dragCol >= 0 )
-            {
-                m_dragRowOrCol = dragCol;
+        if ( bot >= top )
+        {
+            dc.DrawLine( left, bot, right, bot );
+        }
+    }
 
 
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
-                }
 
 
-                return;
-            }
+    // vertical grid lines
+    //
+    for ( i = internalXToCol(left); i < m_numCols; i++ )
+    {
+        int colRight = GetColRight(i) - 1;
+        if ( colRight > right )
+        {
+            break;
+        }
 
 
-            // Neither on a row or col edge
-            //
-            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            }
+        if ( colRight >= left )
+        {
+            dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
         }
     }
+    dc.DestroyClippingRegion();
 }
 
 
 }
 
 
-void wxGrid::DoEndDragResizeRow()
+void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
 {
 {
-    if ( m_dragLastPos >= 0 )
-    {
-        // erase the last line and resize the row
-        //
-        int cw, ch, left, dummy;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &left, &dummy );
-
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
-        HideCellEditControl();
-
-        int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
-        SetRowSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+    if ( !m_numRows ) return;
 
 
-        if ( !GetBatchCount() )
-        {
-            // 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 );
-        }
+    size_t i;
+    size_t numLabels = rows.GetCount();
 
 
-        ShowCellEditControl();
+    for ( i = 0;  i < numLabels;  i++ )
+    {
+        DrawRowLabel( dc, rows[i] );
     }
 }
 
 
     }
 }
 
 
-void wxGrid::DoEndDragResizeCol()
+void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
 {
-    if ( m_dragLastPos >= 0 )
-    {
-        // erase the last line and resize the col
-        //
-        int cw, ch, dummy, top;
-        m_gridWin->GetClientSize( &cw, &ch );
-        CalcUnscrolledPosition( 0, 0, &dummy, &top );
+    if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
+        return;
 
 
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        dc.SetLogicalFunction( wxINVERT );
-        dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
-        HideCellEditControl();
+    wxRect rect;
+#ifdef __WXGTK20__
+    rect.SetX( 1 );
+    rect.SetY( GetRowTop(row) + 1 );
+    rect.SetWidth( m_rowLabelWidth - 2 );
+    rect.SetHeight( GetRowHeight(row) - 2 );
 
 
-        int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
-        SetColSize( m_dragRowOrCol,
-                    wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+    CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
 
 
-        if ( !GetBatchCount() )
-        {
-            // Only needed to get the correct rect.x:
-            wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
-            rect.y = 0;
-            CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
-            rect.width = cw - rect.x;
-            rect.height = m_colLabelHeight;
-            m_colLabelWin->Refresh( TRUE, &rect );
-            rect.height = ch;
-            m_gridWin->Refresh( FALSE, &rect );
-        }
+    wxWindowDC *win_dc = (wxWindowDC*) &dc;
 
 
-        ShowCellEditControl();
-    }
-}
+    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
+    int rowTop = GetRowTop(row),
+        rowBottom = GetRowBottom(row) - 1;
 
 
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
+    dc.DrawLine( m_rowLabelWidth-1, rowTop,
+                 m_rowLabelWidth-1, rowBottom );
 
 
+    dc.DrawLine( 0, rowTop, 0, rowBottom );
 
 
-//
-// ------ interaction with data model
-//
-bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
-{
-    switch ( msg.GetId() )
-    {
-        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
-            return GetModelValues();
+    dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
 
 
-        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
-            return SetModelValues();
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 1, rowTop, 1, rowBottom );
+    dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
+#endif
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );
 
 
-        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 );
+    int hAlign, vAlign;
+    GetRowLabelAlignment( &hAlign, &vAlign );
 
 
-        default:
-            return FALSE;
-    }
+    rect.SetX( 2 );
+    rect.SetY( GetRowTop(row) + 2 );
+    rect.SetWidth( m_rowLabelWidth - 4 );
+    rect.SetHeight( GetRowHeight(row) - 4 );
+    DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 
 
 }
 
 
-
-// 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()
+void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
 {
-    if ( m_table )
+    if ( !m_numCols ) return;
+
+    size_t i;
+    size_t numLabels = cols.GetCount();
+
+    for ( i = 0;  i < numLabels;  i++ )
     {
     {
-        m_table->Clear();
-        SetEditControlValue();
-        if ( !GetBatchCount() ) m_gridWin->Refresh();
+        DrawColLabel( dc, cols[i] );
     }
 }
 
 
     }
 }
 
 
-bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::DrawColLabel( wxDC& dc, int col )
 {
 {
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            EnableCellEditControl(FALSE);
+    if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )
+        return;
 
 
-        bool ok = m_table->InsertRows( pos, numRows );
+    int colLeft = GetColLeft(col);
 
 
-        // the table will have sent the results of the insert row
-        // operation to this view object as a grid table message
-        //
-        if ( ok )
-        {
-            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 ?
-                //
-            }
+    wxRect rect;
+#ifdef __WXGTK20__
+    rect.SetX( colLeft + 1 );
+    rect.SetY( 1 );
+    rect.SetWidth( GetColWidth(col) - 2 );
+    rect.SetHeight( m_colLabelHeight - 2 );
 
 
-            if ( m_currentCellCoords == wxGridNoCellCoords )
-            {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
-            }
+    wxWindowDC *win_dc = (wxWindowDC*) &dc;
 
 
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-        }
+    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
+    int colRight = GetColRight(col) - 1;
 
 
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
-    }
-}
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
+    dc.DrawLine( colRight, 0,
+                 colRight, m_colLabelHeight-1 );
 
 
+    dc.DrawLine( colLeft, 0, colRight, 0 );
 
 
-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
+    dc.DrawLine( colLeft, m_colLabelHeight-1,
+                 colRight+1, m_colLabelHeight-1 );
 
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
-        return FALSE;
-    }
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 1, colRight, 1 );
+#endif
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );
 
 
-    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 );
-        }
+    int hAlign, vAlign, orient;
+    GetColLabelAlignment( &hAlign, &vAlign );
+    orient = GetColLabelTextOrientation();
 
 
-        // 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;
-    }
+    rect.SetX( colLeft + 2 );
+    rect.SetY( 2 );
+    rect.SetWidth( GetColWidth(col) - 4 );
+    rect.SetHeight( m_colLabelHeight - 4 );
+    DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign, orient );
 }
 
 }
 
-
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::DrawTextRectangle( wxDC& dc,
+                                const wxString& value,
+                                const wxRect& rect,
+                                int horizAlign,
+                                int vertAlign,
+                                int textOrientation )
 {
 {
-    // TODO: something with updateLabels flag
+    wxArrayString lines;
 
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
-        return FALSE;
-    }
+    StringToLines( value, lines );
 
 
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            EnableCellEditControl(FALSE);
 
 
-        if (m_table->DeleteRows( pos, numRows ))
-        {
+    //Forward to new API.
+    DrawTextRectangle(  dc,
+        lines,
+        rect,
+        horizAlign,
+        vertAlign,
+        textOrientation );
 
 
-            // the table will have sent the results of the delete row
-            // operation to this view object as a grid table message
-            //
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-            return TRUE;
-        }
-    }
-    return FALSE;
 }
 
 }
 
-
-bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+void wxGrid::DrawTextRectangle( wxDC& dc,
+                               const wxArrayString& lines,
+                               const wxRect& rect,
+                               int horizAlign,
+                               int vertAlign,
+                               int textOrientation )
 {
 {
-    // TODO: something with updateLabels flag
+    long textWidth, textHeight;
+    long lineWidth, lineHeight;
+    int nLines;
 
 
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
-        return FALSE;
-    }
+    dc.SetClippingRegion( rect );
 
 
-    if ( m_table )
+    nLines = lines.GetCount();
+    if( nLines > 0 )
     {
     {
-        if (IsCellEditControlEnabled())
-            EnableCellEditControl(FALSE);
+        int l;
+        float x = 0.0, y = 0.0;
 
 
-        bool ok = m_table->InsertCols( pos, numCols );
+        if( textOrientation == wxHORIZONTAL )
+            GetTextBoxSize(dc, lines, &textWidth, &textHeight);
+        else
+            GetTextBoxSize( dc, lines, &textHeight, &textWidth );
 
 
-        // the table will have sent the results of the insert col
-        // operation to this view object as a grid table message
-        //
-        if ( ok )
+        switch( vertAlign )
         {
         {
-            if ( m_currentCellCoords == wxGridNoCellCoords )
+        case wxALIGN_BOTTOM:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + (rect.height - textHeight - 1);
+            else
+                x = rect.x + rect.width - textWidth;
+            break;
+
+        case wxALIGN_CENTRE:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + ((rect.height - textHeight)/2);
+            else
+                x = rect.x + ((rect.width - textWidth)/2);
+            break;
+
+        case wxALIGN_TOP:
+        default:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + 1;
+            else
+                x = rect.x + 1;
+            break;
+        }
+
+        // Align each line of a multi-line label
+        for( l = 0; l < nLines; l++ )
+        {
+            dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+
+            switch( horizAlign )
             {
             {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
+            case wxALIGN_RIGHT:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + (rect.width - lineWidth - 1);
+                else
+                    y = rect.y + lineWidth + 1;
+                break;
+
+            case wxALIGN_CENTRE:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + ((rect.width - lineWidth)/2);
+                else
+                    y = rect.y + rect.height - ((rect.height - lineWidth)/2);
+                break;
+
+            case wxALIGN_LEFT:
+            default:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + 1;
+                else
+                    y = rect.y + rect.height - 1;
+                break;
             }
 
             }
 
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
+            if( textOrientation == wxHORIZONTAL )
+            {
+                dc.DrawText( lines[l], (int)x, (int)y );
+                y += lineHeight;
+            }
+            else
+            {
+                dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
+                x += lineHeight;
+            }
         }
         }
-
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
     }
     }
+    dc.DestroyClippingRegion();
 }
 
 
 }
 
 
-bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+// 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: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
-        return FALSE;
-    }
+    int startPos = 0;
+    int pos;
+    wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
+    wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
 
 
-    if ( m_table && m_table->AppendCols( numCols ) )
+    while ( startPos < (int)tVal.Length() )
     {
     {
-        // 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 )
+        pos = tVal.Mid(startPos).Find( eol );
+        if ( pos < 0 )
         {
         {
-            // if we have just inserted cols into an empty grid the current
-            // cell will be undefined...
-            //
-            SetCurrentCell( 0, 0 );
+            break;
         }
         }
-
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
+        else if ( pos == 0 )
+        {
+            lines.Add( wxEmptyString );
+        }
+        else
+        {
+            lines.Add( value.Mid(startPos, pos) );
+        }
+        startPos += pos+1;
     }
     }
-    else
+    if ( startPos < (int)value.Length() )
     {
     {
-        return FALSE;
+        lines.Add( value.Mid( startPos ) );
     }
 }
 
 
     }
 }
 
 
-bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+void wxGrid::GetTextBoxSize( wxDC& dc,
+                             const wxArrayString& lines,
+                             long *width, long *height )
 {
 {
-    // TODO: something with updateLabels flag
+    long w = 0;
+    long h = 0;
+    long lineW, lineH;
 
 
-    if ( !m_created )
+    size_t i;
+    for ( i = 0;  i < lines.GetCount();  i++ )
     {
     {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
-        return FALSE;
+        dc.GetTextExtent( lines[i], &lineW, &lineH );
+        w = wxMax( w, lineW );
+        h += lineH;
     }
 
     }
 
-    if ( m_table )
-    {
-        if (IsCellEditControlEnabled())
-            EnableCellEditControl(FALSE);
-
-        if ( 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
-            //
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-            return TRUE;
-        }
-    }
-    return FALSE;
+    *width = w;
+    *height = h;
 }
 
 }
 
-
-
 //
 //
-// ----- event handlers
-//
-
-// Generate a grid event based on a mouse event and
-// return the result of ProcessEvent()
+// ------ Batch processing.
 //
 //
-bool wxGrid::SendEvent( const wxEventType type,
-                        int row, int col,
-                        wxMouseEvent& mouseEv )
+void wxGrid::EndBatch()
 {
 {
-    if ( type == EVT_GRID_ROW_SIZE ||
-         type == EVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
-
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol,
-                                 mouseEv.GetX(), mouseEv.GetY(),
-                                 mouseEv.ControlDown(),
-                                 mouseEv.ShiftDown(),
-                                 mouseEv.AltDown(),
-                                 mouseEv.MetaDown() );
-
-        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() );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else
+    if ( m_batchCount > 0 )
     {
     {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col,
-                             mouseEv.GetX(), mouseEv.GetY(),
-                             mouseEv.ControlDown(),
-                             mouseEv.ShiftDown(),
-                             mouseEv.AltDown(),
-                             mouseEv.MetaDown() );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
+        m_batchCount--;
+        if ( !m_batchCount )
+        {
+            CalcDimensions();
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
+            m_cornerLabelWin->Refresh();
+            m_gridWin->Refresh();
+        }
     }
 }
 
     }
 }
 
-
-// Generate a grid event of specified type and return the result
-// of ProcessEvent().
+// 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.
 //
 //
-bool wxGrid::SendEvent( const wxEventType type,
-                        int row, int col )
+void wxGrid::ForceRefresh()
 {
 {
-    if ( type == EVT_GRID_ROW_SIZE ||
-         type == EVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
-
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else
-    {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+    BeginBatch();
+    EndBatch();
 }
 
 }
 
-
-void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
+bool wxGrid::Enable(bool enable)
 {
 {
-    wxPaintDC dc( this );
+    if ( !wxScrolledWindow::Enable(enable) )
+        return false;
 
 
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
-         m_numRows && m_numCols )
-    {
-        m_currentCellCoords.Set(0, 0);
-        SetEditControlValue();
-        ShowCellEditControl();
-    }
+    // redraw in the new state
+    m_gridWin->Refresh();
 
 
-    m_displayed = TRUE;
+    return true;
 }
 
 }
 
-
-// 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();
-}
+// ------ Edit control functions
+//
 
 
 
 
-void wxGrid::OnKeyDown( wxKeyEvent& event )
+void wxGrid::EnableEditing( bool edit )
 {
 {
-    if ( m_inOnKeyDown )
+    // TODO: improve this ?
+    //
+    if ( edit != m_editable )
     {
     {
-        // shouldn't be here - we are going round in circles...
-        //
-        wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
+        if(!edit) EnableCellEditControl(edit);
+        m_editable = edit;
     }
     }
+}
 
 
-    m_inOnKeyDown = TRUE;
-
-    // propagate the event up and see if it gets processed
-    //
-    wxWindow *parent = GetParent();
-    wxKeyEvent keyEvt( event );
-    keyEvt.SetEventObject( parent );
 
 
-    if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
-    {
+void wxGrid::EnableCellEditControl( bool enable )
+{
+    if (! m_editable)
+        return;
 
 
-        // TODO:  Should also support Shift-cursor keys for
-        //        extending the selection.  Maybe add a flag to
-        //        MoveCursorXXX() and MoveCursorXXXBlock() and
-        //        just send event.ShiftDown().
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        SetCurrentCell( 0, 0 );
 
 
-        // try local handlers
-        //
-        switch ( event.KeyCode() )
+    if ( enable != m_cellEditCtrlEnabled )
+    {
+        if ( enable )
         {
         {
-            case WXK_UP:
-                if ( event.ControlDown() )
-                {
-                    MoveCursorUpBlock();
-                }
-                else
-                {
-                    MoveCursorUp();
-                }
-                break;
+            if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+                return;
 
 
-            case WXK_DOWN:
-                if ( event.ControlDown() )
-                {
-                    MoveCursorDownBlock();
-                }
-                else
-                {
-                    MoveCursorDown();
-                }
-                break;
+            // this should be checked by the caller!
+            wxASSERT_MSG( CanEnableCellControl(),
+                          _T("can't enable editing for this cell!") );
 
 
-            case WXK_LEFT:
-                if ( event.ControlDown() )
-                {
-                    MoveCursorLeftBlock();
-                }
-                else
-                {
-                    MoveCursorLeft();
-                }
-                break;
+            // do it before ShowCellEditControl()
+            m_cellEditCtrlEnabled = enable;
 
 
-            case WXK_RIGHT:
-                if ( event.ControlDown() )
-                {
-                    MoveCursorRightBlock();
-                }
-                else
-                {
-                    MoveCursorRight();
-                }
-                break;
+            ShowCellEditControl();
+        }
+        else
+        {
+            //FIXME:add veto support
+            SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
 
 
-            case WXK_RETURN:
-                if ( event.ControlDown() )
-                {
-                    event.Skip();  // to let the edit control have the return
-                }
-                else
-                {
-                    MoveCursorDown();
-                }
-                break;
+            HideCellEditControl();
+            SaveEditControlValue();
 
 
-            case WXK_TAB:
-                if (event.ShiftDown())
-                    MoveCursorLeft();
-                else
-                    MoveCursorRight();
-                break;
+            // do it after HideCellEditControl()
+            m_cellEditCtrlEnabled = enable;
+        }
+    }
+}
 
 
-            case WXK_HOME:
-                if ( event.ControlDown() )
-                {
-                    MakeCellVisible( 0, 0 );
-                    SetCurrentCell( 0, 0 );
-                }
-                else
-                {
-                    event.Skip();
-                }
-                break;
+bool wxGrid::IsCurrentCellReadOnly() const
+{
+    // const_cast
+    wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords);
+    bool readonly = attr->IsReadOnly();
+    attr->DecRef();
 
 
-            case WXK_END:
-                if ( event.ControlDown() )
-                {
-                    MakeCellVisible( m_numRows-1, m_numCols-1 );
-                    SetCurrentCell( m_numRows-1, m_numCols-1 );
-                }
-                else
-                {
-                    event.Skip();
-                }
-                break;
+    return readonly;
+}
 
 
-            case WXK_PRIOR:
-                MovePageUp();
-                break;
+bool wxGrid::CanEnableCellControl() const
+{
+    return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
+        !IsCurrentCellReadOnly();
 
 
-            case WXK_NEXT:
-                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;
+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;
+}
 
 
-            case WXK_SPACE:
-                if ( !IsEditable() )
-                {
-                    MoveCursorRight();
-                    break;
-                }
-                // Otherwise fall through to default
+bool wxGrid::IsCellEditControlShown() const
+{
+    bool isShown = false;
 
 
-            default:
-                // now try the cell edit control
-                //
-                if ( !IsCellEditControlEnabled() )
-                    EnableCellEditControl( TRUE );
-                if (IsCellEditControlEnabled()) {
-                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                    attr->GetEditor()->StartingKey(event);
-                    attr->DecRef();
-                }
-                break;
+    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();
         }
     }
 
         }
     }
 
-    m_inOnKeyDown = FALSE;
+    return isShown;
 }
 
 }
 
+void wxGrid::ShowCellEditControl()
+{
+    if ( IsCellEditControlEnabled() )
+    {
+        if ( !IsVisible( m_currentCellCoords ) )
+        {
+            m_cellEditCtrlEnabled = false;
+            return;
+        }
+        else
+        {
+            wxRect rect = CellToRect( m_currentCellCoords );
+            int row = m_currentCellCoords.GetRow();
+            int col = m_currentCellCoords.GetCol();
 
 
-void wxGrid::OnEraseBackground(wxEraseEvent&)
-{ }
+            // 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 )
+            {
+                row += cell_rows;
+                col += cell_cols;
+                m_currentCellCoords.SetRow( row );
+                m_currentCellCoords.SetCol( col );
+            }
 
 
+            // convert to scrolled coords
+            //
+            CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
 
+            // done in PaintBackground()
+#if 0
+            // erase the highlight and the cell contents because the editor
+            // might not cover the entire cell
+            wxClientDC dc( m_gridWin );
+            PrepareDC( dc );
+            dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            dc.SetPen(*wxTRANSPARENT_PEN);
+            dc.DrawRectangle(rect);
+#endif // 0
 
 
+            // 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--;
+
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+            if ( !editor->IsCreated() )
+            {
+                editor->Create(m_gridWin, wxID_ANY,
+                               new wxGridCellEditorEvtHandler(this, editor));
 
 
-void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
-{
-    if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
-    {
-        // the event has been intercepted - do nothing
-        return;
+                wxGridEditorCreatedEvent evt(GetId(),
+                                             wxEVT_GRID_EDITOR_CREATED,
+                                             this,
+                                             row,
+                                             col,
+                                             editor->GetControl());
+                GetEventHandler()->ProcessEvent(evt);
+            }
+
+
+            // resize editor to overflow into righthand cells if allowed
+            int maxWidth = rect.width;
+            wxString value = GetCellValue(row, col);
+            if ( (value != wxEmptyString) && (attr->GetOverflow()) )
+            {
+                int y;
+                GetTextExtent(value, &maxWidth, &y,
+                        NULL, NULL, &attr->GetFont());
+                if (maxWidth < rect.width) maxWidth = rect.width;
+            }
+            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)
+            {
+                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 );
+                    // looks weird going over a multicell
+                    if (m_table->IsEmptyCell(row,i) &&
+                            (rect.width < maxWidth) && (c_rows == 1))
+                        rect.width += GetColWidth(i);
+                    else
+                        break;
+                }
+                if (rect.GetRight() > client_right)
+                    rect.SetRight(client_right-1);
+            }
+
+            editor->SetCellAttr(attr);
+            editor->SetSize( rect );
+            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();
+        }
     }
     }
+}
 
 
-    if ( m_displayed  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+
+void wxGrid::HideCellEditControl()
+{
+    if ( IsCellEditControlEnabled() )
     {
     {
-        HideCellEditControl();
-        SaveEditControlValue();
-        EnableCellEditControl(FALSE);
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
 
-        // Clear the old current cell highlight
-        wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->Show( false );
+        editor->DecRef();
+        attr->DecRef();
 
 
-        // Otherwise refresh redraws the highlight!
-        m_currentCellCoords = coords;
+        m_gridWin->SetFocus();
 
 
-        m_gridWin->Refresh( FALSE, &r );
+        // 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
+        m_gridWin->Refresh( false, &rect );
     }
     }
+}
 
 
-    m_currentCellCoords = coords;
-
-    SetEditControlValue();
 
 
-    if ( m_displayed )
+void wxGrid::SaveEditControlValue()
+{
+    if ( IsCellEditControlEnabled() )
     {
     {
-        wxClientDC dc(m_gridWin);
-        PrepareDC(dc);
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
 
-        wxGridCellAttr* attr = GetCellAttr(coords);
-        DrawCellHighlight(dc, attr);
+        wxString oldval = GetCellValue(row,col);
+
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+        bool changed = editor->EndEdit(row, col, this);
+
+        editor->DecRef();
         attr->DecRef();
 
         attr->DecRef();
 
-        if ( IsSelection() )
+        if (changed)
         {
         {
-            wxRect r( SelectionToDeviceRect() );
-            ClearSelection();
-            if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+            if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
+                       m_currentCellCoords.GetRow(),
+                       m_currentCellCoords.GetCol() ) < 0 ) {
+
+                // Event has been vetoed, set the data back.
+                SetCellValue(row,col,oldval);
+            }
         }
     }
 }
 
 
 //
         }
     }
 }
 
 
 //
-// ------ functions to get/send data (see also public functions)
+// ------ Grid location functions
+//  Note that all of these functions work with the logical coordinates of
+//  grid cells and labels so you will need to convert from device
+//  coordinates for mouse events etc.
 //
 
 //
 
-bool wxGrid::GetModelValues()
+void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
 {
 {
-    if ( m_table )
+    int row = YToRow(y);
+    int col = XToCol(x);
+
+    if ( row == -1  ||  col == -1 )
     {
     {
-        // all we need to do is repaint the grid
-        //
-        m_gridWin->Refresh();
-        return TRUE;
+        coords = wxGridNoCellCoords;
+    }
+    else
+    {
+        coords.Set( row, col );
     }
     }
-
-    return FALSE;
 }
 
 
 }
 
 
-bool wxGrid::SetModelValues()
+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
+
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+                           const wxArrayInt& BorderArray, int nMax,
+                           bool clipToMinMax)
 {
 {
-    int row, col;
 
 
-    if ( m_table )
+    if (coord < 0)
+        return clipToMinMax && (nMax > 0) ? 0 : -1;
+
+
+    if (!defaultDist)
+        defaultDist = 1;
+
+    size_t i_max = coord / defaultDist,
+           i_min = 0;
+
+    if (BorderArray.IsEmpty())
     {
     {
-        for ( row = 0;  row < m_numRows;  row++ )
+        if((int) i_max < nMax)
+            return i_max;
+        return clipToMinMax ? nMax - 1 : -1;
+    }
+
+    if ( i_max >= BorderArray.GetCount())
+        i_max = BorderArray.GetCount() - 1;
+    else
+    {
+        if ( coord >= BorderArray[i_max])
         {
         {
-            for ( col = 0;  col < m_numCols;  col++ )
-            {
-                m_table->SetValue( row, col, GetCellValue(row, col) );
-            }
+            i_min = i_max;
+            if (minDist)
+                i_max = coord / minDist;
+            else
+                i_max =  BorderArray.GetCount() - 1;
         }
         }
+        if ( i_max >= BorderArray.GetCount())
+            i_max = BorderArray.GetCount() - 1;
+    }
+    if ( coord >= BorderArray[i_max])
+        return clipToMinMax ? (int)i_max : -1;
+    if ( coord < BorderArray[0] )
+        return 0;
 
 
-        return TRUE;
+    while ( i_max - i_min > 0 )
+    {
+        wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
+                    0, _T("wxGrid: internal error in CoordToRowOrCol"));
+        if (coord >=  BorderArray[ i_max - 1])
+            return i_max;
+        else
+            i_max--;
+        int median = i_min + (i_max - i_min + 1) / 2;
+        if (coord < BorderArray[median])
+            i_max = median;
+        else
+            i_min = median;
     }
     }
+    return i_max;
+}
 
 
-    return FALSE;
+int wxGrid::YToRow( int y )
+{
+    return CoordToRowOrCol(y, m_defaultRowHeight,
+                           m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 
 
 }
 
 
+int wxGrid::XToCol( int x )
+{
+    return CoordToRowOrCol(x, m_defaultColWidth,
+                           m_minAcceptableColWidth, m_colRights, m_numCols, false);
+}
 
 
-// Note - this function only draws cells that are in the list of
-// exposed cells (usually set from the update region by
-// CalcExposedCells)
+
+// return the row number that that the y coord is near the edge of, or
+// -1 if not near an edge
 //
 //
-void wxGrid::DrawGridCellArea( wxDC& dc )
+int wxGrid::YToEdgeOfRow( int y )
 {
 {
-    if ( !m_numRows || !m_numCols ) return;
-
-    size_t i;
-    size_t numCells = m_cellsExposed.GetCount();
+    int i;
+    i = internalYToRow(y);
 
 
-    for ( i = 0;  i < numCells;  i++ )
+    if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
     {
     {
-        DrawCell( dc, m_cellsExposed[i] );
+        // We know that we are in row i, test whether we are
+        // close enough to lower or upper border, respectively.
+        if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
+            return i;
+        else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
+            return i - 1;
     }
     }
+
+    return -1;
 }
 
 
 }
 
 
-void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
+// return the col number that that the x coord is near the edge of, or
+// -1 if not near an edge
+//
+int wxGrid::XToEdgeOfCol( int x )
 {
 {
-    int row = coords.GetRow();
-    int col = coords.GetCol();
+    int i;
+    i = internalXToCol(x);
 
 
-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
-        return;
+    if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
+    {
+        // We know that we are in column i,  test whether we are
+        // close enough to right or left border, respectively.
+        if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
+            return i;
+        else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
+            return i - 1;
+    }
 
 
-    // we draw the cell border ourselves
-#if !WXGRID_DRAW_LINES
-    if ( m_gridLinesEnabled )
-        DrawCellBorder( dc, coords );
-#endif
+    return -1;
+}
 
 
-    // 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;
 
 
-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
+wxRect wxGrid::CellToRect( int row, int col )
+{
+    wxRect rect( -1, -1, -1, -1 );
 
 
-    if (m_currentCellCoords == coords)
-        DrawCellHighlight(dc, attr);
+    if ( row >= 0  &&  row < m_numRows  &&
+         col >= 0  &&  col < m_numCols )
+    {
+        int i, cell_rows, cell_cols;
+        rect.width = rect.height = 0;
+        GetCellSize( row, col, &cell_rows, &cell_cols );
+        // if negative then find multicell owner
+        if (cell_rows < 0) row += cell_rows;
+        if (cell_cols < 0) col += cell_cols;
+        GetCellSize( row, col, &cell_rows, &cell_cols );
 
 
-    attr->DecRef();
+        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;
 }
 
 }
 
-void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
+
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
 {
 {
-    int row = m_currentCellCoords.GetRow();
-    int col = m_currentCellCoords.GetCol();
+    // get the cell rectangle in logical coords
+    //
+    wxRect r( CellToRect( row, col ) );
 
 
-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
-        return;
+    // convert to device coords
+    //
+    int left, top, right, bottom;
+    CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
+    CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
 
 
-    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;
+    // check against the client area of the grid window
+    //
+    int cw, ch;
+    m_gridWin->GetClientSize( &cw, &ch );
 
 
-    if ( attr->IsReadOnly() )
+    if ( wholeCellVisible )
     {
     {
-        // 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
-        dc.SetPen(wxPen(m_gridLineColour, 2, wxSOLID));
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-        dc.DrawRectangle(rect);
+        // is the cell wholly visible ?
+        //
+        return ( left >= 0  &&  right <= cw  &&
+                 top >= 0  &&  bottom <= ch );
     }
     else
     {
     }
     else
     {
-        // VZ: my experiments with 3d borders...
-#if 0
-        dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        // is the cell partly visible ?
+        //
+        return ( ((left >=0 && left < cw) || (right > 0 && right <= cw))  &&
+                 ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+    }
+}
+
+
+// make the specified cell location visible by doing a minimal amount
+// of scrolling
+//
+void wxGrid::MakeCellVisible( int row, int col )
+{
+
+    int i;
+    int xpos = -1, ypos = -1;
+
+    if ( row >= 0  &&  row < m_numRows  &&
+         col >= 0  &&  col < m_numCols )
+    {
+        // get the cell rectangle in logical coords
+        //
+        wxRect r( CellToRect( row, col ) );
 
 
-        dc.DrawRectangle(rect);
-#else //1
-        // FIXME we should properly set colours for arbitrary bg
-        wxCoord x1 = rect.x,
-                y1 = rect.y,
-                x2 = rect.x + rect.width,
-                y2 = rect.y + rect.height;
+        // convert to device coords
+        //
+        int left, top, right, bottom;
+        CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
+        CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
 
 
-        dc.SetPen(*wxWHITE_PEN);
-        dc.DrawLine(x1, y1, x2 - 1, y1);
-        dc.DrawLine(x1, y1, x1, y2 - 1);
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
 
 
-        dc.SetPen(*wxLIGHT_GREY_PEN);
-        dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
-        dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 - 1);
+        if ( top < 0 )
+        {
+            ypos = r.GetTop();
+        }
+        else if ( bottom > ch )
+        {
+            int h = r.GetHeight();
+            ypos = r.GetTop();
+            for ( i = row-1;  i >= 0;  i-- )
+            {
+                int rowHeight = GetRowHeight(i);
+                if ( h + rowHeight > ch )
+                    break;
 
 
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(x1, y2, x2, y2);
-        dc.DrawLine(x2, y1, x2, y2);
-#endif // 0/1
-    }
-}
+                h += rowHeight;
+                ypos -= rowHeight;
+            }
 
 
-void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
-{
-    if ( m_colWidths[coords.GetCol()] <=0  ||
-         m_rowHeights[coords.GetRow()] <= 0 ) return;
+            // 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)
+            //
+            // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
+            // scroll unit...
+            ypos += m_scrollLineY;
+        }
 
 
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
-    int row = coords.GetRow();
-    int col = coords.GetCol();
+        if ( left < 0 )
+        {
+            xpos = r.GetLeft();
+        }
+        else if ( right > cw )
+        {
+            // position the view so that the cell is on the right
+            int x0, y0;
+            CalcUnscrolledPosition(0, 0, &x0, &y0);
+            xpos = x0 + (right - cw);
 
 
-    // right hand border
-    //
-    dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
-                 m_colRights[col], m_rowBottoms[row] );
+            // see comment for ypos above
+            xpos += m_scrollLineX;
+        }
 
 
-    // bottom border
-    //
-    dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
-                 m_colRights[col], m_rowBottoms[row] );
+        if ( xpos != -1  ||  ypos != -1 )
+        {
+            if ( xpos != -1 )
+                xpos /= m_scrollLineX;
+            if ( ypos != -1 )
+                ypos /= m_scrollLineY;
+            Scroll( xpos, ypos );
+            AdjustScrollbars();
+        }
+    }
 }
 
 
 }
 
 
-// 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 )
-{
-    if ( !m_gridLinesEnabled ||
-         !m_numRows ||
-         !m_numCols ) return;
-
-    int top, bottom, left, right;
-
-    if (reg.IsEmpty()){
-      int cw, ch;
-      m_gridWin->GetClientSize(&cw, &ch);
+// ------ Grid cursor movement functions
+//
 
 
-      // 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 );
+bool wxGrid::MoveCursorUp( bool expandSelection )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetRow() >= 0 )
+    {
+        if ( expandSelection)
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            if ( m_selectingKeyboard.GetRow() > 0 )
+            {
+                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                                 m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetRow() > 0 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
+                            m_currentCellCoords.GetCol() );
+        }
+        else
+            return false;
+        return true;
     }
 
     }
 
-    // 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] );
+    return false;
+}
 
 
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
 
-    // horizontal grid lines
-    //
-    int i;
-    for ( i = 0; i < m_numRows; i++ )
+bool wxGrid::MoveCursorDown( bool expandSelection )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetRow() < m_numRows )
     {
     {
-        if ( m_rowBottoms[i]-1 > bottom )
+        if ( expandSelection )
         {
         {
-            break;
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
+            {
+                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
         }
         }
-        else if ( m_rowBottoms[i]-1 >= top )
+        else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
         {
         {
-            dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
+                            m_currentCellCoords.GetCol() );
         }
         }
+        else
+            return false;
+        return true;
     }
 
     }
 
+    return false;
+}
 
 
-    // vertical grid lines
-    //
-    for ( i = 0; i < m_numCols; i++ )
+
+bool wxGrid::MoveCursorLeft( bool expandSelection )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetCol() >= 0 )
     {
     {
-        if ( m_colRights[i]-1 > right )
+        if ( expandSelection )
         {
         {
-            break;
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            if ( m_selectingKeyboard.GetCol() > 0 )
+            {
+                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
         }
         }
-        else if ( m_colRights[i]-1 >= left )
+        else if ( m_currentCellCoords.GetCol() > 0 )
         {
         {
-            dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() - 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() - 1 );
         }
         }
+        else
+            return false;
+        return true;
     }
     }
+
+    return false;
 }
 
 
 }
 
 
-void wxGrid::DrawRowLabels( wxDC& dc )
+bool wxGrid::MoveCursorRight( bool expandSelection )
 {
 {
-    if ( !m_numRows || !m_numCols ) return;
-
-    size_t i;
-    size_t numLabels = m_rowLabelsExposed.GetCount();
-
-    for ( i = 0;  i < numLabels;  i++ )
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetCol() < m_numCols )
     {
     {
-        DrawRowLabel( dc, m_rowLabelsExposed[i] );
+        if ( expandSelection )
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
+            {
+                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() + 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() + 1 );
+        }
+        else
+            return false;
+        return true;
     }
     }
+
+    return false;
 }
 
 
 }
 
 
-void wxGrid::DrawRowLabel( wxDC& dc, int row )
+bool wxGrid::MovePageUp()
 {
 {
-    if ( m_rowHeights[row] <= 0 ) return;
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
 
 
-    int rowTop = m_rowBottoms[row] - m_rowHeights[row];
-
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawLine( m_rowLabelWidth-1, rowTop,
-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+    int row = m_currentCellCoords.GetRow();
+    if ( row > 0 )
+    {
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
 
 
-    dc.DrawLine( 0, m_rowBottoms[row]-1,
-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+        int y = GetRowTop(row);
+        int newRow = internalYToRow( y - ch + 1 );
 
 
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
-    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+        if ( newRow == row )
+        {
+            //row > 0 , so newrow can never be less than 0 here.
+            newRow = row - 1;
+        }
 
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
+        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
 
-    int hAlign, vAlign;
-    GetRowLabelAlignment( &hAlign, &vAlign );
+        return true;
+    }
 
 
-    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 );
+    return false;
 }
 
 }
 
-
-void wxGrid::DrawColLabels( wxDC& dc )
+bool wxGrid::MovePageDown()
 {
 {
-    if ( !m_numRows || !m_numCols ) return;
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
 
 
-    size_t i;
-    size_t numLabels = m_colLabelsExposed.GetCount();
-
-    for ( i = 0;  i < numLabels;  i++ )
+    int row = m_currentCellCoords.GetRow();
+    if ( (row+1) < m_numRows )
     {
     {
-        DrawColLabel( dc, m_colLabelsExposed[i] );
-    }
-}
-
-
-void wxGrid::DrawColLabel( wxDC& dc, int col )
-{
-    if ( m_colWidths[col] <= 0 ) return;
-
-    int colLeft = m_colRights[col] - m_colWidths[col];
-
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawLine( m_colRights[col]-1, 0,
-                 m_colRights[col]-1, m_colLabelHeight-1 );
-
-    dc.DrawLine( colLeft, m_colLabelHeight-1,
-                 m_colRights[col]-1, m_colLabelHeight-1 );
-
-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
-    dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
 
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+        int y = GetRowTop(row);
+        int newRow = internalYToRow( y + ch );
+        if ( newRow == row )
+        {
+            // row < m_numRows , so newrow can't overflow here.
+            newRow = row + 1;
+        }
 
 
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
+        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
+        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
 
-    int hAlign, vAlign;
-    GetColLabelAlignment( &hAlign, &vAlign );
+        return true;
+    }
 
 
-    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 );
+    return false;
 }
 
 }
 
-
-void wxGrid::DrawTextRectangle( wxDC& dc,
-                                const wxString& value,
-                                const wxRect& rect,
-                                int horizAlign,
-                                int vertAlign )
+bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 {
 {
-    long textWidth, textHeight;
-    long lineWidth, lineHeight;
-    wxArrayString lines;
-
-    dc.SetClippingRegion( rect );
-    StringToLines( value, lines );
-    if ( lines.GetCount() )
+    if ( m_table &&
+         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetRow() > 0 )
     {
     {
-        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
-        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
 
-        float x, y;
-        switch ( horizAlign )
+        if ( m_table->IsEmptyCell(row, col) )
         {
         {
-            case wxRIGHT:
-                x = rect.x + (rect.width - textWidth - 1);
-                break;
-
-            case wxCENTRE:
-                x = rect.x + ((rect.width - textWidth)/2);
-                break;
-
-            case wxLEFT:
-            default:
-                x = rect.x + 1;
-                break;
+            // 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;
+                }
+            }
         }
 
         }
 
-        switch ( vertAlign )
+        MakeCellVisible( row, col );
+        if ( expandSelection )
         {
         {
-            case wxBOTTOM:
-                y = rect.y + (rect.height - textHeight - 1);
-                break;
-
-            case wxCENTRE:
-                y = rect.y + ((rect.height - textHeight)/2);
-                break;
-
-            case wxTOP:
-            default:
-                y = rect.y + 1;
-                break;
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         }
-
-        for ( size_t i = 0;  i < lines.GetCount();  i++ )
+        else
         {
         {
-            dc.DrawText( lines[i], (long)x, (long)y );
-            y += lineHeight;
+            ClearSelection();
+            SetCurrentCell( row, col );
         }
         }
+        return true;
     }
 
     }
 
-    dc.DestroyClippingRegion();
+    return false;
 }
 
 }
 
-
-// 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 )
+bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 {
 {
-    int startPos = 0;
-    int pos;
-    wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
-    wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
-
-    while ( startPos < (int)tVal.Length() )
+    if ( m_table &&
+         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetRow() < m_numRows-1 )
     {
     {
-        pos = tVal.Mid(startPos).Find( eol );
-        if ( pos < 0 )
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+
+        if ( m_table->IsEmptyCell(row, col) )
         {
         {
-            break;
+            // 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 ( pos == 0 )
+        else if ( m_table->IsEmptyCell(row+1, col) )
         {
         {
-            lines.Add( wxEmptyString );
+            // 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
         {
         }
         else
         {
-            lines.Add( value.Mid(startPos, pos) );
+            // starting within a block: find the bottom of the block
+            //
+            while ( row < m_numRows-1 )
+            {
+                row++ ;
+                if ( m_table->IsEmptyCell(row, col) )
+                {
+                    row-- ;
+                    break;
+                }
+            }
         }
         }
-        startPos += pos+1;
-    }
-    if ( startPos < (int)value.Length() )
-    {
-        lines.Add( value.Mid( startPos ) );
-    }
-}
 
 
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
 
-void wxGrid::GetTextBoxSize( wxDC& dc,
-                             wxArrayString& lines,
-                             long *width, long *height )
-{
-    long w = 0;
-    long h = 0;
-    long lineW, lineH;
-
-    size_t i;
-    for ( i = 0;  i < lines.GetCount();  i++ )
-    {
-        dc.GetTextExtent( lines[i], &lineW, &lineH );
-        w = wxMax( w, lineW );
-        h += lineH;
+        return true;
     }
 
     }
 
-    *width = w;
-    *height = h;
+    return false;
 }
 
 }
 
-
-//
-// ------ Edit control functions
-//
-
-
-void wxGrid::EnableEditing( bool edit )
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 {
 {
-    // TODO: improve this ?
-    //
-    if ( edit != m_editable )
+    if ( m_table &&
+         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetCol() > 0 )
     {
     {
-        m_editable = edit;
-
-        EnableCellEditControl(m_editable);
-    }
-}
-
-
-void wxGrid::EnableCellEditControl( bool enable )
-{
-    if (! m_editable)
-        return;
-
-    if ( m_currentCellCoords == wxGridNoCellCoords )
-        SetCurrentCell( 0, 0 );
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
 
-    if ( enable != m_cellEditCtrlEnabled )
-    {
-        if ( enable )
+        if ( m_table->IsEmptyCell(row, col) )
         {
         {
-            m_cellEditCtrlEnabled = enable;
-            SetEditControlValue();
-            ShowCellEditControl();
+            // 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) )
+        {
+            // starting at the left of a block: find the next block
+            //
+            col--;
+            while ( col > 0 )
+            {
+                col-- ;
+                if ( !(m_table->IsEmptyCell(row, col)) ) break;
+            }
         }
         else
         {
         }
         else
         {
-            HideCellEditControl();
-            SaveEditControlValue();
-            m_cellEditCtrlEnabled = enable;
+            // starting within a block: find the left of the block
+            //
+            while ( col > 0 )
+            {
+                col-- ;
+                if ( m_table->IsEmptyCell(row, col) )
+                {
+                    col++ ;
+                    break;
+                }
+            }
         }
         }
-    }
-}
-
 
 
-bool wxGrid::IsCellEditControlEnabled()
-{
-    bool enabled;
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
 
-    if ( m_cellEditCtrlEnabled )
-    {
-        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-        enabled = !attr->IsReadOnly();
-        attr->DecRef();
-    }
-    else
-    {
-        enabled = FALSE;
+        return true;
     }
 
     }
 
-    return enabled;
+    return false;
 }
 
 }
 
-void wxGrid::ShowCellEditControl()
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 {
 {
-    if ( IsCellEditControlEnabled() )
+    if ( m_table &&
+         m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetCol() < m_numCols-1 )
     {
     {
-        if ( !IsVisible( m_currentCellCoords ) )
-        {
-            return;
-        }
-        else
-        {
-            wxRect rect = CellToRect( m_currentCellCoords );
-            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 );
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
 
-            // Make the edit control large enough to allow for internal
-            // margins
-            //
-            // TODO: remove this if the text ctrl sizing is improved esp. for
-            // unix
+        if ( m_table->IsEmptyCell(row, col) )
+        {
+            // starting in an empty cell: find the next block of
+            // non-empty cells
             //
             //
-            int extra;
-#if defined(__WXMOTIF__)
-            if ( row == 0  || col == 0 )
-            {
-                extra = 2;
-            }
-            else
+            while ( col < m_numCols-1 )
             {
             {
-                extra = 4;
+                col++ ;
+                if ( !(m_table->IsEmptyCell(row, col)) ) break;
             }
             }
-#else
-            if ( row == 0  || col == 0 )
+        }
+        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 )
             {
             {
-                extra = 1;
+                col++ ;
+                if ( !(m_table->IsEmptyCell(row, col)) ) break;
             }
             }
-            else
+        }
+        else
+        {
+            // starting within a block: find the right of the block
+            //
+            while ( col < m_numCols-1 )
             {
             {
-                extra = 2;
+                col++ ;
+                if ( m_table->IsEmptyCell(row, col) )
+                {
+                    col-- ;
+                    break;
+                }
             }
             }
-#endif
-
-#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
+        }
 
 
-            wxGridCellAttr*   attr = GetCellAttr(row, col);
-            wxGridCellEditor* editor = attr->GetEditor();
-            if ( !editor->IsCreated() )
-            {
-                editor->Create(m_gridWin, -1,
-                               new wxGridCellEditorEvtHandler(this, editor));
-            }
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
 
-            editor->SetSize( rect );
-            editor->Show( TRUE, attr );
-            editor->BeginEdit(row, col, this);
-            attr->DecRef();
-         }
+        return true;
     }
     }
+
+    return false;
 }
 
 
 }
 
 
-void wxGrid::HideCellEditControl()
-{
-    if ( IsCellEditControlEnabled() )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
 
 
-        wxGridCellAttr* attr = GetCellAttr(row, col);
-        attr->GetEditor()->Show( FALSE );
-        attr->DecRef();
-        m_gridWin->SetFocus();
-    }
-}
+//
+// ------ Label values and formatting
+//
 
 
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+{
+    *horiz = m_rowLabelHorizAlign;
+    *vert  = m_rowLabelVertAlign;
+}
 
 
-void wxGrid::SetEditControlValue( const wxString& value )
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
 {
 {
-    // RD: The new Editors get the value from the table themselves now.  This
-    // method can probably be removed...
+    *horiz = m_colLabelHorizAlign;
+    *vert  = m_colLabelVertAlign;
 }
 
 }
 
+int wxGrid::GetColLabelTextOrientation()
+{
+    return m_colLabelTextOrientation;
+}
 
 
-void wxGrid::SaveEditControlValue()
+wxString wxGrid::GetRowLabelValue( int row )
 {
 {
-    if ( IsCellEditControlEnabled() )
+    if ( m_table )
     {
     {
-        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->DecRef();
-
-        if (changed)
-        {
-            SendEvent( EVT_GRID_CELL_CHANGE,
-                       m_currentCellCoords.GetRow(),
-                       m_currentCellCoords.GetCol() );
-        }
+        return m_table->GetRowLabelValue( row );
+    }
+    else
+    {
+        wxString s;
+        s << row;
+        return s;
     }
 }
 
     }
 }
 
-
-//
-// ------ Grid location functions
-//  Note that all of these functions work with the logical coordinates of
-//  grid cells and labels so you will need to convert from device
-//  coordinates for mouse events etc.
-//
-
-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+wxString wxGrid::GetColLabelValue( int col )
 {
 {
-    int row = YToRow(y);
-    int col = XToCol(x);
-
-    if ( row == -1  ||  col == -1 )
+    if ( m_table )
     {
     {
-        coords = wxGridNoCellCoords;
+        return m_table->GetColLabelValue( col );
     }
     else
     {
     }
     else
     {
-        coords.Set( row, col );
+        wxString s;
+        s << col;
+        return s;
     }
 }
 
 
     }
 }
 
 
-int wxGrid::YToRow( int y )
+void wxGrid::SetRowLabelSize( int width )
 {
 {
-    int i;
-
-    for ( i = 0;  i < m_numRows;  i++ )
+    width = wxMax( width, 0 );
+    if ( width != m_rowLabelWidth )
     {
     {
-        if ( y < m_rowBottoms[i] ) return i;
-    }
+        if ( width == 0 )
+        {
+            m_rowLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );
+        }
+        else if ( m_rowLabelWidth == 0 )
+        {
+            m_rowLabelWin->Show( true );
+            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true );
+        }
 
 
-    return m_numRows; //-1;
+        m_rowLabelWidth = width;
+        CalcWindowSizes();
+        wxScrolledWindow::Refresh( true );
+    }
 }
 
 
 }
 
 
-int wxGrid::XToCol( int x )
+void wxGrid::SetColLabelSize( int height )
 {
 {
-    int i;
-
-    for ( i = 0;  i < m_numCols;  i++ )
+    height = wxMax( height, 0 );
+    if ( height != m_colLabelHeight )
     {
     {
-        if ( x < m_colRights[i] ) return i;
-    }
+        if ( height == 0 )
+        {
+            m_colLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );
+        }
+        else if ( m_colLabelHeight == 0 )
+        {
+            m_colLabelWin->Show( true );
+            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true );
+        }
 
 
-    return m_numCols; //-1;
+        m_colLabelHeight = height;
+        CalcWindowSizes();
+        wxScrolledWindow::Refresh( true );
+    }
 }
 
 
 }
 
 
-// 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 )
+void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
 {
-    int i, d;
-
-    for ( i = 0;  i < m_numRows;  i++ )
+    if ( m_labelBackgroundColour != colour )
     {
     {
-        if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE )
+        m_labelBackgroundColour = colour;
+        m_rowLabelWin->SetBackgroundColour( colour );
+        m_colLabelWin->SetBackgroundColour( colour );
+        m_cornerLabelWin->SetBackgroundColour( colour );
+
+        if ( !GetBatchCount() )
         {
         {
-            d = abs( y - m_rowBottoms[i] );
-            {
-                if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-            }
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
+            m_cornerLabelWin->Refresh();
         }
     }
         }
     }
-
-    return -1;
 }
 
 }
 
-
-// return the col number that that the x coord is near the edge of, or
-// -1 if not near an edge
-//
-int wxGrid::XToEdgeOfCol( int x )
+void wxGrid::SetLabelTextColour( const wxColour& colour )
 {
 {
-    int i, d;
-
-    for ( i = 0;  i < m_numCols;  i++ )
+    if ( m_labelTextColour != colour )
     {
     {
-        if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE )
+        m_labelTextColour = colour;
+        if ( !GetBatchCount() )
         {
         {
-            d = abs( x - m_colRights[i] );
-            {
-                if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-            }
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
         }
     }
         }
     }
-
-    return -1;
 }
 
 }
 
-
-wxRect wxGrid::CellToRect( int row, int col )
+void wxGrid::SetLabelFont( const wxFont& font )
 {
 {
-    wxRect rect( -1, -1, -1, -1 );
-
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    m_labelFont = font;
+    if ( !GetBatchCount() )
     {
     {
-        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 ];
+        m_rowLabelWin->Refresh();
+        m_colLabelWin->Refresh();
     }
     }
-
-    return rect;
 }
 
 }
 
-
-bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+void wxGrid::SetRowLabelAlignment( int horiz, int vert )
 {
 {
-    // get the cell rectangle in logical coords
-    //
-    wxRect r( CellToRect( row, col ) );
+    // 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;
+    }
 
 
-    // convert to device coords
-    //
-    int left, top, right, bottom;
-    CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
-    CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
+    switch ( vert )
+    {
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
 
 
-    // check against the client area of the grid window
-    //
-    int cw, ch;
-    m_gridWin->GetClientSize( &cw, &ch );
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
+    {
+        m_rowLabelHorizAlign = horiz;
+    }
 
 
-    if ( wholeCellVisible )
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
     {
     {
-        // is the cell wholly visible ?
-        //
-        return ( left >= 0  &&  right <= cw  &&
-                 top >= 0  &&  bottom <= ch );
+        m_rowLabelVertAlign = vert;
     }
     }
-    else
+
+    if ( !GetBatchCount() )
     {
     {
-        // is the cell partly visible ?
-        //
-        return ( ((left >=0 && left < cw) || (right > 0 && right <= cw))  &&
-                 ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+        m_rowLabelWin->Refresh();
     }
 }
 
     }
 }
 
-
-// make the specified cell location visible by doing a minimal amount
-// of scrolling
-//
-void wxGrid::MakeCellVisible( int row, int col )
+void wxGrid::SetColLabelAlignment( int horiz, int vert )
 {
 {
-    int i;
-    int xpos = -1, ypos = -1;
+    // 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;
+    }
 
 
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
+    switch ( vert )
     {
     {
-        // get the cell rectangle in logical coords
-        //
-        wxRect r( CellToRect( row, col ) );
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
 
 
-        // convert to device coords
-        //
-        int left, top, right, bottom;
-        CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
-        CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
+    {
+        m_colLabelHorizAlign = horiz;
+    }
 
 
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
+    {
+        m_colLabelVertAlign = vert;
+    }
 
 
-        if ( top < 0 )
-        {
-            ypos = r.GetTop();
-        }
-        else if ( bottom > ch )
-        {
-            int h = r.GetHeight();
-            ypos = r.GetTop();
-            for ( i = row-1;  i >= 0;  i-- )
-            {
-                if ( h + m_rowHeights[i] > ch ) break;
+    if ( !GetBatchCount() )
+    {
+        m_colLabelWin->Refresh();
+    }
+}
 
 
-                h += m_rowHeights[i];
-                ypos -= m_rowHeights[i];
-            }
+// 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;
+    }
 
 
-            // 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;
-        }
+    if ( !GetBatchCount() )
+    {
+        m_colLabelWin->Refresh();
+    }
+}
 
 
-        if ( left < 0 )
-        {
-            xpos = r.GetLeft();
-        }
-        else if ( right > cw )
+void wxGrid::SetRowLabelValue( int row, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetRowLabelValue( row, s );
+        if ( !GetBatchCount() )
         {
         {
-            int w = r.GetWidth();
-            xpos = r.GetLeft();
-            for ( i = col-1;  i >= 0;  i-- )
+            wxRect rect = CellToRect( row, 0);
+            if ( rect.height > 0 )
             {
             {
-                if ( w + m_colWidths[i] > cw ) break;
-
-                w += m_colWidths[i];
-                xpos -= m_colWidths[i];
+                CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
+                rect.x = 0;
+                rect.width = m_rowLabelWidth;
+                m_rowLabelWin->Refresh( true, &rect );
             }
             }
-
-            // see comment for ypos above
-            xpos += GRID_SCROLL_LINE / 2;
         }
         }
+    }
+}
 
 
-        if ( xpos != -1  ||  ypos != -1 )
+void wxGrid::SetColLabelValue( int col, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetColLabelValue( col, s );
+        if ( !GetBatchCount() )
         {
         {
-            if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
-            if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
-            Scroll( xpos, ypos );
-            AdjustScrollbars();
+            wxRect rect = CellToRect( 0, col );
+            if ( rect.width > 0 )
+            {
+                CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
+                rect.y = 0;
+                rect.height = m_colLabelHeight;
+                m_colLabelWin->Refresh( true, &rect );
+            }
         }
     }
 }
 
         }
     }
 }
 
-
-//
-// ------ Grid cursor movement functions
-//
-
-bool wxGrid::MoveCursorUp()
+void wxGrid::SetGridLineColour( const wxColour& colour )
 {
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() > 0 )
+    if ( m_gridLineColour != colour )
     {
     {
-        MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
-
-        SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
+        m_gridLineColour = colour;
 
 
-        return TRUE;
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        DrawAllGridLines( dc, wxRegion() );
     }
     }
-
-    return FALSE;
 }
 
 
 }
 
 
-bool wxGrid::MoveCursorDown()
+void wxGrid::SetCellHighlightColour( const wxColour& colour )
 {
 {
-    // TODO: allow for scrolling
-    //
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
+    if ( m_cellHighlightColour != colour )
     {
     {
-        MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
+        m_cellHighlightColour = colour;
 
 
-        SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
-
-        return TRUE;
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+        DrawCellHighlight(dc, attr);
+        attr->DecRef();
     }
     }
-
-    return FALSE;
 }
 
 }
 
-
-bool wxGrid::MoveCursorLeft()
+void wxGrid::SetCellHighlightPenWidth(int width)
 {
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
-    {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
-
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
+    if (m_cellHighlightPenWidth != width) {
+        m_cellHighlightPenWidth = width;
 
 
-        return TRUE;
+        // Just redrawing the cell highlight is not enough since that won't
+        // make any visible change if the the thickness is getting smaller.
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+        wxRect rect = CellToRect(row, col);
+        m_gridWin->Refresh(true, &rect);
     }
     }
-
-    return FALSE;
 }
 
 }
 
-
-bool wxGrid::MoveCursorRight()
+void wxGrid::SetCellHighlightROPenWidth(int width)
 {
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols - 1 )
-    {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
-
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
+    if (m_cellHighlightROPenWidth != width) {
+        m_cellHighlightROPenWidth = width;
 
 
-        return TRUE;
+        // Just redrawing the cell highlight is not enough since that won't
+        // make any visible change if the the thickness is getting smaller.
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+        wxRect rect = CellToRect(row, col);
+        m_gridWin->Refresh(true, &rect);
     }
     }
-
-    return FALSE;
 }
 
 }
 
-
-bool wxGrid::MovePageUp()
+void wxGrid::EnableGridLines( bool enable )
 {
 {
-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
-
-    int row = m_currentCellCoords.GetRow();
-    if ( row > 0 )
+    if ( enable != m_gridLinesEnabled )
     {
     {
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
+        m_gridLinesEnabled = enable;
 
 
-        int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
-        int newRow = YToRow( y - ch + 1 );
-        if ( newRow == -1 )
-        {
-            newRow = 0;
-        }
-        else if ( newRow == row )
+        if ( !GetBatchCount() )
         {
         {
-            newRow = row - 1;
+            if ( enable )
+            {
+                wxClientDC dc( m_gridWin );
+                PrepareDC( dc );
+                DrawAllGridLines( dc, wxRegion() );
+            }
+            else
+            {
+                m_gridWin->Refresh();
+            }
         }
         }
+    }
+}
 
 
-        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
-        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
 
-        return TRUE;
-    }
+int wxGrid::GetDefaultRowSize()
+{
+    return m_defaultRowHeight;
+}
+
+int wxGrid::GetRowSize( int row )
+{
+    wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
 
-    return FALSE;
+    return GetRowHeight(row);
 }
 
 }
 
-bool wxGrid::MovePageDown()
+int wxGrid::GetDefaultColSize()
 {
 {
-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+    return m_defaultColWidth;
+}
 
 
-    int row = m_currentCellCoords.GetRow();
-    if ( row < m_numRows )
-    {
-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
+int wxGrid::GetColSize( int col )
+{
+    wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 
 
-        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;
-        }
+    return GetColWidth(col);
+}
 
 
-        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
-        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
+// ============================================================================
+// access to the grid attributes: each of them has a default value in the grid
+// itself and may be overidden on a per-cell basis
+// ============================================================================
 
 
-        return TRUE;
-    }
+// ----------------------------------------------------------------------------
+// setting default attributes
+// ----------------------------------------------------------------------------
 
 
-    return FALSE;
+void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
+{
+    m_defaultCellAttr->SetBackgroundColour(col);
+#ifdef __WXGTK__
+    m_gridWin->SetBackgroundColour(col);
+#endif
 }
 
 }
 
-bool wxGrid::MoveCursorUpBlock()
+void wxGrid::SetDefaultCellTextColour( const wxColour& col )
 {
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() > 0 )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
+    m_defaultCellAttr->SetTextColour(col);
+}
 
 
-        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;
-                }
-            }
-        }
+void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
+{
+    m_defaultCellAttr->SetAlignment(horiz, vert);
+}
 
 
-        MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+void wxGrid::SetDefaultCellOverflow( bool allow )
+{
+    m_defaultCellAttr->SetOverflow(allow);
+}
+
+void wxGrid::SetDefaultCellFont( const wxFont& font )
+{
+    m_defaultCellAttr->SetFont(font);
+}
 
 
-        return TRUE;
-    }
 
 
-    return FALSE;
+// 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)
+{
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     renderer,
+                     GetDefaultEditorForType(wxGRID_VALUE_STRING));
 }
 
 }
 
-bool wxGrid::MoveCursorDownBlock()
+void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 {
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     GetDefaultRendererForType(wxGRID_VALUE_STRING),
+                     editor);
+}
 
 
-        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;
-                }
-            }
-        }
+// ----------------------------------------------------------------------------
+// access to the default attrbiutes
+// ----------------------------------------------------------------------------
 
 
-        MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+wxColour wxGrid::GetDefaultCellBackgroundColour()
+{
+    return m_defaultCellAttr->GetBackgroundColour();
+}
 
 
-        return TRUE;
-    }
+wxColour wxGrid::GetDefaultCellTextColour()
+{
+    return m_defaultCellAttr->GetTextColour();
+}
+
+wxFont wxGrid::GetDefaultCellFont()
+{
+    return m_defaultCellAttr->GetFont();
+}
 
 
-    return FALSE;
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+{
+    m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 
 }
 
-bool wxGrid::MoveCursorLeftBlock()
+bool wxGrid::GetDefaultCellOverflow()
 {
 {
-    if ( m_table &&
-         m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
-    {
-        int row = m_currentCellCoords.GetRow();
-        int col = m_currentCellCoords.GetCol();
+    return m_defaultCellAttr->GetOverflow();
+}
 
 
-        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) )
-        {
-            // starting at the left of a block: find the next block
-            //
-            col--;
-            while ( col > 0 )
-            {
-                col-- ;
-                if ( !(m_table->IsEmptyCell(row, col)) ) break;
-            }
-        }
-        else
-        {
-            // starting within a block: find the left of the block
-            //
-            while ( col > 0 )
-            {
-                col-- ;
-                if ( m_table->IsEmptyCell(row, col) )
-                {
-                    col++ ;
-                    break;
-                }
-            }
-        }
+wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
+{
+    return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
+}
 
 
-        MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+wxGridCellEditor *wxGrid::GetDefaultEditor() const
+{
+    return m_defaultCellAttr->GetEditor(NULL,0,0);
+}
 
 
-        return TRUE;
-    }
+// ----------------------------------------------------------------------------
+// access to cell attributes
+// ----------------------------------------------------------------------------
 
 
-    return FALSE;
+wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxColour colour = attr->GetBackgroundColour();
+    attr->DecRef();
+    return colour;
 }
 
 }
 
-bool wxGrid::MoveCursorRightBlock()
+wxColour wxGrid::GetCellTextColour( int row, int col )
 {
 {
-    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;
-                }
-            }
-        }
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxColour colour = attr->GetTextColour();
+    attr->DecRef();
+    return colour;
+}
 
 
-        MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+wxFont wxGrid::GetCellFont( int row, int col )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxFont font = attr->GetFont();
+    attr->DecRef();
+    return font;
+}
 
 
-        return TRUE;
-    }
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    attr->GetAlignment(horiz, vert);
+    attr->DecRef();
+}
 
 
-    return FALSE;
+bool wxGrid::GetCellOverflow( int row, int col )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    bool allow = attr->GetOverflow();
+    attr->DecRef();
+    return allow;
 }
 
 }
 
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    attr->GetSize( num_rows, num_cols );
+    attr->DecRef();
+}
 
 
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+{
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+    attr->DecRef();
 
 
-//
-// ------ Label values and formatting
-//
+    return renderer;
+}
 
 
-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
 {
 {
-    *horiz = m_rowLabelHorizAlign;
-    *vert  = m_rowLabelVertAlign;
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+    attr->DecRef();
+
+    return editor;
 }
 
 }
 
-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+bool wxGrid::IsReadOnly(int row, int col) const
 {
 {
-    *horiz = m_colLabelHorizAlign;
-    *vert  = m_colLabelVertAlign;
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    bool isReadOnly = attr->IsReadOnly();
+    attr->DecRef();
+    return isReadOnly;
 }
 
 }
 
-wxString wxGrid::GetRowLabelValue( int row )
+// ----------------------------------------------------------------------------
+// attribute support: cache, automatic provider creation, ...
+// ----------------------------------------------------------------------------
+
+bool wxGrid::CanHaveAttributes()
 {
 {
-    if ( m_table )
-    {
-        return m_table->GetRowLabelValue( row );
-    }
-    else
+    if ( !m_table )
     {
     {
-        wxString s;
-        s << row;
-        return s;
+        return false;
     }
     }
+
+    return m_table->CanHaveAttributes();
 }
 
 }
 
-wxString wxGrid::GetColLabelValue( int col )
+void wxGrid::ClearAttrCache()
 {
 {
-    if ( m_table )
+    if ( m_attrCache.row != -1 )
     {
     {
-        return m_table->GetColLabelValue( col );
+        wxSafeDecRef(m_attrCache.attr);
+        m_attrCache.attr = NULL;
+        m_attrCache.row = -1;
     }
     }
-    else
+}
+
+void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
+{
+    if ( attr != NULL )
     {
     {
-        wxString s;
-        s << col;
-        return s;
+        wxGrid *self = (wxGrid *)this;  // const_cast
+
+        self->ClearAttrCache();
+        self->m_attrCache.row = row;
+        self->m_attrCache.col = col;
+        self->m_attrCache.attr = attr;
+        wxSafeIncRef(attr);
     }
 }
 
     }
 }
 
-
-void wxGrid::SetRowLabelSize( int width )
+bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 {
 {
-    width = wxMax( width, 0 );
-    if ( width != m_rowLabelWidth )
+    if ( row == m_attrCache.row && col == m_attrCache.col )
     {
     {
-        if ( width == 0 )
-        {
-            m_rowLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
-        }
-        else if ( m_rowLabelWidth == 0 )
-        {
-            m_rowLabelWin->Show( TRUE );
-            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE );
-        }
+        *attr = m_attrCache.attr;
+        wxSafeIncRef(m_attrCache.attr);
 
 
-        m_rowLabelWidth = width;
-        CalcWindowSizes();
-        Refresh( TRUE );
+#ifdef DEBUG_ATTR_CACHE
+        gs_nAttrCacheHits++;
+#endif
+
+        return true;
+    }
+    else
+    {
+#ifdef DEBUG_ATTR_CACHE
+        gs_nAttrCacheMisses++;
+#endif
+        return false;
     }
 }
 
     }
 }
 
-
-void wxGrid::SetColLabelSize( int height )
+wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 {
 {
-    height = wxMax( height, 0 );
-    if ( height != m_colLabelHeight )
+    wxGridCellAttr *attr = NULL;
+    // Additional test to avoid looking at the cache e.g. for
+    // wxNoCellCoords, as this will confuse memory management.
+    if ( row >= 0 )
     {
     {
-        if ( height == 0 )
-        {
-            m_colLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
-        }
-        else if ( m_colLabelHeight == 0 )
+        if ( !LookupAttr(row, col, &attr) )
         {
         {
-            m_colLabelWin->Show( TRUE );
-            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE );
+            attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any)
+                           : (wxGridCellAttr *)NULL;
+            CacheAttr(row, col, attr);
         }
         }
-
-        m_colLabelHeight = height;
-        CalcWindowSizes();
-        Refresh( TRUE );
     }
     }
-}
+    if (attr)
+    {
+        attr->SetDefAttr(m_defaultCellAttr);
+    }
+    else
+    {
+        attr = m_defaultCellAttr;
+        attr->IncRef();
+    }
 
 
+    return attr;
+}
 
 
-void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
+wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
 {
-    if ( m_labelBackgroundColour != colour )
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    bool canHave = ((wxGrid*)this)->CanHaveAttributes();
+
+    wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed"));
+    wxCHECK_MSG( m_table, attr, _T("must have a table") );
+
+    attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
+    if ( !attr )
     {
     {
-        m_labelBackgroundColour = colour;
-        m_rowLabelWin->SetBackgroundColour( colour );
-        m_colLabelWin->SetBackgroundColour( colour );
-        m_cornerLabelWin->SetBackgroundColour( colour );
+        attr = new wxGridCellAttr(m_defaultCellAttr);
 
 
-        if ( !GetBatchCount() )
-        {
-            m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
-            m_cornerLabelWin->Refresh();
-        }
+        // artificially inc the ref count to match DecRef() in caller
+        attr->IncRef();
+        m_table->SetAttr(attr, row, col);
     }
     }
+
+    return attr;
 }
 
 }
 
-void wxGrid::SetLabelTextColour( const wxColour& colour )
+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetColFormatBool(int col)
 {
 {
-    if ( m_labelTextColour != colour )
-    {
-        m_labelTextColour = colour;
-        if ( !GetBatchCount() )
-        {
-            m_rowLabelWin->Refresh();
-            m_colLabelWin->Refresh();
-        }
-    }
+    SetColFormatCustom(col, wxGRID_VALUE_BOOL);
 }
 
 }
 
-void wxGrid::SetLabelFont( const wxFont& font )
+void wxGrid::SetColFormatNumber(int col)
 {
 {
-    m_labelFont = font;
-    if ( !GetBatchCount() )
+    SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
+}
+
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
+{
+    wxString typeName = wxGRID_VALUE_FLOAT;
+    if ( (width != -1) || (precision != -1) )
     {
     {
-        m_rowLabelWin->Refresh();
-        m_colLabelWin->Refresh();
+        typeName << _T(':') << width << _T(',') << precision;
     }
     }
+
+    SetColFormatCustom(col, typeName);
 }
 
 }
 
-void wxGrid::SetRowLabelAlignment( int horiz, int vert )
+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);
+
+    SetColAttr(col, attr);
+
+}
+
+// ----------------------------------------------------------------------------
+// setting cell attributes: this is forwarded to the table
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr)
 {
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    if ( CanHaveAttributes() )
     {
     {
-        m_rowLabelHorizAlign = horiz;
+        m_table->SetAttr(attr, row, col);
+        ClearAttrCache();
     }
     }
-
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    else
     {
     {
-        m_rowLabelVertAlign = vert;
+        wxSafeDecRef(attr);
     }
     }
+}
 
 
-    if ( !GetBatchCount() )
+void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
+{
+    if ( CanHaveAttributes() )
     {
     {
-        m_rowLabelWin->Refresh();
+        m_table->SetRowAttr(attr, row);
+        ClearAttrCache();
+    }
+    else
+    {
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
-void wxGrid::SetColLabelAlignment( int horiz, int vert )
+void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
 {
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    if ( CanHaveAttributes() )
     {
     {
-        m_colLabelHorizAlign = horiz;
+        m_table->SetColAttr(attr, col);
+        ClearAttrCache();
     }
     }
-
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    else
     {
     {
-        m_colLabelVertAlign = vert;
+        wxSafeDecRef(attr);
     }
     }
+}
 
 
-    if ( !GetBatchCount() )
+void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour )
+{
+    if ( CanHaveAttributes() )
     {
     {
-        m_colLabelWin->Refresh();
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetBackgroundColour(colour);
+        attr->DecRef();
     }
 }
 
     }
 }
 
-void wxGrid::SetRowLabelValue( int row, const wxString& s )
+void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour )
 {
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
     {
-        m_table->SetRowLabelValue( row, s );
-        if ( !GetBatchCount() )
-        {
-            wxRect rect = CellToRect( row, 0);
-            if ( rect.height > 0 )
-            {
-                CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
-                rect.x = m_left;
-                rect.width = m_rowLabelWidth;
-                m_rowLabelWin->Refresh( TRUE, &rect );
-            }
-        }
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetTextColour(colour);
+        attr->DecRef();
     }
 }
 
     }
 }
 
-void wxGrid::SetColLabelValue( int col, const wxString& s )
+void wxGrid::SetCellFont( int row, int col, const wxFont& font )
 {
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
     {
-        m_table->SetColLabelValue( col, s );
-        if ( !GetBatchCount() )
-        {
-            wxRect rect = CellToRect( 0, col );
-            if ( rect.width > 0 )
-            {
-                CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
-                rect.y = m_top;
-                rect.height = m_colLabelHeight;
-                m_colLabelWin->Refresh( TRUE, &rect );
-            }
-        }
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetFont(font);
+        attr->DecRef();
     }
 }
 
     }
 }
 
-void wxGrid::SetGridLineColour( const wxColour& colour )
+void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
 {
 {
-    if ( m_gridLineColour != colour )
+    if ( CanHaveAttributes() )
     {
     {
-        m_gridLineColour = colour;
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetAlignment(horiz, vert);
+        attr->DecRef();
+    }
+}
 
 
-        wxClientDC dc( m_gridWin );
-        PrepareDC( dc );
-        DrawAllGridLines( dc, wxRegion() );
+void wxGrid::SetCellOverflow( int row, int col, bool allow )
+{
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetOverflow(allow);
+        attr->DecRef();
     }
 }
 
     }
 }
 
-void wxGrid::EnableGridLines( bool enable )
+void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
 {
 {
-    if ( enable != m_gridLinesEnabled )
+    if ( CanHaveAttributes() )
     {
     {
-        m_gridLinesEnabled = enable;
+        int cell_rows, cell_cols;
 
 
-        if ( !GetBatchCount() )
+        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_rows > 1))
         {
         {
-            if ( enable )
+            int i, j;
+            for (j=row; j<row+cell_rows; j++)
             {
             {
-                wxClientDC dc( m_gridWin );
-                PrepareDC( dc );
-                DrawAllGridLines( dc, wxRegion() );
+                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();
+                    }
+                }
             }
             }
-            else
+        }
+
+        // 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++)
             {
             {
-                m_gridWin->Refresh();
+                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();
+                    }
+                }
             }
         }
     }
 }
 
             }
         }
     }
 }
 
-
-int wxGrid::GetDefaultRowSize()
-{
-    return m_defaultRowHeight;
-}
-
-int wxGrid::GetRowSize( int row )
+void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
 {
 {
-    wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
-
-    return m_rowHeights[row];
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetRenderer(renderer);
+        attr->DecRef();
+    }
 }
 
 }
 
-int wxGrid::GetDefaultColSize()
+void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor)
 {
 {
-    return m_defaultColWidth;
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetEditor(editor);
+        attr->DecRef();
+    }
 }
 
 }
 
-int wxGrid::GetColSize( int col )
+void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
 {
 {
-    wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
-
-    return m_colWidths[col];
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetReadOnly(isReadOnly);
+        attr->DecRef();
+    }
 }
 
 }
 
-// ============================================================================
-// access to the grid attributes: each of them has a default value in the grid
-// itself and may be overidden on a per-cell basis
-// ============================================================================
-
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// setting default attributes
+// Data type registration
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
-{
-    m_defaultCellAttr->SetBackgroundColour(col);
-}
-
-void wxGrid::SetDefaultCellTextColour( const wxColour& col )
+void wxGrid::RegisterDataType(const wxString& typeName,
+                              wxGridCellRenderer* renderer,
+                              wxGridCellEditor* editor)
 {
 {
-    m_defaultCellAttr->SetTextColour(col);
+    m_typeRegistry->RegisterDataType(typeName, renderer, editor);
 }
 
 }
 
-void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
-{
-    m_defaultCellAttr->SetAlignment(horiz, vert);
-}
 
 
-void wxGrid::SetDefaultCellFont( const wxFont& font )
+wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
 {
 {
-    m_defaultCellAttr->SetFont(font);
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultEditorForType(typeName);
 }
 
 }
 
-void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
+wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
 {
 {
-    m_defaultCellAttr->SetRenderer(renderer);
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultRendererForType(typeName);
 }
 
 }
 
-void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
+wxGridCellEditor*
+wxGrid::GetDefaultEditorForType(const wxString& typeName) const
 {
 {
-    m_defaultCellAttr->SetEditor(editor);
-}
-
-// ----------------------------------------------------------------------------
-// access to the default attrbiutes
-// ----------------------------------------------------------------------------
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
 
 
-wxColour wxGrid::GetDefaultCellBackgroundColour()
-{
-    return m_defaultCellAttr->GetBackgroundColour();
-}
+        return NULL;
+    }
 
 
-wxColour wxGrid::GetDefaultCellTextColour()
-{
-    return m_defaultCellAttr->GetTextColour();
+    return m_typeRegistry->GetEditor(index);
 }
 
 }
 
-wxFont wxGrid::GetDefaultCellFont()
+wxGridCellRenderer*
+wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
 {
-    return m_defaultCellAttr->GetFont();
-}
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
 
 
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
-{
-    m_defaultCellAttr->GetAlignment(horiz, vert);
-}
+        return NULL;
+    }
 
 
-wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
-{
-    return m_defaultCellAttr->GetRenderer();
+    return m_typeRegistry->GetRenderer(index);
 }
 
 }
 
-wxGridCellEditor *wxGrid::GetDefaultEditor() const
-{
-    return m_defaultCellAttr->GetEditor();
-}
 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
-// access to cell attributes
+// row/col size
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
-{
-    wxGridCellAttr *attr = GetCellAttr(row, col);
-    wxColour colour = attr->GetBackgroundColour();
-    attr->SafeDecRef();
-    return colour;
-}
-
-wxColour wxGrid::GetCellTextColour( int row, int col )
+void wxGrid::EnableDragRowSize( bool enable )
 {
 {
-    wxGridCellAttr *attr = GetCellAttr(row, col);
-    wxColour colour = attr->GetTextColour();
-    attr->SafeDecRef();
-    return colour;
+    m_canDragRowSize = enable;
 }
 
 }
 
-wxFont wxGrid::GetCellFont( int row, int col )
-{
-    wxGridCellAttr *attr = GetCellAttr(row, col);
-    wxFont font = attr->GetFont();
-    attr->SafeDecRef();
-    return font;
-}
 
 
-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::EnableDragColSize( bool enable )
 {
 {
-    wxGridCellAttr *attr = GetCellAttr(row, col);
-    attr->GetAlignment(horiz, vert);
-    attr->SafeDecRef();
+    m_canDragColSize = enable;
 }
 
 }
 
-wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+void wxGrid::EnableDragGridSize( bool enable )
 {
 {
-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    wxGridCellRenderer* renderer = attr->GetRenderer();
-    attr->DecRef();
-    return renderer;
+    m_canDragGridSize = enable;
 }
 
 }
 
-wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+void wxGrid::EnableDragCell( bool enable )
 {
 {
-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    wxGridCellEditor* editor = attr->GetEditor();
-    attr->DecRef();
-    return editor;
+    m_canDragCell = enable;
 }
 
 }
 
-bool wxGrid::IsReadOnly(int row, int col) const
+void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
 {
-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    bool isReadOnly = attr->IsReadOnly();
-    attr->DecRef();
-    return isReadOnly;
-}
+    m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight );
 
 
-// ----------------------------------------------------------------------------
-// attribute support: cache, automatic provider creation, ...
-// ----------------------------------------------------------------------------
+    if ( resizeExistingRows )
+    {
+        // 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();
+    }
+}
 
 
-bool wxGrid::CanHaveAttributes()
+void wxGrid::SetRowSize( int row, int height )
 {
 {
-    if ( !m_table )
+    wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+
+    // See comment in SetColSize
+    if ( height < GetRowMinimalAcceptableHeight()) { return; }
+
+    if ( m_rowHeights.IsEmpty() )
     {
     {
-        return FALSE;
+        // need to really create the array
+        InitRowHeights();
     }
 
     }
 
-    // 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() )
+    int h = wxMax( 0, height );
+    int diff = h - m_rowHeights[row];
+
+    m_rowHeights[row] = h;
+    int i;
+    for ( i = row;  i < m_numRows;  i++ )
     {
     {
-        // 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);
+        m_rowBottoms[i] += diff;
     }
     }
-
-    return TRUE;
+    if ( !GetBatchCount() )
+        CalcDimensions();
 }
 
 }
 
-void wxGrid::ClearAttrCache()
+void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {
 {
-    if ( m_attrCache.row != -1 )
+    m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
+
+    if ( resizeExistingCols )
     {
     {
-        m_attrCache.attr->SafeDecRef();
-        m_attrCache.row = -1;
+        // 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();
     }
 }
 
     }
 }
 
-void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
+void wxGrid::SetColSize( int col, int width )
 {
 {
-    wxGrid *self = (wxGrid *)this;  // const_cast
+    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 
 
-    self->ClearAttrCache();
-    self->m_attrCache.row = row;
-    self->m_attrCache.col = col;
-    self->m_attrCache.attr = attr;
-    attr->SafeIncRef();
-}
+    // should we check that it's bigger than GetColMinimalWidth(col) here?
+    //                                                                 (VZ)
+    // No, because it is reasonable to assume the library user know's
+    // what he is doing. However whe should test against the weaker
+    // constariant of minimalAcceptableWidth, as this breaks rendering
+    //
+    // This test then fixes sf.net bug #645734
 
 
-bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
-{
-    if ( row == m_attrCache.row && col == m_attrCache.col )
-    {
-        *attr = m_attrCache.attr;
-        (*attr)->SafeIncRef();
+    if ( width < GetColMinimalAcceptableWidth()) { return; }
 
 
-#ifdef DEBUG_ATTR_CACHE
-        gs_nAttrCacheHits++;
-#endif
+    if ( m_colWidths.IsEmpty() )
+    {
+        // need to really create the array
+        InitColWidths();
+    }
 
 
-        return TRUE;
+    // if < 0 calc new width from label
+    if( width < 0 )
+    {
+      long w, h;
+      wxArrayString lines;
+      wxClientDC dc(m_colLabelWin);
+      dc.SetFont(GetLabelFont());
+      StringToLines(GetColLabelValue(col), lines);
+      GetTextBoxSize(dc, lines, &w, &h);
+      width = w + 6;
     }
     }
-    else
+    int w = wxMax( 0, width );
+    int diff = w - m_colWidths[col];
+    m_colWidths[col] = w;
+
+    int i;
+    for ( i = col;  i < m_numCols;  i++ )
     {
     {
-#ifdef DEBUG_ATTR_CACHE
-        gs_nAttrCacheMisses++;
-#endif
-        return FALSE;
+        m_colRights[i] += diff;
     }
     }
+    if ( !GetBatchCount() )
+        CalcDimensions();
 }
 
 }
 
-wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
+
+void wxGrid::SetColMinimalWidth( int col, int width )
 {
 {
-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) )
-    {
-        attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
-        CacheAttr(row, col, attr);
+    if (width > GetColMinimalAcceptableWidth()) {
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+        m_colMinWidths[key] = width;
     }
     }
-    if (attr) {
-        attr->SetDefAttr(m_defaultCellAttr);
-    } else {
-        attr = m_defaultCellAttr;
-        attr->IncRef();
+}
+
+void wxGrid::SetRowMinimalHeight( int row, int width )
+{
+    if (width > GetRowMinimalAcceptableHeight()) {
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+        m_rowMinHeights[key] = width;
     }
     }
+}
 
 
-    return attr;
+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;
 }
 
 }
 
-wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
+int wxGrid::GetRowMinimalHeight(int row) const
 {
 {
-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) || !attr )
-    {
-        wxASSERT_MSG( m_table,
-                      _T("we may only be called if CanHaveAttributes() "
-                         "returned TRUE and then m_table should be !NULL") );
+    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;
+}
 
 
-        attr = m_table->GetAttr(row, col);
-        if ( !attr )
-        {
-            attr = new wxGridCellAttr;
+void wxGrid::SetColMinimalAcceptableWidth( int width )
+{
+    // We do allow a width of 0 since this gives us
+    // an easy way to temporarily hidding columns.
+    if ( width<0 )
+        return;
+    m_minAcceptableColWidth = width;
+}
 
 
-            // artificially inc the ref count to match DecRef() in caller
-            attr->IncRef();
+void wxGrid::SetRowMinimalAcceptableHeight( int height )
+{
+    // We do allow a height of 0 since this gives us
+    // an easy way to temporarily hidding rows.
+    if ( height<0 )
+        return;
+    m_minAcceptableRowHeight = height;
+};
 
 
-            m_table->SetAttr(attr, row, col);
-        }
+int  wxGrid::GetColMinimalAcceptableWidth() const
+{
+    return m_minAcceptableColWidth;
+}
 
 
-        CacheAttr(row, col, attr);
-    }
-    attr->SetDefAttr(m_defaultCellAttr);
-    return attr;
+int  wxGrid::GetRowMinimalAcceptableHeight() const
+{
+    return m_minAcceptableRowHeight;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// setting cell attributes: this is forwarded to the table
+// auto sizing
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
+void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 {
 {
-    if ( CanHaveAttributes() )
-    {
-        m_table->SetRowAttr(attr, row);
-    }
+    wxClientDC dc(m_gridWin);
+
+    //Cancel editting of cell
+    HideCellEditControl();
+    SaveEditControlValue();
+
+    // init both of them to avoid compiler warnings, even if weo nly need one
+    int row = -1,
+        col = -1;
+    if ( column )
+        col = colOrRow;
     else
     else
+        row = colOrRow;
+
+    wxCoord extent, extentMax = 0;
+    int max = column ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
     {
     {
-        attr->SafeDecRef();
+        if ( column )
+            row = rowOrCol;
+        else
+            col = rowOrCol;
+
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        if ( renderer )
+        {
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+            if ( extent > extentMax )
+            {
+                extentMax = extent;
+            }
+
+            renderer->DecRef();
+        }
+
+        attr->DecRef();
     }
     }
-}
 
 
-void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
-{
-    if ( CanHaveAttributes() )
+    // now also compare with the column label extent
+    wxCoord w, h;
+    dc.SetFont( GetLabelFont() );
+
+    if ( column )
     {
     {
-        m_table->SetColAttr(attr, col);
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+        if( GetColLabelTextOrientation() == wxVERTICAL )
+            w = h;
     }
     else
     }
     else
+        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+
+    extent = column ? w : h;
+    if ( extent > extentMax )
     {
     {
-        attr->SafeDecRef();
+        extentMax = extent;
     }
     }
-}
 
 
-void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour )
-{
-    if ( CanHaveAttributes() )
+    if ( !extentMax )
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetBackgroundColour(colour);
-        attr->DecRef();
+        // 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;
     }
     }
-}
-
-void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour )
-{
-    if ( CanHaveAttributes() )
+    else
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetTextColour(colour);
-        attr->DecRef();
+        if ( column )
+        {
+            // leave some space around text
+            extentMax += 10;
+        }
+        else
+        {
+            extentMax += 6;
+        }
     }
     }
-}
 
 
-void wxGrid::SetCellFont( int row, int col, const wxFont& font )
-{
-    if ( CanHaveAttributes() )
+    if ( column )
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetFont(font);
-        attr->DecRef();
+        SetColSize(col, extentMax);
+        if ( !GetBatchCount() )
+        {
+            int cw, ch, dummy;
+            m_gridWin->GetClientSize( &cw, &ch );
+            wxRect rect ( CellToRect( 0, col ) );
+            rect.y = 0;
+            CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+            rect.width = cw - rect.x;
+            rect.height = m_colLabelHeight;
+            m_colLabelWin->Refresh( true, &rect );
+        }
     }
     }
-}
-
-void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
-{
-    if ( CanHaveAttributes() )
+    else
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetAlignment(horiz, vert);
-        attr->DecRef();
+        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 );
+        }
     }
     }
-}
-
-void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
-{
-    if ( CanHaveAttributes() )
+    if ( setAsMin )
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetRenderer(renderer);
-        attr->DecRef();
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);
     }
 }
 
     }
 }
 
-void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor)
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
 {
-    if ( CanHaveAttributes() )
+    int width = m_rowLabelWidth;
+
+    if ( !calcOnly )
+        BeginBatch();
+
+    for ( int col = 0; col < m_numCols; col++ )
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetEditor(editor);
-        attr->DecRef();
+        if ( !calcOnly )
+        {
+            AutoSizeColumn(col, setAsMin);
+        }
+
+        width += GetColWidth(col);
     }
     }
+
+    if ( !calcOnly )
+        EndBatch();
+
+    return width;
 }
 
 }
 
-void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
 {
-    if ( CanHaveAttributes() )
+    int height = m_colLabelHeight;
+
+    if ( !calcOnly )
+        BeginBatch();
+
+    for ( int row = 0; row < m_numRows; row++ )
     {
     {
-        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
-        attr->SetReadOnly(isReadOnly);
-        attr->DecRef();
+        if ( !calcOnly )
+        {
+            AutoSizeRow(row, setAsMin);
+        }
+
+        height += GetRowHeight(row);
     }
     }
-}
 
 
-// ----------------------------------------------------------------------------
-// row/col size
-// ----------------------------------------------------------------------------
+    if ( !calcOnly )
+        EndBatch();
 
 
-void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
+    return height;
+}
+
+void wxGrid::AutoSize()
 {
 {
-    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
+    BeginBatch();
 
 
-    if ( resizeExistingRows )
+    wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));
+
+    // round up the size to a multiple of scroll step - this ensures that we
+    // won't get the scrollbars if we're sized exactly to this width
+    // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
+    // scrollbar steps
+    wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * m_scrollLineX,
+                   GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY);
+
+    // distribute the extra space between the columns/rows to avoid having
+    // extra white space
+
+    // Remove the extra m_extraWidth + 1 added above
+    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+    if ( diff && m_numCols )
     {
     {
-        int row;
-        int bottom = 0;
-        for ( row = 0;  row < m_numRows;  row++ )
+        // try to resize the columns uniformly
+        wxCoord diffPerCol = diff / m_numCols;
+        if ( diffPerCol )
         {
         {
-            m_rowHeights[row] = m_defaultRowHeight;
-            bottom += m_defaultRowHeight;
-            m_rowBottoms[row] = bottom;
+            for ( int col = 0; col < m_numCols; col++ )
+            {
+                SetColSize(col, GetColWidth(col) + diffPerCol);
+            }
+        }
+
+        // add remaining amount to the last columns
+        diff -= diffPerCol * m_numCols;
+        if ( diff )
+        {
+            for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- )
+            {
+                SetColSize(col, GetColWidth(col) + 1);
+            }
         }
         }
-        CalcDimensions();
     }
     }
-}
 
 
-void wxGrid::SetRowSize( int row, int height )
-{
-    wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+    // same for rows
+    diff = sizeFit.y - size.y - (m_extraHeight + 1);
+    if ( diff && m_numRows )
+    {
+        // try to resize the columns uniformly
+        wxCoord diffPerRow = diff / m_numRows;
+        if ( diffPerRow )
+        {
+            for ( int row = 0; row < m_numRows; row++ )
+            {
+                SetRowSize(row, GetRowHeight(row) + diffPerRow);
+            }
+        }
 
 
-    int i;
+        // add remaining amount to the last rows
+        diff -= diffPerRow * m_numRows;
+        if ( diff )
+        {
+            for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- )
+            {
+                SetRowSize(row, GetRowHeight(row) + 1);
+            }
+        }
+    }
 
 
-    int h = wxMax( 0, height );
-    int diff = h - m_rowHeights[row];
+    EndBatch();
+
+    SetClientSize(sizeFit);
+}
+
+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+    wxArrayString lines;
+    long w, h;
 
 
-    m_rowHeights[row] = h;
-    for ( i = row;  i < m_numRows;  i++ )
+    // Hide the edit control, so it
+    // won't interfer with drag-shrinking.
+    if( IsCellEditControlShown() )
     {
     {
-        m_rowBottoms[i] += diff;
+        HideCellEditControl();
+        SaveEditControlValue();
     }
     }
-    CalcDimensions();
+
+    // autosize row height depending on label text
+    StringToLines( GetRowLabelValue( row ), lines );
+    wxClientDC dc( m_rowLabelWin );
+    GetTextBoxSize( dc, lines, &w, &h);
+    if( h < m_defaultRowHeight )
+        h = m_defaultRowHeight;
+    SetRowSize(row, h);
+    ForceRefresh();
 }
 
 }
 
-void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
+void wxGrid::AutoSizeColLabelSize( int col )
 {
 {
-    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+    wxArrayString lines;
+    long w, h;
 
 
-    if ( resizeExistingCols )
+    // Hide the edit control, so it
+    // won't interfer with drag-shrinking.
+    if( IsCellEditControlShown() )
     {
     {
-        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();
+        HideCellEditControl();
+        SaveEditControlValue();
     }
     }
+
+    // autosize column width depending on label text
+    StringToLines( GetColLabelValue( col ), lines );
+    wxClientDC dc( m_colLabelWin );
+    if( GetColLabelTextOrientation() == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &w, &h);
+    else
+        GetTextBoxSize( dc, lines, &h, &w);
+    if( w < m_defaultColWidth )
+        w = m_defaultColWidth;
+    SetColSize(col, w);
+    ForceRefresh();
 }
 
 }
 
-void wxGrid::SetColSize( int col, int width )
+wxSize wxGrid::DoGetBestSize() const
 {
 {
-    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
+    // don't set sizes, only calculate them
+    wxGrid *self = (wxGrid *)this;  // const_cast
 
 
-    int i;
+    int width, height;
+    width = self->SetOrCalcColumnSizes(true);
+    height = self->SetOrCalcRowSizes(true);
 
 
-    int w = wxMax( 0, width );
-    int diff = w - m_colWidths[col];
-    m_colWidths[col] = w;
+    if (!width) width=100;
+    if (!height) height=80;
 
 
-    for ( i = col;  i < m_numCols;  i++ )
-    {
-        m_colRights[i] += diff;
-    }
-    CalcDimensions();
+    // Round up to a multiple the scroll rate NOTE: this still doesn't get rid
+    // of the scrollbars, is there any magic incantaion for that?
+    int xpu, ypu;
+    GetScrollPixelsPerUnit(&xpu, &ypu);
+    if (xpu)
+        width  += 1 + xpu - (width  % xpu);
+    if (ypu)
+        height += 1 + ypu - (height % ypu);
+
+    // limit to 1/4 of the screen size
+    int maxwidth, maxheight;
+    wxDisplaySize( & maxwidth, & maxheight );
+    maxwidth /= 2;
+    maxheight /= 2;
+    if ( width > maxwidth ) width = maxwidth;
+    if ( height > maxheight ) height = maxheight;
+
+
+    wxSize best(width, height);
+    // NOTE: This size should be cached, but first we need to add calls to
+    // InvalidateBestSize everywhere that could change the results of this
+    // calculation.
+    // CacheBestSize(size);
+    return best;
+}
+
+void wxGrid::Fit()
+{
+    AutoSize();
 }
 
 
 }
 
 
-//
-// ------ cell value accessor functions
-//
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
     if ( m_table )
     {
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
     if ( m_table )
     {
-        m_table->SetValue( row, col, s.c_str() );
+        m_table->SetValue( row, col, s );
         if ( !GetBatchCount() )
         {
         if ( !GetBatchCount() )
         {
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            DrawCell( dc, wxGridCellCoords(row, col) );
+            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 0  // TODO: edit in place
-
         if ( m_currentCellCoords.GetRow() == row &&
         if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col )
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlShown())
+             // Note: If we are using IsCellEditControlEnabled,
+             // this interacts badly with calling SetCellValue from
+             // an EVT_GRID_CELL_CHANGE handler.
         {
         {
-            SetEditControlValue( s );
+            HideCellEditControl();
+            ShowCellEditControl(); // will reread data from table
         }
         }
-#endif
-
     }
 }
 
     }
 }
 
@@ -5729,304 +10135,146 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
-    wxRect r;
-
-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
-
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
-        if ( oldTop > row )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
-        }
-
-        if ( oldLeft > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
-
-            m_selectedTopLeft.SetCol( 0 );
-        }
-
-        if ( oldBottom < row )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( 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 );
-        }
-
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-    else
-    {
-        r = SelectionToDeviceRect();
+    if ( IsSelection() && !addToSelected )
         ClearSelection();
         ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
-
-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
-    }
-
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
 
 
-    GetEventHandler()->ProcessEvent(gridEvt);
+    if ( m_selection )
+        m_selection->SelectRow( row, false, addToSelected );
 }
 
 
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
 }
 
 
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();
 
 
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    if ( m_selection )
+        m_selection->SelectCol( col, false, addToSelected );
+}
 
 
-        if ( oldLeft > col )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldLeft - 1 ) );
-            m_selectedTopLeft.SetCol( col );
-        }
 
 
-        if ( oldTop  > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            oldRight ) );
-            m_selectedTopLeft.SetRow( 0 );
-        }
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+                          bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();
 
 
-        if ( oldRight < col )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            col            ) );
-            m_selectedBottomRight.SetCol( col );
-        }
+    if ( m_selection )
+        m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+                                  false, addToSelected );
+}
 
 
-        if ( oldBottom < m_numRows - 1 )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldRight ) );
-            m_selectedBottomRight.SetRow( m_numRows - 1 );
-        }
 
 
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-    else
+void wxGrid::SelectAll()
+{
+    if ( m_numRows > 0 && m_numCols > 0 )
     {
     {
-        wxRect r;
-
-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
-
-        m_selectedTopLeft.Set( 0, col );
-        m_selectedBottomRight.Set( m_numRows-1, col );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
+        if ( m_selection )
+            m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
     }
     }
-
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
-
-    GetEventHandler()->ProcessEvent(gridEvt);
 }
 
 }
 
+//
+// ------ Cell, row and col deselection
+//
 
 
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::DeselectRow( int row )
 {
 {
-    int temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
-
-    if ( topRow > bottomRow )
-    {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
-    }
+    if ( !m_selection )
+        return;
 
 
-    if ( leftCol > rightCol )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
     {
     {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
+        if ( m_selection->IsInSelection(row, 0 ) )
+            m_selection->ToggleCellSelection( row, 0);
     }
     }
-
-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
-    if ( m_selectedTopLeft != updateTopLeft ||
-         m_selectedBottomRight != updateBottomRight )
+    else
     {
     {
-        // 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;
-
-        // Store intermediate values
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
-        // Determine the outer/inner coordinates.
-        if (oldLeft > leftCol)
-        {
-            temp = oldLeft;
-            oldLeft = leftCol;
-            leftCol = temp;
-        }
-        if (oldTop > topRow )
-        {
-            temp = oldTop;
-            oldTop = topRow;
-            topRow = temp;
-        }
-        if (oldRight < rightCol )
-        {
-            temp = oldRight;
-            oldRight = rightCol;
-            rightCol = temp;
-        }
-        if (oldBottom < bottomRow)
-        {
-            temp = oldBottom;
-            oldBottom = bottomRow;
-            bottomRow = temp;
-        }
-
-        // 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 )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
-        }
-
-        if ( oldTop  < topRow )
+        int nCols = GetNumberCols();
+        for ( int i = 0; i < nCols ; i++ )
         {
         {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
+            if ( m_selection->IsInSelection(row, i ) )
+                m_selection->ToggleCellSelection( row, i);
         }
         }
+    }
+}
 
 
-        if ( oldRight > rightCol )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
-        }
+void wxGrid::DeselectCol( int col )
+{
+    if ( !m_selection )
+        return;
 
 
-        if ( oldBottom > bottomRow )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+    {
+        if ( m_selection->IsInSelection(0, col ) )
+            m_selection->ToggleCellSelection( 0, col);
+    }
+    else
+    {
+        int nRows = GetNumberRows();
+        for ( int i = 0; i < nRows ; i++ )
         {
         {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
+            if ( m_selection->IsInSelection(i, col ) )
+                m_selection->ToggleCellSelection(i, col);
         }
         }
-
-
-        // Change Selection
-        m_selectedTopLeft = updateTopLeft;
-        m_selectedBottomRight = updateBottomRight;
-
-        // various Refresh() calls
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
     }
     }
+}
 
 
-    // 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 )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        EVT_GRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
+void wxGrid::DeselectCell( int row, int col )
+{
+    if ( m_selection && m_selection->IsInSelection(row, col) )
+        m_selection->ToggleCellSelection(row, col);
+}
 
 
-        GetEventHandler()->ProcessEvent(gridEvt);
-    }
+bool wxGrid::IsSelection()
+{
+    return ( m_selection && (m_selection->IsSelection() ||
+             ( m_selectingTopLeft != wxGridNoCellCoords &&
+               m_selectingBottomRight != wxGridNoCellCoords) ) );
 }
 
 }
 
-void wxGrid::SelectAll()
+bool wxGrid::IsInSelection( int row, int col ) const
 {
 {
-    m_selectedTopLeft.Set( 0, 0 );
-    m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+    return ( m_selection && (m_selection->IsInSelection( row, col ) ||
+             ( row >= m_selectingTopLeft.GetRow() &&
+               col >= m_selectingTopLeft.GetCol() &&
+               row <= m_selectingBottomRight.GetRow() &&
+               col <= m_selectingBottomRight.GetCol() )) );
+}
 
 
-    m_gridWin->Refresh();
+wxGridCellCoordsArray wxGrid::GetSelectedCells() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_cellSelection;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_blockSelectionTopLeft;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_blockSelectionBottomRight;
+}
+wxArrayInt wxGrid::GetSelectedRows() const
+{
+    if (!m_selection) { wxArrayInt a; return a; }
+    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;
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;
+    if ( m_selection )
+        m_selection->ClearSelection();
 }
 
 
 }
 
 
@@ -6046,7 +10294,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     }
     else
     {
     }
     else
     {
-        rect = wxRect( 0, 0, 0, 0 );
+        rect = wxRect(0,0,0,0);
     }
 
     cellRect = CellToRect( bottomRight );
     }
 
     cellRect = CellToRect( bottomRight );
@@ -6059,15 +10307,70 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
         return wxGridNoCellRect;
     }
 
         return wxGridNoCellRect;
     }
 
+    int i, j;
+    int left = rect.GetLeft();
+    int top = rect.GetTop();
+    int right = rect.GetRight();
+    int bottom = rect.GetBottom();
+
+    int leftCol = topLeft.GetCol();
+    int topRow = topLeft.GetRow();
+    int rightCol = bottomRight.GetCol();
+    int bottomRow = bottomRight.GetRow();
+
+    if (left > right)
+    {
+        i = left;
+        left = right;
+        right = i;
+        i = leftCol;
+        leftCol=rightCol;
+        rightCol = i;
+    }
+
+    if (top > bottom)
+    {
+        i = top;
+        top = bottom;
+        bottom = i;
+        i = topRow;
+        topRow = bottomRow;
+        bottomRow = i;
+    }
+
+
+    for ( j = topRow; j <= bottomRow; j++ )
+    {
+        for ( i = leftCol; i <= rightCol; i++ )
+        {
+            if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol))
+            {
+                cellRect = CellToRect( j, i );
+
+                if (cellRect.x < left)
+                    left = cellRect.x;
+                if (cellRect.y < top)
+                    top = cellRect.y;
+                if (cellRect.x + cellRect.width > right)
+                    right = cellRect.x + cellRect.width;
+                if (cellRect.y + cellRect.height > bottom)
+                    bottom = cellRect.y + cellRect.height;
+            }
+            else i = rightCol; // jump over inner cells.
+        }
+    }
+
     // convert to scrolled coords
     //
     // convert to scrolled coords
     //
-    int left, top, right, bottom;
-    CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
-    CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+    CalcScrolledPosition( left, top, &left, &top );
+    CalcScrolledPosition( right, bottom, &right, &bottom );
 
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
 
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
+    if (right < 0 || bottom < 0 || left > cw || top > ch)
+        return wxRect(0,0,0,0);
+
     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );
     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );
@@ -6076,16 +10379,14 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     return rect;
 }
 
     return rect;
 }
 
-
-
 //
 // ------ Grid event classes
 //
 
 //
 // ------ 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 )
         : wxNotifyEvent( type, id )
 {
                           bool control, bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {
@@ -6093,6 +10394,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
     m_col = col;
     m_x = x;
     m_y = y;
     m_col = col;
     m_x = x;
     m_y = y;
+    m_selecting = sel;
     m_control = control;
     m_shift = shift;
     m_alt = alt;
     m_control = control;
     m_shift = shift;
     m_alt = alt;
@@ -6102,7 +10404,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* 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,
 
 wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
                                   int rowOrCol, int x, int y,
@@ -6121,16 +10423,18 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* 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 )
+                                               bool sel, bool control,
+                                               bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {
     m_topLeft     = topLeft;
     m_bottomRight = bottomRight;
         : wxNotifyEvent( type, id )
 {
     m_topLeft     = topLeft;
     m_bottomRight = bottomRight;
+    m_selecting   = sel;
     m_control     = control;
     m_shift       = shift;
     m_alt         = alt;
     m_control     = control;
     m_shift       = shift;
     m_alt         = alt;
@@ -6140,5 +10444,18 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 }
 
 
 }
 
 
-#endif // ifndef wxUSE_NEW_GRID
+IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+
+wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
+                                                   wxObject* obj, int row,
+                                                   int col, wxControl* ctrl)
+    : wxCommandEvent(type, id)
+{
+    SetEventObject(obj);
+    m_row = row;
+    m_col = col;
+    m_ctrl = ctrl;
+}
+
+#endif // wxUSE_GRID