]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/grid.cpp
Use system default font for all platforms
[wxWidgets.git] / src / generic / grid.cpp
index 02484668f61fb749874e369b73a206926e66a1ab..65a3603c05aef9ecabc2a4567fcb6691c02b061e 100644 (file)
@@ -1,5 +1,5 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        grid.cpp
+///////////////////////////////////////////////////////////////////////////
+// Name:        generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by:
@@ -9,12 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
 
-#include "wx/defs.h"
-
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) 
-#include "gridg.cpp"
-#else
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
     #pragma implementation "grid.h"
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/defs.h"
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
+#include "gridg.cpp"
+#else
+
 #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"
 #endif
 
-#include "wx/generic/grid.h"
-
+#include "wx/textfile.h"
+#include "wx/spinctrl.h"
+#include "wx/tokenzr.h"
 
-//////////////////////////////////////////////////////////////////////
+#include "wx/grid.h"
+#include "wx/generic/gridsel.h"
 
-wxGridCellCoords wxGridNoCellCoords( -1, -1 );
-wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
+#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>
 
-//////////////////////////////////////////////////////////////////////
-//
-// Abstract base class for grid data (the model)
-//
-IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
+// ----------------------------------------------------------------------------
+// array classes
+// ----------------------------------------------------------------------------
 
+WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
 
-wxGridTableBase::wxGridTableBase()
-        : wxObject()
+struct wxGridCellWithAttr
 {
-    m_view = (wxGrid *) NULL;
-}
+    wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_)
+        : coords(row, col), attr(attr_)
+    {
+    }
 
-wxGridTableBase::~wxGridTableBase()
+    ~wxGridCellWithAttr()
+    {
+        attr->DecRef();
+    }
+
+    wxGridCellCoords coords;
+    wxGridCellAttr  *attr;
+};
+
+WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
+WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
 {
-}
+public:
+    wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
+                          const wxPoint &pos, const wxSize &size );
 
+private:
+    wxGrid   *m_owner;
 
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+    void OnPaint( wxPaintEvent& event );
+    void OnMouseEvent( wxMouseEvent& event );
+    void OnKeyDown( wxKeyEvent& event );
+
+    DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+
+class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
 {
-    wxLogWarning( "Called grid table class function InsertRows(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
-                  pos, numRows );
-    
-    return FALSE;
-}
+public:
+    wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
+                          const wxPoint &pos, const wxSize &size );
+
+private:
+    wxGrid   *m_owner;
+
+    void OnPaint( wxPaintEvent &event );
+    void OnMouseEvent( wxMouseEvent& event );
+    void OnKeyDown( wxKeyEvent& event );
+
+    DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
+    DECLARE_EVENT_TABLE()
+};
 
-bool wxGridTableBase::AppendRows( size_t numRows )
+
+class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
 {
-    wxLogWarning( "Called grid table class function AppendRows(N=%d)\n"
-                  "but your derived table class does not override this function",
-                  numRows );
-    
-    return FALSE;
-}
+public:
+    wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
+                             const wxPoint &pos, const wxSize &size );
+
+private:
+    wxGrid *m_owner;
 
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+    void OnMouseEvent( wxMouseEvent& event );
+    void OnKeyDown( wxKeyEvent& event );
+    void OnPaint( wxPaintEvent& event );
+
+    DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+class WXDLLEXPORT wxGridWindow : public wxPanel
 {
-    wxLogWarning( "Called grid table class function DeleteRows(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
-                  pos, numRows );
-    
-    return FALSE;
-}
+public:
+    wxGridWindow()
+    {
+        m_owner = (wxGrid *)NULL;
+        m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
+        m_colLabelWin = (wxGridColLabelWindow *)NULL;
+    }
+
+    wxGridWindow( wxGrid *parent,
+                  wxGridRowLabelWindow *rowLblWin,
+                  wxGridColLabelWindow *colLblWin,
+                  wxWindowID id, const wxPoint &pos, const wxSize &size );
+    ~wxGridWindow();
+
+    void ScrollWindow( int dx, int dy, const wxRect *rect );
 
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+private:
+    wxGrid                   *m_owner;
+    wxGridRowLabelWindow     *m_rowLabelWin;
+    wxGridColLabelWindow     *m_colLabelWin;
+
+    void OnPaint( wxPaintEvent &event );
+    void OnMouseEvent( wxMouseEvent& event );
+    void OnKeyDown( wxKeyEvent& );
+    void OnEraseBackground( wxEraseEvent& );
+
+
+    DECLARE_DYNAMIC_CLASS(wxGridWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+
+
+class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
-    wxLogWarning( "Called grid table class function InsertCols(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
-                  pos, numCols );
-    
-    return FALSE;
-}
+public:
+    wxGridCellEditorEvtHandler()
+        : m_grid(0), m_editor(0)
+        { }
+    wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
+        : m_grid(grid), m_editor(editor)
+        { }
 
-bool wxGridTableBase::AppendCols( size_t numCols )
+    void OnKeyDown(wxKeyEvent& event);
+    void OnChar(wxKeyEvent& event);
+
+private:
+    wxGrid*             m_grid;
+    wxGridCellEditor*   m_editor;
+    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
+    DECLARE_EVENT_TABLE()
+};
+
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler )
+BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
+    EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
+    EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
+END_EVENT_TABLE()
+
+
+
+// ----------------------------------------------------------------------------
+// the internal data representation used by wxGridCellAttrProvider
+// ----------------------------------------------------------------------------
+
+// this class stores attributes set for cells
+class WXDLLEXPORT wxGridCellAttrData
 {
-    wxLogWarning( "Called grid table class function AppendCols(N=%d)\n"
-                  "but your derived table class does not override this function",
-                  numCols );
-    
-    return FALSE;
-}
+public:
+    void SetAttr(wxGridCellAttr *attr, int row, int col);
+    wxGridCellAttr *GetAttr(int row, int col) const;
+    void UpdateAttrRows( size_t pos, int numRows );
+    void UpdateAttrCols( size_t pos, int numCols );
+
+private:
+    // searches for the attr for given cell, returns wxNOT_FOUND if not found
+    int FindIndex(int row, int col) const;
+
+    wxGridCellWithAttrArray m_attrs;
+};
 
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+// this class stores attributes set for rows or columns
+class WXDLLEXPORT wxGridRowOrColAttrData
 {
-    wxLogWarning( "Called grid table class function DeleteCols(pos=%d, N=%d)\n"
-                  "but your derived table class does not override this function",
-                  pos, numCols );
-    
-    return FALSE;
-}
+public:
+    // empty ctor to suppress warnings
+    wxGridRowOrColAttrData() { }
+    ~wxGridRowOrColAttrData();
 
+    void SetAttr(wxGridCellAttr *attr, int rowOrCol);
+    wxGridCellAttr *GetAttr(int rowOrCol) const;
+    void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols );
 
-wxString wxGridTableBase::GetRowLabelValue( int row )
+private:
+    wxArrayInt m_rowsOrCols;
+    wxArrayAttrs m_attrs;
+};
+
+// NB: this is just a wrapper around 3 objects: one which stores cell
+//     attributes, and 2 others for row/col ones
+class WXDLLEXPORT wxGridCellAttrProviderData
 {
-    wxString s;
-    s << row;
-    return s;
-}
+public:
+    wxGridCellAttrData m_cellAttrs;
+    wxGridRowOrColAttrData m_rowAttrs,
+                           m_colAttrs;
+};
 
-wxString wxGridTableBase::GetColLabelValue( int col )
+
+// ----------------------------------------------------------------------------
+// data structures used for the data type registry
+// ----------------------------------------------------------------------------
+
+struct wxGridDataTypeInfo
 {
-    // default col labels are:
-    //   cols 0 to 25   : A-Z
-    //   cols 26 to 675 : AA-ZZ
-    //   etc.
+    wxGridDataTypeInfo(const wxString& typeName,
+                       wxGridCellRenderer* renderer,
+                       wxGridCellEditor* editor)
+        : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
+        { }
 
-    wxString s;
-    unsigned int i, n;
-    for ( n = 1; ; n++ )
+    ~wxGridDataTypeInfo()
     {
-        s += ('A' + (char)( col%26 ));
-        col = col/26 - 1;
-        if ( col < 0 ) break;
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
     }
 
-    // reverse the string...
-    wxString s2;
-    for ( i = 0;  i < n;  i++ )
-    {
-        s2 += s[n-i-1];
-    }
+    wxString            m_typeName;
+    wxGridCellRenderer* m_renderer;
+    wxGridCellEditor*   m_editor;
+};
 
-    return s2;
+
+WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+
+
+class WXDLLEXPORT 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
+// ----------------------------------------------------------------------------
+
+#ifndef WXGRID_DRAW_LINES
+#define WXGRID_DRAW_LINES 1
+#endif
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+//#define DEBUG_ATTR_CACHE
+#ifdef DEBUG_ATTR_CACHE
+    static size_t gs_nAttrCacheHits = 0;
+    static size_t gs_nAttrCacheMisses = 0;
+#endif // DEBUG_ATTR_CACHE
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+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;
+
+// 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;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellEditor::wxGridCellEditor()
+{
+    m_control = NULL;
 }
 
 
+wxGridCellEditor::~wxGridCellEditor()
+{
+    Destroy();
+}
 
-//////////////////////////////////////////////////////////////////////
-//
-// Message class for the grid table to send requests and notifications
-// to the grid view
-//
+void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
+                              wxWindowID WXUNUSED(id),
+                              wxEvtHandler* evtHandler)
+{
+    if ( evtHandler )
+        m_control->PushEventHandler(evtHandler);
+}
 
-wxGridTableMessage::wxGridTableMessage()
+void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
+                                       wxGridCellAttr *attr)
 {
-    m_table = (wxGridTableBase *) NULL;
-    m_id = -1;
-    m_comInt1 = -1;
-    m_comInt2 = -1;
+    // erase the background because we might not fill the cell
+    wxClientDC dc(m_control->GetParent());
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+    dc.DrawRectangle(rectCell);
+
+    // redraw the control we just painted over
+    m_control->Refresh();
 }
 
-wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
-                                        int commandInt1, int commandInt2 )
+void wxGridCellEditor::Destroy()
 {
-    m_table = table;
-    m_id = id;
-    m_comInt1 = commandInt1;
-    m_comInt2 = commandInt2;
+    if (m_control)
+    {
+        m_control->PopEventHandler(TRUE /* delete it*/);
+
+        m_control->Destroy();
+        m_control = NULL;
+    }
 }
 
+void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+    m_control->Show(show);
 
+    if ( show )
+    {
+        // set the colours/fonts if we have any
+        if ( attr )
+        {
+            m_colFgOld = m_control->GetForegroundColour();
+            m_control->SetForegroundColour(attr->GetTextColour());
 
-//////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
+            m_colBgOld = m_control->GetBackgroundColour();
+            m_control->SetBackgroundColour(attr->GetBackgroundColour());
 
+            m_fontOld = m_control->GetFont();
+            m_control->SetFont(attr->GetFont());
 
-// this is a magic incantation which must be done!
-#include <wx/arrimpl.cpp>
+            // can't do anything more in the base class version, the other
+            // attributes may only be used by the derived classes
+        }
+    }
+    else
+    {
+        // restore the standard colours fonts
+        if ( m_colFgOld.Ok() )
+        {
+            m_control->SetForegroundColour(m_colFgOld);
+            m_colFgOld = wxNullColour;
+        }
 
-WX_DEFINE_OBJARRAY(wxGridStringArray);
+        if ( m_colBgOld.Ok() )
+        {
+            m_control->SetBackgroundColour(m_colBgOld);
+            m_colBgOld = wxNullColour;
+        }
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
+        if ( m_fontOld.Ok() )
+        {
+            m_control->SetFont(m_fontOld);
+            m_fontOld = wxNullFont;
+        }
+    }
+}
 
-wxGridStringTable::wxGridStringTable()
-        : wxGridTableBase()
+void wxGridCellEditor::SetSize(const wxRect& rect)
 {
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+    m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 
-wxGridStringTable::wxGridStringTable( int numRows, int numCols )
-        : wxGridTableBase()
+void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 {
-    int row, col;
-    
-    m_data.Alloc( numRows );
+    event.Skip();
+}
 
-    wxArrayString sa;
-    sa.Alloc( numCols );
-    for ( col = 0;  col < numCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
-    
-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
+
+void wxGridCellEditor::StartingKey(wxKeyEvent& event)
+{
+    event.Skip();
 }
 
-wxGridStringTable::~wxGridStringTable()
+void wxGridCellEditor::StartingClick()
 {
 }
 
-long wxGridStringTable::GetNumberRows()
+// ----------------------------------------------------------------------------
+// wxGridCellTextEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellTextEditor::wxGridCellTextEditor()
 {
-    return m_data.GetCount();
+    m_maxChars = 0;
 }
 
-long wxGridStringTable::GetNumberCols()
+void wxGridCellTextEditor::Create(wxWindow* parent,
+                                  wxWindowID id,
+                                  wxEvtHandler* evtHandler)
 {
-    if ( m_data.GetCount() > 0 )
-        return m_data[0].GetCount();
-    else
-        return 0;
+    m_control = new wxTextCtrl(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize
+#if defined(__WXMSW__)
+                               , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
+#endif
+                              );
+
+    // TODO: use m_maxChars
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
-wxString wxGridStringTable::GetValue( int row, int col )
+void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
+                                           wxGridCellAttr * WXUNUSED(attr))
 {
-    // TODO: bounds checking
-    //
-    return m_data[row][col];
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
 }
 
-void wxGridStringTable::SetValue( int row, int col, const wxString& s )
+void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
 {
-    // TODO: bounds checking
+    wxRect rect(rectOrig);
+
+    // Make the edit control large enough to allow for internal
+    // margins
     //
-    m_data[row][col] = s;
+    // 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;
+    int extra_y = ( rect.y > 2 )? 2 : 1;
+#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);
 }
 
-bool wxGridStringTable::IsEmptyCell( int row, int col )
+void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
-    // TODO: bounds checking
-    //
-    return (m_data[row][col] == wxEmptyString);
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    m_startValue = grid->GetTable()->GetValue(row, col);
+
+    DoBeginEdit(m_startValue);
 }
 
+void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
+    Text()->SetInsertionPointEnd();
+    Text()->SetFocus();
+}
 
-void wxGridStringTable::Clear()
+bool wxGridCellTextEditor::EndEdit(int row, int col,
+                                   wxGrid* grid)
 {
-    int row, col;
-    int numRows, numCols;
-    
-    numRows = m_data.GetCount();
-    if ( numRows > 0 )
-    {
-        numCols = m_data[0].GetCount();
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
 
-        for ( row = 0;  row < numRows;  row++ )
+    bool changed = FALSE;
+    wxString value = Text()->GetValue();
+    if (value != m_startValue)
+        changed = TRUE;
+
+    if (changed)
+        grid->GetTable()->SetValue(row, col, value);
+
+    m_startValue = wxEmptyString;
+    Text()->SetValue(m_startValue);
+
+    return changed;
+}
+
+
+void wxGridCellTextEditor::Reset()
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    DoReset(m_startValue);
+}
+
+void wxGridCellTextEditor::DoReset(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
+    Text()->SetInsertionPointEnd();
+}
+
+void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
+{
+    if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
+    {
+        // insert the key in the control
+        int keycode = (int)event.KeyCode();
+        if ( isprint(keycode) )
         {
-            for ( col = 0;  col < numCols;  col++ )
+            // FIXME this is not going to work for non letters...
+            if ( !event.ShiftDown() )
             {
-                m_data[row][col] = wxEmptyString;
+                keycode = tolower(keycode);
             }
+
+            Text()->AppendText((wxChar)keycode);
+
+            return;
         }
+
     }
-}
 
+    event.Skip();
+}
 
-bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+                                         WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
 {
-    size_t row, col;
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
+    // wxMotif needs a little extra help...
+    size_t pos = (size_t)( Text()->GetInsertionPoint() );
+    wxString s( Text()->GetValue() );
+    s = s.Left(pos) + "\n" + s.Mid(pos);
+    Text()->SetValue(s);
+    Text()->SetInsertionPoint( pos );
+#else
+    // the other ports can handle a Return key press
+    //
+    event.Skip();
+#endif
+}
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
-    
-    if ( pos >= curNumRows )
+void wxGridCellTextEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
     {
-        return AppendRows( numRows );
+        // reset to default
+        m_maxChars = 0;
     }
-    
-    wxArrayString sa;
-    sa.Alloc( curNumCols );
-    for ( col = 0;  col < curNumCols;  col++ )
+    else
     {
-        sa.Add( wxEmptyString );
+        long tmp;
+        if ( !params.ToLong(&tmp) )
+        {
+            wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string "
+                          "'%s' ignored"), params.c_str());
+        }
+        else
+        {
+            m_maxChars = (size_t)tmp;
+        }
     }
+}
 
-    for ( row = pos;  row < pos + numRows;  row++ )
-    {
-        m_data.Insert( sa, row );
-    }
+// ----------------------------------------------------------------------------
+// wxGridCellNumberEditor
+// ----------------------------------------------------------------------------
 
-    if ( GetView() )
+wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max)
+{
+    m_min = min;
+    m_max = max;
+}
+
+void wxGridCellNumberEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
+{
+    if ( HasRange() )
     {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_INSERTED,
-                                pos,
-                                numRows );
-        
-        GetView()->ProcessTableMessage( msg );
+        // create a spin ctrl
+        m_control = new wxSpinCtrl(parent, -1, wxEmptyString,
+                                   wxDefaultPosition, wxDefaultSize,
+                                   wxSP_ARROW_KEYS,
+                                   m_min, m_max);
+
+        wxGridCellEditor::Create(parent, id, evtHandler);
     }
+    else
+    {
+        // just a text control
+        wxGridCellTextEditor::Create(parent, id, evtHandler);
 
-    return TRUE;
+#if wxUSE_VALIDATORS
+        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+    }
 }
 
-bool wxGridStringTable::AppendRows( size_t numRows )
+void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
-    size_t row, col;
-
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
-    
-    wxArrayString sa;
-    if ( curNumCols > 0 )
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {
-        sa.Alloc( curNumCols );
-        for ( col = 0;  col < curNumCols;  col++ )
+        m_valueOld = table->GetValueAsLong(row, col);
+    }
+    else
+    {
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToLong(&m_valueOld))
         {
-            sa.Add( wxEmptyString );
+            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+            return;
         }
     }
-    
-    for ( row = 0;  row < numRows;  row++ )
+
+    if ( HasRange() )
     {
-        m_data.Add( sa );
+        Spin()->SetValue((int)m_valueOld);
     }
-
-    if ( GetView() )
+    else
     {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_APPENDED,
-                                numRows );
-        
-        GetView()->ProcessTableMessage( msg );
+        DoBeginEdit(GetString());
     }
-
-    return TRUE;    
 }
 
-bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
+bool wxGridCellNumberEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
 {
-    size_t n;
+    bool changed;
+    long value;
 
-    size_t curNumRows = m_data.GetCount();
-    
-    if ( pos >= curNumRows )
+    if ( HasRange() )
     {
-        wxLogError( "Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n"
-                    "Pos value is invalid for present table with %d rows",
-                    pos, numRows, curNumRows );
-        return FALSE;
+        value = Spin()->GetValue();
+        changed = value != m_valueOld;
+    }
+    else
+    {
+        changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld);
     }
 
-    if ( numRows > curNumRows - pos )
+    if ( changed )
     {
-        numRows = curNumRows - pos;
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
+            grid->GetTable()->SetValueAsLong(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, wxString::Format("%ld", value));
     }
-    
-    if ( numRows >= curNumRows )
+
+    return changed;
+}
+
+void wxGridCellNumberEditor::Reset()
+{
+    if ( HasRange() )
     {
-        m_data.Empty();  // don't release memory just yet
+        Spin()->SetValue((int)m_valueOld);
     }
     else
     {
-        for ( n = 0;  n < numRows;  n++ )
-        {
-            m_data.Remove( pos );
-        }
+        DoReset(GetString());
     }
+}
 
-    if ( GetView() )
+void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
+{
+    if ( !HasRange() )
     {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_ROWS_DELETED,
-                                pos,
-                                numRows );
-        
-        GetView()->ProcessTableMessage( msg );
+        int keycode = (int) event.KeyCode();
+        if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
+        {
+            wxGridCellTextEditor::StartingKey(event);
+
+            // skip Skip() below
+            return;
+        }
     }
 
-    return TRUE;    
+    event.Skip();
 }
 
-bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
+void wxGridCellNumberEditor::SetParameters(const wxString& params)
 {
-    size_t row, col;
-
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
-    
-    if ( pos >= curNumCols )
+    if ( !params )
     {
-        return AppendCols( numCols );
+        // reset to default
+        m_min =
+        m_max = -1;
     }
-
-    for ( row = 0;  row < curNumRows;  row++ )
+    else
     {
-        for ( col = pos;  col < pos + numCols;  col++ )
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
         {
-            m_data[row].Insert( wxEmptyString, col );
+            m_min = (int)tmp;
+
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_max = (int)tmp;
+
+                // skip the error message below
+                return;
+            }
         }
-    }
 
-    if ( GetView() )
-    {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_INSERTED,
-                                pos,
-                                numCols );
-        
-        GetView()->ProcessTableMessage( msg );
+        wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string "
+                      "'%s' ignored"), params.c_str());
     }
-
-    return TRUE;
 }
 
-bool wxGridStringTable::AppendCols( size_t numCols )
+// ----------------------------------------------------------------------------
+// wxGridCellFloatEditor
+// ----------------------------------------------------------------------------
+
+void wxGridCellFloatEditor::Create(wxWindow* parent,
+                                   wxWindowID id,
+                                   wxEvtHandler* evtHandler)
 {
-    size_t row, n;
+    wxGridCellTextEditor::Create(parent, id, evtHandler);
 
-    size_t curNumRows = m_data.GetCount();
-    if ( !curNumRows )
+#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) )
     {
-        // TODO: something better than this ?
-        //
-        wxLogError( "Unable to append cols to a grid table with no rows.\n"
-                    "Call AppendRows() first" );
-        return FALSE;
+        m_valueOld = table->GetValueAsDouble(row, col);
     }
-    
-    for ( row = 0;  row < curNumRows;  row++ )
+    else
     {
-        for ( n = 0;  n < numCols;  n++ )
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToDouble(&m_valueOld))
         {
-            m_data[row].Add( wxEmptyString );
+            wxFAIL_MSG( _T("this cell doesn't have float value") );
+            return;
         }
     }
 
-    if ( GetView() )
+    DoBeginEdit(GetString());
+}
+
+bool wxGridCellFloatEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    double value;
+    if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) )
     {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_APPENDED,
-                                numCols );
-        
-        GetView()->ProcessTableMessage( msg );
-    }
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
+            grid->GetTable()->SetValueAsDouble(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, wxString::Format("%f", value));
 
-    return TRUE;
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
-bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
+void wxGridCellFloatEditor::Reset()
 {
-    size_t row, n;
+    DoReset(GetString());
+}
 
-    size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
-    
-    if ( pos >= curNumCols )
+void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
+{
+    int keycode = (int)event.KeyCode();
+    if ( isdigit(keycode) ||
+         keycode == '+' || keycode == '-' || keycode == '.' )
     {
-       wxLogError( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
-                   "Pos value is invalid for present table with %d cols",
-                   pos, numCols, curNumCols );
-       return FALSE;
+        wxGridCellTextEditor::StartingKey(event);
+
+        // skip Skip() below
+        return;
     }
 
-    if ( numCols > curNumCols - pos )
+    event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellBoolEditor
+// ----------------------------------------------------------------------------
+
+void wxGridCellBoolEditor::Create(wxWindow* parent,
+                                  wxWindowID id,
+                                  wxEvtHandler* evtHandler)
+{
+    m_control = new wxCheckBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               wxNO_BORDER);
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
+
+void wxGridCellBoolEditor::SetSize(const wxRect& r)
+{
+    bool resize = FALSE;
+    wxSize size = m_control->GetSize();
+    wxCoord minSize = wxMin(r.width, r.height);
+
+    // check if the checkbox is not too big/small for this cell
+    wxSize sizeBest = m_control->GetBestSize();
+    if ( !(size == sizeBest) )
     {
-       numCols = curNumCols - pos;
+        // reset to default size if it had been made smaller
+        size = sizeBest;
+
+        resize = TRUE;
     }
 
-    for ( row = 0;  row < curNumRows;  row++ )
+    if ( size.x >= minSize || size.y >= minSize )
     {
-        if ( numCols >= curNumCols )
-        {
-            m_data[row].Clear();
-        }
-        else
-        {
-            for ( n = 0;  n < numCols;  n++ )
-            {
-                m_data[row].Remove( pos );
-            }
-        }
+        // leave 1 pixel margin
+        size.x = size.y = minSize - 2;
+
+        resize = TRUE;
     }
 
-    if ( GetView() )
+    if ( resize )
     {
-        wxGridTableMessage msg( this,
-                                wxGRIDTABLE_NOTIFY_COLS_DELETED,
-                                pos,
-                                numCols );
-        
-        GetView()->ProcessTableMessage( msg );
+        m_control->SetSize(size);
     }
 
-    return TRUE;    
+    // position it in the centre of the rectangle (TODO: support alignment?)
+
+#if defined(__WXGTK__) || defined (__WXMOTIF__)
+    // the checkbox without label still has some space to the right in wxGTK,
+    // so shift it to the right
+    size.x -= 8;
+#elif defined(__WXMSW__)
+    // here too, but in other way
+    size.x += 1;
+    size.y -= 2;
+#endif
+
+    m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);
 }
 
-wxString wxGridStringTable::GetRowLabelValue( int row )
+void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 {
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
-    {
-        // using default label
-        //
-        return wxGridTableBase::GetRowLabelValue( row );
-    }
-    else
+    m_control->Show(show);
+
+    if ( show )
     {
-        return m_rowLabels[ row ];
+        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
+        CBox()->SetBackgroundColour(colBg);
     }
 }
 
-wxString wxGridStringTable::GetColLabelValue( int col )
+void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
-    {
-        // using default label
-        //
-        return wxGridTableBase::GetColLabelValue( col );
-    }
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
     else
-    {
-        return m_colLabels[ col ];
-    }
+        m_startValue = !!grid->GetTable()->GetValue(row, col);
+    CBox()->SetValue(m_startValue);
+    CBox()->SetFocus();
 }
 
-void wxGridStringTable::SetRowLabelValue( int row, const wxString& value )
+bool wxGridCellBoolEditor::EndEdit(int row, int col,
+                                   wxGrid* grid)
 {
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    bool changed = FALSE;
+    bool value = CBox()->GetValue();
+    if ( value != m_startValue )
+        changed = TRUE;
+
+    if ( changed )
     {
-        int n = m_rowLabels.GetCount();
-        int i;
-        for ( i = n;  i <= row;  i++ )
-        {
-            m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
-        }
+        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);
     }
 
-    m_rowLabels[row] = value;
+    return changed;
 }
 
-void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
+void wxGridCellBoolEditor::Reset()
 {
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    CBox()->SetValue(m_startValue);
+}
+
+void wxGridCellBoolEditor::StartingClick()
+{
+    CBox()->SetValue(!CBox()->GetValue());
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+                                               const wxChar* choices[],
+                                               bool allowOthers)
+                      : m_allowOthers(allowOthers)
+{
+    if ( count )
     {
-        int n = m_colLabels.GetCount();
-        int i;
-        for ( i = n;  i <= col;  i++ )
+        m_choices.Alloc(count);
+        for ( size_t n = 0; n < count; n++ )
         {
-            m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
+            m_choices.Add(choices[n]);
         }
     }
-
-    m_colLabels[col] = value;
 }
 
+wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
+{
+    wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
+    editor->m_allowOthers = m_allowOthers;
+    editor->m_choices = m_choices;
 
+    return editor;
+}
 
+void wxGridCellChoiceEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
+{
+    size_t count = m_choices.GetCount();
+    wxString *choices = new wxString[count];
+    for ( size_t n = 0; n < count; n++ )
+    {
+        choices[n] = m_choices[n];
+    }
 
-//////////////////////////////////////////////////////////////////////
+    m_control = new wxComboBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               count, choices,
+                               m_allowOthers ? 0 : wxCB_READONLY);
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridTextCtrl, wxTextCtrl )
-    
-BEGIN_EVENT_TABLE( wxGridTextCtrl, wxTextCtrl )
-    EVT_KEY_DOWN( wxGridTextCtrl::OnKeyDown )
-END_EVENT_TABLE()
+    delete [] choices;
 
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
 
-wxGridTextCtrl::wxGridTextCtrl( wxWindow *par,
-                                bool isCellControl,
-                                wxWindowID id,
-                                const wxString& value,
-                                const wxPoint& pos,
-                                const wxSize& size,
-                                long style )
-        : wxTextCtrl( par, id, value, pos, size, style )
+void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
+                                             wxGridCellAttr * attr)
 {
-    m_isCellControl = isCellControl;
-}
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
 
+    // TODO: It doesn't actually fill the client area since the height of a
+    // combo always defaults to the standard...  Until someone has time to
+    // figure out the right rectangle to paint, just do it the normal way...
+    wxGridCellEditor::PaintBackground(rectCell, attr);
+}
 
-void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev )
+void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
-    switch ( ev.KeyCode() )
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    m_startValue = grid->GetTable()->GetValue(row, col);
+
+    Combo()->SetValue(m_startValue);
+    size_t count = m_choices.GetCount();
+    for (size_t i=0; i<count; i++)
     {
-        case WXK_ESCAPE:
-            ((wxGrid *)GetParent())->SetEditControlValue( startValue );
-            SetInsertionPointEnd();
+        if (m_startValue == m_choices[i])
+        {
+            Combo()->SetSelection(i);
             break;
-
-        case WXK_UP:
-        case WXK_DOWN:
-        case WXK_LEFT:
-        case WXK_RIGHT:
-        case WXK_RETURN:
-            if ( m_isCellControl )
-            {
-                // send the event to the parent grid, skipping the
-                // event if nothing happens
-                //
-                ev.Skip( !GetParent()->ProcessEvent( ev ) );
-            }
-            else
-            {
-                // default text control response within the top edit
-                // control
-                //
-                ev.Skip();
-            }
+        }
+    }
+    Combo()->SetInsertionPointEnd();
+    Combo()->SetFocus();
+}
+
+bool wxGridCellChoiceEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    wxString value = Combo()->GetValue();
+    bool changed = value != m_startValue;
+
+    if ( changed )
+        grid->GetTable()->SetValue(row, col, value);
+
+    m_startValue = wxEmptyString;
+    Combo()->SetValue(m_startValue);
+
+    return changed;
+}
+
+void wxGridCellChoiceEditor::Reset()
+{
+    Combo()->SetValue(m_startValue);
+    Combo()->SetInsertionPointEnd();
+}
+
+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // what can we do?
+        return;
+    }
+
+    m_choices.Empty();
+
+    wxStringTokenizer tk(params, _T(','));
+    while ( tk.HasMoreTokens() )
+    {
+        m_choices.Add(tk.GetNextToken());
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditorEvtHandler
+// ----------------------------------------------------------------------------
+
+void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+{
+    switch ( event.KeyCode() )
+    {
+        case WXK_ESCAPE:
+            m_editor->Reset();
+            m_grid->DisableCellEditControl();
             break;
 
-        case WXK_HOME:
-        case WXK_END:
-            if ( m_isCellControl )
-            {
-                // send the event to the parent grid, skipping the
-                // event if nothing happens
-                //
-                ev.Skip( !GetParent()->ProcessEvent( ev ) );
-            }
-            else
-            {
-                // default text control response within the top edit
-                // control
-                //
-                ev.Skip();
-            }
+        case WXK_TAB:
+            event.Skip( m_grid->ProcessEvent( event ) );
+            break;
+
+        case WXK_RETURN:
+            if (!m_grid->ProcessEvent(event))
+                m_editor->HandleReturn(event);
             break;
-            
+
+
         default:
-            ev.Skip();
+            event.Skip();
     }
 }
 
-void wxGridTextCtrl::SetStartValue( const wxString& s )
+void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {
-    startValue = s;
-    wxTextCtrl::SetValue( s.c_str() );
-}
-
+    switch ( event.KeyCode() )
+    {
+        case WXK_ESCAPE:
+        case WXK_TAB:
+        case WXK_RETURN:
+            break;
 
-//////////////////////////////////////////////////////////////////////
+        default:
+            event.Skip();
+    }
+}
 
-IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxPanel )
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
 
-    
-BEGIN_EVENT_TABLE( wxGrid, wxPanel )
-    EVT_PAINT( wxGrid::OnPaint )
-    EVT_SIZE( wxGrid::OnSize )
-    EVT_MOUSE_EVENTS( wxGrid::OnMouse )
-    EVT_KEY_DOWN( wxGrid::OnKeyDown )
-    EVT_TEXT( wxGRID_CELLCTRL, wxGrid::OnText )
-    EVT_TEXT( wxGRID_TOPCTRL, wxGrid::OnText )
-    EVT_COMMAND_SCROLL( wxGRID_HORIZSCROLL, wxGrid::OnGridScroll)
-    EVT_COMMAND_SCROLL( wxGRID_VERTSCROLL, wxGrid::OnGridScroll)
-END_EVENT_TABLE()
-    
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
+{
+    // nothing to do
+}
 
-wxGrid::~wxGrid()
+wxGridCellWorker::~wxGridCellWorker()
 {
-    delete m_table;
 }
 
+// ============================================================================
+// renderer classes
+// ============================================================================
 
-//
-// ----- internal init and update functions
-//
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer
+// ----------------------------------------------------------------------------
 
-void wxGrid::Create()
+void wxGridCellRenderer::Draw(wxGrid& grid,
+                              wxGridCellAttr& attr,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int WXUNUSED(row), int WXUNUSED(col),
+                              bool isSelected)
 {
-    m_table          = (wxGridTableBase *) NULL;
-    m_topEditCtrl    = (wxWindow *) NULL;
-    m_cellEditCtrl   = (wxWindow *) NULL;
-    m_horizScrollBar = (wxScrollBar *) NULL;
-    m_vertScrollBar  = (wxScrollBar *) NULL;
+    dc.SetBackgroundMode( wxSOLID );
 
-    m_numRows = 0;
-    m_numCols = 0;
-    m_created = FALSE;
+    if ( isSelected )
+    {
+        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+    }
+    else
+    {
+        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+    }
+
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle(rect);
 }
 
-void wxGrid::Init()
+// ----------------------------------------------------------------------------
+// wxGridCellStringRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
+                                                     wxGridCellAttr& attr,
+                                                     wxDC& dc,
+                                                     bool isSelected)
 {
-    int i;
+    dc.SetBackgroundMode( wxTRANSPARENT );
 
-    m_left = 0;
-    m_top  = 0;
+    // TODO some special colours for attr.IsReadOnly() case?
 
-    // TODO: perhaps have a style flag for control panel
-    //
-    m_topEditCtrlEnabled = FALSE;
-    m_topEditCtrl = new wxGridTextCtrl( this,
-                                       FALSE,
-                                       wxGRID_TOPCTRL,
-                                       "",
-                                       wxPoint(10, 10),
-                                       wxSize(WXGRID_DEFAULT_TOPEDIT_WIDTH,
-                                               WXGRID_DEFAULT_TOPEDIT_HEIGHT),
-                                       wxTE_MULTILINE );
-    m_topEditCtrl->Show( FALSE );                                      
+    if ( isSelected )
+    {
+        dc.SetTextBackground( grid.GetSelectionBackground() );
+        dc.SetTextForeground( grid.GetSelectionForeground() );
+    }
+    else
+    {
+        dc.SetTextBackground( attr.GetBackgroundColour() );
+        dc.SetTextForeground( attr.GetTextColour() );
+    }
 
-    if ( m_numRows <= 0 )
-        m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
+    dc.SetFont( attr.GetFont() );
+}
 
-    if ( m_numCols <= 0 )
-        m_numCols = WXGRID_DEFAULT_NUMBER_COLS;
+wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+                                               wxDC& dc,
+                                               const wxString& text)
+{
+    wxCoord x, y;
+    dc.SetFont(attr.GetFont());
+    dc.GetTextExtent(text, &x, &y);
 
-    m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-    m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+    return wxSize(x, y);
+}
 
-    // default labels are pale grey with black text
-    //
-    m_labelBackgroundColour = wxColour( 192, 192, 192 );
-    m_labelTextColour       = wxColour(   0,   0,   0 );
+wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, grid.GetCellValue(row, col));
+}
 
-    // TODO: something better than this ?
-    //
-    m_labelFont = this->GetFont();
-    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
-    
-    m_rowLabelHorizAlign = wxLEFT;
-    m_rowLabelVertAlign  = wxCENTRE;
+void wxGridCellStringRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
+                                    wxDC& dc,
+                                    const wxRect& rectCell,
+                                    int row, int col,
+                                    bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
-    m_colLabelHorizAlign = wxCENTRE;
-    m_colLabelVertAlign  = wxTOP;
+    // now we only have to draw the text
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
-    m_defaultRowHeight = WXGRID_DEFAULT_ROW_HEIGHT;
-    m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
 
-    m_rowHeights.Alloc( m_numRows );
-    m_rowBottoms.Alloc( m_numRows );
-    for ( i = 0;  i < m_numRows;  i++ )
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
+
+    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                           rect, hAlign, vAlign);
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellNumberRenderer
+// ----------------------------------------------------------------------------
+
+wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {
-        m_rowHeights.Add( m_defaultRowHeight );
-        m_rowBottoms.Add( 0 );  // set by CalcDimensions()
+        text.Printf(_T("%ld"), table->GetValueAsLong(row, col));
     }
-
-    m_colWidths.Alloc( m_numCols );
-    m_colRights.Alloc( m_numRows );
-    for ( i = 0;  i < m_numCols;  i++ )
+    else
     {
-        m_colWidths.Add( m_defaultColWidth );
-        m_colRights.Add( 0 );  // set by CalcDimensions()
+        text = table->GetValue(row, col);
     }
 
-    // TODO: improve this ?
-    //
-    m_defaultCellFont = this->GetFont();
-    
-    m_gridLineColour = wxColour(   0,   0, 255 );
-    m_gridLinesEnabled = TRUE;
-    
-    m_scrollBarWidth = WXGRID_DEFAULT_SCROLLBAR_WIDTH;
-
-    m_horizScrollBar = new wxScrollBar( this,
-                                        wxGRID_HORIZSCROLL,
-                                        wxPoint(0, 0),
-                                        wxSize(10, 10),
-                                        wxHORIZONTAL);
-    
-    m_vertScrollBar = new wxScrollBar( this,
-                                       wxGRID_VERTSCROLL,
-                                       wxPoint(0, 0),
-                                       wxSize(10, 10),
-                                       wxVERTICAL);
-    m_scrollPosX = 0;
-    m_scrollPosY = 0;
-    m_wholeColsVisible = 0;
-    m_wholeRowsVisible = 0;    
-
-    m_firstPaint = TRUE;
-    m_inOnKeyDown = FALSE;
-    m_batchCount = 0;
-    
-    m_cursorMode  = WXGRID_CURSOR_DEFAULT;
-    m_dragLastPos  = -1;
-    m_dragRowOrCol = -1;
-    m_isDragging = FALSE;
+    return text;
+}
 
-    m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
-    m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
+void wxGridCellNumberRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
+                                    wxDC& dc,
+                                    const wxRect& rectCell,
+                                    int row, int col,
+                                    bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
-    m_currentCellCoords = wxGridNoCellCoords;
-    m_currentCellHighlighted = FALSE;
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
-    
-    m_editable = TRUE;  // default for whole grid
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxRIGHT;
 
-    // TODO: extend this to other types of controls
-    //
-    m_cellEditCtrl = new wxGridTextCtrl( this,
-                                         TRUE,
-                                         wxGRID_CELLCTRL,
-                                         "",
-                                         wxPoint(1,1),
-                                         wxSize(1,1),
-                                         wxNO_BORDER
-#ifdef __WXMSW__
-                                         | wxTE_MULTILINE | wxTE_NO_VSCROLL
-#endif
-                                         );
-                                         
-    m_cellEditCtrl->Show( FALSE );                                            
-    m_cellEditCtrlEnabled = TRUE;
-    m_editCtrlType = wxGRID_TEXTCTRL;    
-    
-    // Not really needed here, it gets called by OnSize()
-    //
-    // CalcDimensions();
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
+
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
 }
 
+wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
 
-void wxGrid::CalcDimensions()
+// ----------------------------------------------------------------------------
+// wxGridCellFloatRenderer
+// ----------------------------------------------------------------------------
+
+wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
 {
-    int i;
+    SetWidth(width);
+    SetPrecision(precision);
+}
+
+wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
+{
+    wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer;
+    renderer->m_width = m_width;
+    renderer->m_precision = m_precision;
+    renderer->m_format = m_format;
+
+    return renderer;
+}
+
+wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
 
-    if ( IsTopEditControlEnabled() )
+    bool hasDouble;
+    double val;
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
-        int ctrlW, ctrlH;
-        m_topEditCtrl->GetSize( &ctrlW, &ctrlH );
-        
-        m_top = ctrlH + 20;
+        val = table->GetValueAsDouble(row, col);
+        hasDouble = TRUE;
     }
     else
     {
-        m_top = 0;
+        text = table->GetValue(row, col);
+        hasDouble = text.ToDouble(&val);
     }
 
-    int bottom =  m_top + m_colLabelHeight;
-    for ( i = m_scrollPosY;  i < m_numRows;  i++ )
+    if ( hasDouble )
     {
-        bottom += m_rowHeights[i];
-        m_rowBottoms[i] = bottom;
+        if ( !m_format )
+        {
+            if ( m_width == -1 )
+            {
+                // default width/precision
+                m_format = _T("%f");
+            }
+            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);
+            }
+        }
+
+        text.Printf(m_format, val);
     }
+    //else: text already contains the string
 
-    int right = m_left + m_rowLabelWidth;
-    for ( i = m_scrollPosX;  i < m_numCols;  i++ )
-    {
-        right += m_colWidths[i];
-        m_colRights[i] = right;
-    }    
+    return text;
+}
 
-    // adjust the scroll bars
-    //
-    
-    int cw, ch;
-    GetClientSize(&cw, &ch);
+void wxGridCellFloatRenderer::Draw(wxGrid& grid,
+                                   wxGridCellAttr& attr,
+                                   wxDC& dc,
+                                   const wxRect& rectCell,
+                                   int row, int col,
+                                   bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
-    // begin by assuming that we don't need either scroll bar
-    //
-    int vertScrollBarWidth = 0;
-    int horizScrollBarHeight = 0;
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
-    // Each scroll bar needs to eventually know if the other one is
-    // required in deciding whether or not it is also required - hence
-    // this loop. A bit inelegant but simple and it works.
-    //
-    int check;
-    for ( check = 0;  check < 2;  check++ )
-    {
-        if ( m_numRows > 0  &&
-             m_rowBottoms[m_numRows-1] + horizScrollBarHeight > ch )
-        {
-            vertScrollBarWidth = m_scrollBarWidth;
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxRIGHT;
 
-            m_wholeRowsVisible = 0;
-            for ( i = m_scrollPosY; i < m_numRows; i++ )
-            {
-                // A partial row doesn't count, we still have to scroll to
-                // see the rest of it
-                if ( m_rowBottoms[i] + horizScrollBarHeight > ch ) break;
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
 
-                m_wholeRowsVisible++ ;
-            }
-        }
-        else  
-        {
-            m_wholeRowsVisible = m_numRows - m_scrollPosY;
-            if ( m_scrollPosY )
-            {
-                vertScrollBarWidth = m_scrollBarWidth;
-            }
-        }
-        
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
 
-        if ( m_numCols  &&
-             m_colRights[m_numCols-1] + vertScrollBarWidth > cw)
-        {
-            horizScrollBarHeight = m_scrollBarWidth;
+wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
+                                            wxGridCellAttr& attr,
+                                            wxDC& dc,
+                                            int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
 
-            m_wholeColsVisible = 0;
-            for ( i = m_scrollPosX; i < m_numCols; i++ )
+void wxGridCellFloatRenderer::SetParameters(const wxString& params)
+{
+    bool ok = TRUE;
+
+    if ( !params )
+    {
+        // reset to defaults
+        SetWidth(-1);
+        SetPrecision(-1);
+    }
+    else
+    {
+        wxString tmp = params.BeforeFirst(_T(','));
+        if ( !!tmp )
+        {
+            long width;
+            if ( !tmp.ToLong(&width) )
             {
-                // A partial col doesn't count, we still have to scroll to
-                // see the rest of it
-                if ( m_colRights[i] + vertScrollBarWidth > cw ) break;
-                
-                m_wholeColsVisible++ ;
+                ok = FALSE;
             }
-        }
-        else
-        {
-            // we can see the right-most column
-            //
-            m_wholeColsVisible = m_numCols - m_scrollPosX;
-            if ( m_scrollPosX )
+            else
             {
-                horizScrollBarHeight = m_scrollBarWidth;
+                SetWidth((int)width);
+
+                tmp = params.AfterFirst(_T(','));
+                if ( !!tmp )
+                {
+                    long precision;
+                    if ( !tmp.ToLong(&precision) )
+                    {
+                        ok = FALSE;
+                    }
+                    else
+                    {
+                        SetPrecision((int)precision);
+                    }
+                }
             }
         }
-    }
 
-    
-    if ( m_vertScrollBar )
-    {
-        if ( !vertScrollBarWidth )
-        {
-            m_vertScrollBar->Show(FALSE);
-        }
-        else
+        if ( !ok )
         {
-            m_vertScrollBar->Show(TRUE);
-            m_vertScrollBar->SetScrollbar(
-                m_scrollPosY,
-                wxMax(m_wholeRowsVisible, 1),
-                (m_wholeRowsVisible == 0 ? 1 : m_numRows),
-                wxMax(m_wholeRowsVisible, 1) );
-                                       
-            m_vertScrollBar->SetSize( cw - m_scrollBarWidth,
-                                      m_top,
-                                      m_scrollBarWidth,
-                                      ch - m_top - horizScrollBarHeight);
+            wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string "
+                          "'%s ignored"), params.c_str());
         }
     }
-    
-    if ( m_horizScrollBar )
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellBoolRenderer
+// ----------------------------------------------------------------------------
+
+wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
+
+// FIXME these checkbox size calculations are really ugly...
+
+// between checkmark and box
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
+
+wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
+                                           wxGridCellAttr& WXUNUSED(attr),
+                                           wxDC& WXUNUSED(dc),
+                                           int WXUNUSED(row),
+                                           int WXUNUSED(col))
+{
+    // compute it only once (no locks for MT safeness in GUI thread...)
+    if ( !ms_sizeCheckMark.x )
     {
-        if ( !horizScrollBarHeight )
-        {
-            m_horizScrollBar->Show(FALSE);
-        }
-        else
-        {
-            m_horizScrollBar->Show(TRUE);
+        // get checkbox size
+        wxCoord checkSize = 0;
+        wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
+        wxSize size = checkbox->GetBestSize();
+        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+
+        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+        checkSize -= size.y / 2;
+#endif
 
-            m_horizScrollBar->SetScrollbar(
-                m_scrollPosX,
-                wxMax(m_wholeColsVisible, 1),
-                (m_wholeColsVisible == 0) ? 1 : m_numCols,
-                wxMax(m_wholeColsVisible, 1) );
+        delete checkbox;
 
-            m_horizScrollBar->SetSize( m_left,
-                                       ch - m_scrollBarWidth,
-                                       cw - m_left - vertScrollBarWidth,
-                                       m_scrollBarWidth );
-        }
+        ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
     }
 
-    m_bottom = m_right = 0;
-    if ( m_numRows > 0 )
+    return ms_sizeCheckMark;
+}
+
+void wxGridCellBoolRenderer::Draw(wxGrid& grid,
+                                  wxGridCellAttr& attr,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int row, int col,
+                                  bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
+
+    // draw a check mark in the centre (ignoring alignment - TODO)
+    wxSize size = GetBestSize(grid, attr, dc, row, col);
+
+    // don't draw outside the cell
+    wxCoord minSize = wxMin(rect.width, rect.height);
+    if ( size.x >= minSize || size.y >= minSize )
     {
-        m_bottom = wxMin( m_rowBottoms[m_numRows-1],
-                          ch - horizScrollBarHeight );
+        // and even leave (at least) 1 pixel margin
+        size.x = size.y = minSize - 2;
     }
-    if ( m_numCols > 0 )
+
+    // draw a border around checkmark
+    wxRect rectBorder;
+    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;
+
+    bool value;
+    if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+        value = grid.GetTable()->GetValueAsBool(row, col);
+    else
+        value = !!grid.GetTable()->GetValue(row, col);
+
+    if ( value )
     {
-        m_right = wxMin( m_colRights[m_numCols-1],
-                         cw - vertScrollBarWidth );
+        wxRect rectMark = rectBorder;
+#ifdef __WXMSW__
+        // MSW DrawCheckMark() is weird (and should probably be changed...)
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+        rectMark.x++;
+        rectMark.y++;
+#else // !MSW
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
+#endif // MSW/!MSW
+
+        dc.SetTextForeground(attr.GetTextColour());
+        dc.DrawCheckMark(rectMark);
     }
+
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
+    dc.DrawRectangle(rectBorder);
 }
 
+// ----------------------------------------------------------------------------
+// wxGridCellAttr
+// ----------------------------------------------------------------------------
 
-bool wxGrid::IsOnScreen()
+wxGridCellAttr *wxGridCellAttr::Clone() const
 {
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-    return ( cw > 10 );
-}
+    wxGridCellAttr *attr = new wxGridCellAttr;
+    if ( HasTextColour() )
+        attr->SetTextColour(GetTextColour());
+    if ( HasBackgroundColour() )
+        attr->SetBackgroundColour(GetBackgroundColour());
+    if ( HasFont() )
+        attr->SetFont(GetFont());
+    if ( HasAlignment() )
+        attr->SetAlignment(m_hAlign, m_vAlign);
 
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
+    }
+    if ( m_editor )
+    {
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
 
-// this is called when the grid table sends a message to say that it
-// has been redimensioned
-//
-bool wxGrid::Redimension( wxGridTableMessage& msg )
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
+
+    attr->SetDefAttr(m_defGridAttr);
+
+    return attr;
+}
+
+const wxColour& wxGridCellAttr::GetTextColour() const
 {
-    int i;
-    
-    switch ( msg.GetId() )
+    if (HasTextColour())
     {
-        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;
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
-        {
-            int numRows = msg.GetCommandInt();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Add( m_defaultRowHeight );
-                m_rowBottoms.Add( 0 );
-            }
-            m_numRows += numRows;
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Remove( pos );
-                m_rowBottoms.Remove( pos );
-            }
-            m_numRows -= numRows;
-
-            // TODO: improve these adjustments...
-            //
-            if ( m_scrollPosY >= m_numRows )
-                m_scrollPosY = 0;
-
-            if ( !m_numRows )
-            {
-                m_numCols = 0;
-                m_colWidths.Clear();
-                m_colRights.Clear();
-                m_currentCellCoords = wxGridNoCellCoords;
-            }
-            else if ( m_currentCellCoords.GetRow() >= m_numRows )
-            {
-                m_currentCellCoords.Set( 0, 0 );
-            }
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
-        {
-            size_t pos = msg.GetCommandInt();
-            int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Insert( m_defaultColWidth, pos );
-                m_colRights.Insert( 0, pos );
-            }
-            m_numCols += numCols;
-            CalcDimensions();
-        }
-        return TRUE;
-
-        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
-        {
-            int numCols = msg.GetCommandInt();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Add( m_defaultColWidth );
-                m_colRights.Add( 0 );
-            }
-            m_numCols += numCols;
-            CalcDimensions();
-        }
-        return TRUE;
+        return m_colText;
+    }
+    else if (m_defGridAttr != this)
+    {
+        return m_defGridAttr->GetTextColour();
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
+    }
+}
 
-        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
-        {
-            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;
-            //
-            // TODO: improve these adjustments...
-            //
-            if ( m_scrollPosX >= m_numCols )
-                m_scrollPosX = 0;
 
-            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 );
-            }
-            CalcDimensions();
-        }
-        return TRUE;
+const wxColour& wxGridCellAttr::GetBackgroundColour() const
+{
+    if (HasBackgroundColour())
+        return m_colBack;
+    else if (m_defGridAttr != this)
+        return m_defGridAttr->GetBackgroundColour();
+    else
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullColour;
     }
-
-    return FALSE;
 }
 
 
-//
-// ----- event handlers
-//
-
-// Generate a grid event based on a mouse event and 
-// return the result of ProcessEvent()
-//
-bool wxGrid::SendEvent( const wxEventType type,
-                       int row, int col,
-                       wxMouseEvent& mouseEv )
+const wxFont& wxGridCellAttr::GetFont() const
 {
-    if ( type == EVT_WXGRID_ROW_SIZE ||
-        type == EVT_WXGRID_COL_SIZE )
+    if (HasFont())
+        return m_font;
+    else if (m_defGridAttr != this)
+        return m_defGridAttr->GetFont();
+    else
     {
-       int rowOrCol = (row == -1 ? col : row);
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
+        return wxNullFont;
+    }
+}
 
-       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_WXGRID_RANGE_SELECT )
+void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
+{
+    if (HasAlignment())
     {
-       wxGridRangeSelectEvent gridEvt( GetId(),
-                                       type,
-                                       this,
-                                       m_selectedTopLeft,
-                                       m_selectedBottomRight,
-                                       mouseEv.ControlDown(),
-                                       mouseEv.ShiftDown(),
-                                       mouseEv.AltDown(),
-                                       mouseEv.MetaDown() );
-
-       return GetEventHandler()->ProcessEvent(gridEvt);
+        if ( hAlign ) *hAlign = m_hAlign;
+        if ( vAlign ) *vAlign = m_vAlign;
     }
+    else if (m_defGridAttr != this)
+        m_defGridAttr->GetAlignment(hAlign, vAlign);
     else
     {
-       wxGridEvent gridEvt( GetId(),
-                            type,
-                            this,
-                            row, col,
-                            mouseEv.GetX(), mouseEv.GetY(),
-                            mouseEv.ControlDown(),
-                            mouseEv.ShiftDown(),
-                            mouseEv.AltDown(),
-                            mouseEv.MetaDown() );
-
-       return GetEventHandler()->ProcessEvent(gridEvt);
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
     }
 }
 
 
-// Generate a grid event of specified type and return the result
-// of ProcessEvent().
-//
-bool wxGrid::SendEvent( const wxEventType type,
-                       int row, int col )
+// GetRenderer and GetEditor use a slightly different decision path about
+// which attribute to use.  If a non-default attr object has one then it is
+// used, otherwise the default editor or renderer is fetched from the grid and
+// used.  It should be the default for the data type of the cell.  If it is
+// NULL (because the table has a type that the grid does not have in its
+// registry,) then the grid's default editor or renderer is used.
+
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {
-    if ( type == EVT_WXGRID_ROW_SIZE ||
-        type == EVT_WXGRID_COL_SIZE )
-    {
-       int rowOrCol = (row == -1 ? col : row);
+    wxGridCellRenderer* renderer = NULL;
 
-       wxGridSizeEvent gridEvt( GetId(),
-                                type,
-                                this,
-                                rowOrCol );
+    if ( m_defGridAttr != this || grid == NULL )
+    {
+        renderer = m_renderer;      // use local attribute
+        if ( renderer )
+            renderer->IncRef();
+    }
 
-       return GetEventHandler()->ProcessEvent(gridEvt);
+    if ( !renderer && grid )        // get renderer for the data type
+    {
+        // GetDefaultRendererForCell() will do IncRef() for us
+        renderer = grid->GetDefaultRendererForCell(row, col);
     }
-    else
+
+    if ( !renderer )
     {
-       wxGridEvent gridEvt( GetId(),
-                            type,
-                            this,
-                            row, col );
+        // 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);
+    }
 
-       return GetEventHandler()->ProcessEvent(gridEvt);
+    if ( !renderer)
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
     }
-}
 
+    return renderer;
+}
 
-void wxGrid::OnPaint( wxPaintEvent& ev )
+wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
 {
-    wxPaintDC dc( this );
+    wxGridCellEditor* editor = NULL;
 
-    if ( !m_batchCount )
+    if ( m_defGridAttr != this || grid == NULL )
     {
-        // define a clipping region to avoid painting over the scroll bars
-        //
-        int vs = 0;
-        if ( m_vertScrollBar && m_vertScrollBar->IsShown() )
-            vs = m_scrollBarWidth;
-
-        int hs = 0;
-        if ( m_horizScrollBar && m_horizScrollBar->IsShown() )
-            hs = m_scrollBarWidth;
+        editor = m_editor;      // use local attribute
+        if ( editor )
+            editor->IncRef();
+    }
 
-        int cw, ch;
-        GetClientSize( &cw, &ch );
-        dc.SetClippingRegion( 0, 0, cw - vs, ch - hs );
-            
-        HideCurrentCellHighlight( dc );
-        
-        DrawLabelAreas( dc );
-        DrawColLabels( dc );
-        DrawRowLabels( dc );
-        DrawCellArea( dc );
-        DrawGridLines( dc );
-        DrawCells( dc );
-
-        // TODO: something more elegant than this...
-        //
-        if ( m_firstPaint )
-        {
-            if ( m_currentCellCoords == wxGridNoCellCoords )
-                m_currentCellCoords.Set(0, 0);
-        
-            SetEditControlValue();
-            ShowCellEditControl();
-            m_firstPaint = FALSE;
-        }
+    if ( !editor && grid )                   // get renderer for the data type
+        editor = grid->GetDefaultEditorForCell(row, col);
 
-        ShowCurrentCellHighlight( dc );
+    if ( !editor )
+        // if we still don't have one then use the grid default
+        editor = m_defGridAttr->GetEditor(NULL,0,0);
 
-        dc.DestroyClippingRegion();
+    if ( !editor )
+    {
+        wxFAIL_MSG(wxT("Missing default cell attribute"));
     }
+
+    return editor;
 }
 
+// ----------------------------------------------------------------------------
+// wxGridCellAttrData
+// ----------------------------------------------------------------------------
 
-void wxGrid::OnSize( wxSizeEvent& ev )
+void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
 {
-    CalcDimensions();
+    int n = FindIndex(row, col);
+    if ( n == wxNOT_FOUND )
+    {
+        // add the attribute
+        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+    }
+    else
+    {
+        if ( attr )
+        {
+            // change the attribute
+            m_attrs[(size_t)n].attr = attr;
+        }
+        else
+        {
+            // remove this attribute
+            m_attrs.RemoveAt((size_t)n);
+        }
+    }
 }
 
+wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+
+    int n = FindIndex(row, col);
+    if ( n != wxNOT_FOUND )
+    {
+        attr = m_attrs[(size_t)n].attr;
+        attr->IncRef();
+    }
+
+    return attr;
+}
 
-void wxGrid::OnMouse( wxMouseEvent& ev )
+void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows )
 {
-    int x = ev.GetX();
-    int y = ev.GetY();
-    int row, col;
-    
-    // ------------------------------------------------------------
-    //
-    // Mouse dragging
-    //
-    if ( ev.Dragging() )
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        m_isDragging = TRUE;
-        
-        if ( ev.LeftIsDown() )
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord row = coords.GetRow();
+        if ((size_t)row >= pos)
         {
-            switch( m_cursorMode )
+            if (numRows > 0)
             {
-                case WXGRID_CURSOR_SELECT_CELL:
-                {
-                    wxGridCellCoords cellCoords;
-                    XYToCell( x, y, cellCoords );
-                    if ( cellCoords != wxGridNoCellCoords )
-                    {
-                        if ( !IsSelection() )
-                        {
-                           SelectBlock( cellCoords, cellCoords );
-                       }
-                       else if ( !IsInSelection( cellCoords ) )
-                       {
-                           SelectBlock( m_currentCellCoords, cellCoords );
-                       }
-                    }
-                }
-                break;
-
-                case WXGRID_CURSOR_RESIZE_ROW:
-                {
-                    wxClientDC dc(this);
-                    dc.SetLogicalFunction(wxXOR);
-                    if ( m_dragLastPos >= 0 )
-                    {
-                        dc.DrawLine( m_left, m_dragLastPos,
-                                     m_right, m_dragLastPos );
-                    }
-                    dc.DrawLine( m_left, ev.GetY(),
-                                 m_right, ev.GetY());
-                
-                    m_dragLastPos = ev.GetY();
-                }
-                break;
-                
-                case WXGRID_CURSOR_RESIZE_COL:
-                {
-                    wxClientDC dc(this);
-                    dc.SetLogicalFunction(wxINVERT);
-                    if ( m_dragLastPos >= 0 )
-                    {
-                        dc.DrawLine( m_dragLastPos, m_top,
-                                     m_dragLastPos, m_bottom );
-                    }
-                    dc.DrawLine( ev.GetX(), m_top,
-                                 ev.GetX(), m_bottom );
-                    
-                    m_dragLastPos = ev.GetX();
-                }
-                break;
-
-                case WXGRID_CURSOR_SELECT_ROW:
+                // 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)
                 {
-                    if ( (row = YToRow( y )) >= 0  &&
-                         !IsInSelection( row, 0 ) )
-                    {
-                        SelectRow( row, TRUE );
-                    }
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetRow(row + numRows);
                 }
-                break;
-
-                case WXGRID_CURSOR_SELECT_COL:
+                else
                 {
-                    if ( (col = XToCol( x )) >= 0  &&
-                         !IsInSelection( 0, col ) )
-                    {
-                        SelectCol( col, TRUE );
-                    }
+                    // ...or remove the attribute
+                    m_attrs.RemoveAt((size_t)n);
+                    n--; count--;
                 }
-                break;
             }
         }
-        return;
     }
+}
 
-    m_isDragging = FALSE;
-    
-    // ------------------------------------------------------------
-    //
-    // Left mouse button down
-    //
-    if ( ev.LeftDown() )
+void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        row = -1;
-        col = -1;
-        wxGridCellCoords cellCoords;
-        
-        switch( XYToArea( x, y ) )
+        wxGridCellCoords& coords = m_attrs[n].coords;
+        wxCoord col = coords.GetCol();
+        if ( (size_t)col >= pos )
         {
-            case WXGRID_ROWLABEL:
-            {
-                // 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 ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
-                    {
-                        SelectRow( row, ev.ShiftDown() );
-                        m_cursorMode = WXGRID_CURSOR_SELECT_ROW;
-                    }
-                }
-            }
-            break;
-
-            case WXGRID_COLLABEL:
+            if ( numCols > 0 )
             {
-                // 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 ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
-                    {
-                        SelectCol( col, ev.ShiftDown() );
-                        m_cursorMode = WXGRID_CURSOR_SELECT_COL;
-                    }
-                }
+                // If rows inserted, include row counter where necessary
+                coords.SetCol(col + numCols);
             }
-            break;
-
-            case WXGRID_CORNERLABEL:
+            else if (numCols < 0)
             {
-                // leave both row and col as -1
-                //
-                if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
+                // If rows deleted ...
+                if ((size_t)col >= pos - numCols)
                 {
-                    SelectAll();
+                    // ...either decrement row counter (if row still exists)...
+                    coords.SetCol(col + numCols);
                 }
-            }
-            break;
-
-            case WXGRID_CELL:
-            {
-                XYToCell( x, y, cellCoords );
-                if ( !SendEvent( EVT_WXGRID_CELL_LEFT_CLICK,
-                                 cellCoords.GetRow(),
-                                 cellCoords.GetCol(),
-                                 ev ) )
+                else
                 {
-                    MakeCellVisible( cellCoords );
-                    SelectCell( cellCoords );
+                    // ...or remove the attribute
+                    m_attrs.RemoveAt((size_t)n);
+                    n--; count--;
                 }
             }
-            break;
-
-            default:
-#if 0                
-                wxLogMessage( "outside grid area" );
-#endif                
-                break;
         }
     }
-    // ------------------------------------------------------------
-    //
-    // Left mouse button double click
-    //
-    else if ( ev.LeftDClick() )
+}
+
+int wxGridCellAttrData::FindIndex(int row, int col) const
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        row = -1;
-        col = -1;
-        wxGridCellCoords cellCoords;
-        
-        switch( XYToArea( x, y ) )
+        const wxGridCellCoords& coords = m_attrs[n].coords;
+        if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
         {
-            case WXGRID_ROWLABEL:
-            {
-                // 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);
-                    SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
-                }
-            }
-            break;
-
-            case WXGRID_COLLABEL:
-            {
-                // 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);
-                    SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
-                }
-            }
-            break;
-
-            case WXGRID_CORNERLABEL:
-            {
-                // leave both row and col as -1
-                //
-                SendEvent(  EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );                
-            }
-            break;
-
-            case WXGRID_CELL:
-            {
-                XYToCell( x, y, cellCoords );
-                SendEvent( EVT_WXGRID_CELL_LEFT_DCLICK,
-                                 cellCoords.GetRow(),
-                                 cellCoords.GetCol(),
-                                 ev );
-            }
-            break;
-
-            default:
-#if 0                
-                wxLogMessage( "outside grid area" );
-#endif                
-                break;
+            return n;
         }
     }
-    // ------------------------------------------------------------
-    //
-    // Left mouse button released
-    //
-    else if ( ev.LeftUp() )
-    {
-       switch ( m_cursorMode )
-       {
-           case WXGRID_CURSOR_RESIZE_ROW:
-           {
-               if ( m_dragLastPos >= 0 )
-               {
-                   // erase the last line and resize the row
-                   //
-                   wxClientDC dc( this );
-                   dc.SetLogicalFunction( wxINVERT );
-                   dc.DrawLine( m_left, m_dragLastPos,
-                                m_right, m_dragLastPos );
-                   HideCellEditControl();
-                   int top = m_top + m_colLabelHeight;
-                   if ( m_dragRowOrCol > 0 )
-                       top = m_rowBottoms[m_dragRowOrCol-1];
-                   m_rowHeights[m_dragRowOrCol] = wxMax( ev.GetY() - top,
-                                                         WXGRID_MIN_ROW_HEIGHT );
-                   CalcDimensions();
-                   ShowCellEditControl();
-                   Refresh();
-
-                   // Note: we are ending the event *after* doing
-                   // default processing in this case
-                   //
-                   SendEvent( EVT_WXGRID_ROW_SIZE, m_dragRowOrCol, -1, ev );
-               }
-           }
-           break;
-
-           case WXGRID_CURSOR_RESIZE_COL:
-           {
-               if ( m_dragLastPos >= 0 )
-               {
-                   // erase the last line and resize the col
-                   //
-                   wxClientDC dc( this );
-                   dc.SetLogicalFunction( wxINVERT );
-                   dc.DrawLine( m_left, m_dragLastPos,
-                                m_right, m_dragLastPos );
-                   HideCellEditControl();
-                   int left = m_left + m_rowLabelWidth;
-                   if ( m_dragRowOrCol > 0 )
-                       left = m_colRights[m_dragRowOrCol-1];
-                   m_colWidths[m_dragRowOrCol] = wxMax( ev.GetX() - left,
-                                                        WXGRID_MIN_COL_WIDTH );
-                   CalcDimensions();
-                   ShowCellEditControl();
-                   Refresh();
-
-                   // Note: we are ending the event *after* doing
-                   // default processing in this case
-                   //
-                   SendEvent( EVT_WXGRID_COL_SIZE, -1, m_dragRowOrCol, ev );
-               }
-           }
-           break;
-
-           case WXGRID_CURSOR_SELECT_CELL:
-           {
-               if ( IsSelection() )
-               {
-                   // Note: we are ending the event *after* doing
-                   // default processing in this case
-                   //
-                   SendEvent( EVT_WXGRID_RANGE_SELECT, -1, -1, ev );
-               }
-           }
-           break;
-       }
-
-       m_dragLastPos  = -1;
-    }
-    // ------------------------------------------------------------
-    //
-    // Right mouse button down
-    //
-    else if ( ev.RightDown() )
-    {
-       row = -1;
-       col = -1;
-       wxGridCellCoords cellCoords;
-
-       switch( XYToArea( x, y ) )
-       {
-            
-           case WXGRID_ROWLABEL:
-           {
-               row = YToRow(y);
-               if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
-               {
-                    // TODO: default processing ?
-                }
-            }
-            break;
-
-            case WXGRID_COLLABEL:
-            {
-                col = XToCol(x);
-               if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
-                {
-                    // TODO: default processing ?
-                }
-            }
-            break;
 
-            case WXGRID_CORNERLABEL:
-            {
-                // leave both row and col as -1
-                //
-                if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
-                {
-                    // TODO: default processing ?
-                }
-            }
-            break;
+    return wxNOT_FOUND;
+}
 
-            case WXGRID_CELL:
-            {
-                XYToCell( x, y, cellCoords );
-                if ( !SendEvent( EVT_WXGRID_CELL_RIGHT_CLICK,
-                                cellCoords.GetRow(),
-                                cellCoords.GetCol(),
-                                ev ) )
-                {
-                    // TODO: default processing ?
-                }
-            }
-            break;
+// ----------------------------------------------------------------------------
+// wxGridRowOrColAttrData
+// ----------------------------------------------------------------------------
 
-            default:
-#if 0                
-                wxLogMessage( "outside grid area" );
-#endif                
-                break;
-        }
+wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
+{
+    size_t count = m_attrs.Count();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_attrs[n]->DecRef();
     }
-    // ------------------------------------------------------------
-    //
-    // Right mouse button double click
-    //
-    else if ( ev.RightDClick() )
-    {
-       row = -1;
-       col = -1;
-       wxGridCellCoords cellCoords;
-
-       switch( XYToArea( x, y ) )
-       {
-            
-           case WXGRID_ROWLABEL:
-           {
-               row = YToRow(y);
-               SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
-            }
-            break;
+}
 
-            case WXGRID_COLLABEL:
-            {
-                col = XToCol(x);
-               SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
-            }
-            break;
+wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 
-            case WXGRID_CORNERLABEL:
-            {
-                // leave both row and col as -1
-                //
-                SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
-            }
-            break;
+    int n = m_rowsOrCols.Index(rowOrCol);
+    if ( n != wxNOT_FOUND )
+    {
+        attr = m_attrs[(size_t)n];
+        attr->IncRef();
+    }
 
-            case WXGRID_CELL:
-            {
-                XYToCell( x, y, cellCoords );
-                SendEvent( EVT_WXGRID_CELL_RIGHT_DCLICK,
-                           cellCoords.GetRow(),
-                           cellCoords.GetCol(),
-                           ev );
-            }
-            break;
+    return attr;
+}
 
-            default:
-#if 0                
-                wxLogMessage( "outside grid area" );
-#endif                
-                break;
+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);
         }
     }
-    // ------------------------------------------------------------
-    //
-    // No buttons down and mouse moving
-    //
-    else if ( ev.Moving() )
+}
+
+void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols )
+{
+    size_t count = m_attrs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        switch( XYToArea( x, y ) )
+        int & rowOrCol = m_rowsOrCols[n];
+        if ( (size_t)rowOrCol >= pos )
         {
-            case WXGRID_ROWLABEL:
+            if ( numRowsOrCols > 0 )
             {
-                m_dragRowOrCol = YToEdgeOfRow( y );
-                if ( m_dragRowOrCol >= 0 )
-                {
-                    if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                    {
-                        m_cursorMode = WXGRID_CURSOR_RESIZE_ROW;
-                        SetCursor( m_rowResizeCursor );
-                    }
-                }
-                else
-                {
-                    if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-                    {
-                        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
-                        SetCursor( *wxSTANDARD_CURSOR );
-                    }
-                }
+                // If rows inserted, include row counter where necessary
+                rowOrCol += numRowsOrCols;
             }
-            break;
-
-            case WXGRID_COLLABEL:
+            else if ( numRowsOrCols < 0)
             {
-                m_dragRowOrCol = XToEdgeOfCol( x );
-                if ( m_dragRowOrCol >= 0 )
-                {
-                    if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                    {
-                        m_cursorMode = WXGRID_CURSOR_RESIZE_COL;
-                        SetCursor( m_colResizeCursor );
-                    }
-                }
+                // If rows deleted, either decrement row counter (if row still exists)
+                if ((size_t)rowOrCol >= pos - numRowsOrCols)
+                    rowOrCol += numRowsOrCols;
                 else
                 {
-                    if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-                    {
-                        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
-                        SetCursor( *wxSTANDARD_CURSOR );
-                    }
+                    m_rowsOrCols.RemoveAt((size_t)n);
+                    m_attrs.RemoveAt((size_t)n);
+                    n--; count--;
                 }
             }
-            break;
+        }
+    }
+}
 
-            default:
-            {
-                if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-                {
-                    m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
-                    SetCursor( *wxSTANDARD_CURSOR );
-                }
-            }
-            break;
-        }        
+// ----------------------------------------------------------------------------
+// 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) const
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+    if ( m_data )
+    {
+        // 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);
+        }
+
+        if ( !attr )
+        {
+            // finally try the row attributes
+            attr = m_data->m_rowAttrs.GetAttr(row);
+        }
     }
+
+    return attr;
 }
 
+void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr,
+                                     int row, int col)
+{
+    if ( !m_data )
+        InitData();
+
+    m_data->m_cellAttrs.SetAttr(attr, row, col);
+}
 
-void wxGrid::OnKeyDown( wxKeyEvent& ev )
+void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row)
 {
-    if ( m_inOnKeyDown )
+    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 )
     {
-        // shouldn't be here - we are going round in circles...
-        //
-        wxLogFatalError( "wxGrid::OnKeyDown called while alread active" );
+        m_data->m_cellAttrs.UpdateAttrRows( pos, numRows );
+
+        m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows );
     }
+}
 
-    m_inOnKeyDown = TRUE;
-        
-    // propagate the event up and see if it gets processed
-    //
-    wxWindow *parent = GetParent();
-    wxKeyEvent keyEvt( ev );
-    keyEvt.SetEventObject( parent );
-    
-    if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
+void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
+{
+    if ( m_data )
     {
-        // try local handlers
-        //
-        switch ( ev.KeyCode() )
-        {
-            case WXK_UP:
-                if ( ev.ControlDown() )
-                {
-                    MoveCursorUpBlock();
-                }
-                else
-                {
-                    MoveCursorUp();
-                }
-                break;
-                
-            case WXK_DOWN:
-                if ( ev.ControlDown() )
-                {
-                    MoveCursorDownBlock();
-                }
-                else
-                {
-                    MoveCursorDown();
-                }
-                break;
+        m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
 
-            case WXK_LEFT:
-                if ( ev.ControlDown() )
-                {
-                    MoveCursorLeftBlock();
-                }
-                else
-                {
-                    MoveCursorLeft();
-                }
-                break;
+        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+    }
+}
 
-            case WXK_RIGHT:
-                if ( ev.ControlDown() )
-                {
-                    MoveCursorRightBlock();
-                }
-                else
-                {
-                    MoveCursorRight();
-                }
-                break;
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
 
-            case WXK_RETURN:
-                MoveCursorDown();
-                break;
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+    size_t count = m_typeinfo.Count();
+    for ( size_t i = 0; i < count; i++ )
+        delete m_typeinfo[i];
+}
 
-            case WXK_HOME:
-                if ( ev.ControlDown() )
-                {
-                    MakeCellVisible( 0, 0 );
-                    SelectCell( 0, 0 );
-                }
-                else
-                {
-                    ev.Skip();
-                }
-                break;
-                
-            case WXK_END:
-                if ( ev.ControlDown() )
-                {
-                    MakeCellVisible( m_numRows-1, m_numCols-1 );
-                    SelectCell( m_numRows-1, m_numCols-1 );
-                }
-                else
-                {
-                    ev.Skip();
-                }
-                break;
-                
-            default:
-                // now try the cell edit control
-                //
-                if ( IsCellEditControlEnabled() )
-                {
-                    ev.SetEventObject( m_cellEditCtrl );
-                    m_cellEditCtrl->GetEventHandler()->ProcessEvent( ev );
-                }
-                break;
+
+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;
         }
     }
 
-    m_inOnKeyDown = FALSE;
+    return wxNOT_FOUND;
 }
 
-
-// Text updated in an edit control - either a text control or a
-// combo box
-//
-void wxGrid::OnText( wxKeyEvent& ev )
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
 {
-    if ( !m_inOnText )
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
     {
-        m_inOnText = TRUE;
-        wxWindow *ctrl = (wxWindow *)ev.GetEventObject();
-
-        if ( ctrl == m_cellEditCtrl &&
-             IsTopEditControlEnabled() )
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+        if ( typeName == wxGRID_VALUE_STRING )
         {
-            // set the value of the top edit control
-            //
-            switch ( m_editCtrlType )
-            {
-                case wxGRID_TEXTCTRL:
-                    ((wxTextCtrl *)m_topEditCtrl)->
-                        SetValue(((wxTextCtrl *)ctrl)->GetValue());
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    ((wxComboBox *)m_topEditCtrl)->
-                        SetValue(((wxComboBox *)ctrl)->GetValue());
-                    break;
-            }
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
         }
-        else if ( ctrl == m_topEditCtrl &&
-                  IsCellEditControlEnabled() )
+        else if ( typeName == wxGRID_VALUE_BOOL )
         {
-            switch ( m_editCtrlType )
-            {
-                case wxGRID_TEXTCTRL:
-                    ((wxTextCtrl *)m_cellEditCtrl)->
-                        SetValue(((wxTextCtrl *)ctrl)->GetValue());
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    ((wxComboBox *)m_cellEditCtrl)->
-                        SetValue(((wxComboBox *)ctrl)->GetValue());
-                    break;
-            }
+            RegisterDataType(wxGRID_VALUE_BOOL,
+                             new wxGridCellBoolRenderer,
+                             new wxGridCellBoolEditor);
+        }
+        else 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 if ( typeName == wxGRID_VALUE_CHOICE )
+        {
+            RegisterDataType(wxGRID_VALUE_CHOICE,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellChoiceEditor);
+        }
+        else
+        {
+            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;
     }
 
-    m_inOnText = FALSE;
+    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;
+    renderer->IncRef();
+    return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+    wxGridCellEditor* editor = m_typeinfo[index]->m_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)
+{
+    if ( m_attrProvider )
+        return m_attrProvider->GetAttr(row, col);
+    else
+        return (wxGridCellAttr *)NULL;
+}
+
+void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
+{
+    if ( m_attrProvider )
+    {
+        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 )
+    {
+        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 )
+    {
+        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);
+    }
+}
+
+void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
+{
+    if ( m_attrProvider )
+    {
+        m_attrProvider->UpdateAttrRows( pos, numRows );
+    }
+}
+
+void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
+{
+    if ( m_attrProvider )
+    {
+        m_attrProvider->UpdateAttrCols( pos, numCols );
+    }
+}
+
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
+                    "but your derived table class does not override this function") );
+
+    return FALSE;
+}
+
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
+                    "but your derived table class does not override this function"));
+
+    return FALSE;
+}
+
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
+                    "but your derived table class does not override this function"));
+
+    return FALSE;
+}
+
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
+                  "but your derived table class does not override this function"));
+
+    return FALSE;
+}
+
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
+                   "but your derived table class does not override this function"));
+
+    return FALSE;
+}
+
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
+{
+    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
+                    "but your derived table class does not override this function"));
+
+    return FALSE;
+}
+
+
+wxString wxGridTableBase::GetRowLabelValue( int row )
+{
+    wxString s;
+    s << row + 1; // RD: Starting the rows at zero confuses users, no matter
+                  //     how much it makes sense to us geeks.
+    return s;
+}
+
+wxString wxGridTableBase::GetColLabelValue( int col )
+{
+    // default col labels are:
+    //   cols 0 to 25   : A-Z
+    //   cols 26 to 675 : AA-ZZ
+    //   etc.
+
+    wxString s;
+    unsigned int i, n;
+    for ( n = 1; ; n++ )
+    {
+        s += (_T('A') + (wxChar)( col%26 ));
+        col = col/26 - 1;
+        if ( col < 0 ) break;
+    }
+
+    // reverse the string...
+    wxString s2;
+    for ( i = 0;  i < n;  i++ )
+    {
+        s2 += s[n-i-1];
+    }
+
+    return s2;
+}
+
+
+wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return wxGRID_VALUE_STRING;
+}
+
+bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
+                                     const wxString& typeName )
+{
+    return typeName == wxGRID_VALUE_STRING;
+}
+
+bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
+{
+    return CanGetValueAs(row, col, typeName);
+}
+
+long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return 0;
+}
+
+double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return 0.0;
+}
+
+bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
+{
+    return FALSE;
+}
+
+void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
+                                      long WXUNUSED(value) )
+{
+}
+
+void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col),
+                                        double WXUNUSED(value) )
+{
+}
+
+void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col),
+                                      bool WXUNUSED(value) )
+{
+}
+
+
+void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName) )
+{
+    return NULL;
+}
+
+void  wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
+                                         const wxString& WXUNUSED(typeName),
+                                         void* WXUNUSED(value) )
+{
+}
+
+//////////////////////////////////////////////////////////////////////
+//
+// Message class for the grid table to send requests and notifications
+// to the grid view
+//
+
+wxGridTableMessage::wxGridTableMessage()
+{
+    m_table = (wxGridTableBase *) NULL;
+    m_id = -1;
+    m_comInt1 = -1;
+    m_comInt2 = -1;
+}
+
+wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
+                                        int commandInt1, int commandInt2 )
+{
+    m_table = table;
+    m_id = id;
+    m_comInt1 = commandInt1;
+    m_comInt2 = commandInt2;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+//
+// A basic grid table for string data. An object of this class will
+// 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()
+{
+    int row, col;
+
+    m_data.Alloc( numRows );
+
+    wxArrayString sa;
+    sa.Alloc( numCols );
+    for ( col = 0;  col < numCols;  col++ )
+    {
+        sa.Add( wxEmptyString );
+    }
+
+    for ( row = 0;  row < numRows;  row++ )
+    {
+        m_data.Add( sa );
+    }
+}
+
+wxGridStringTable::~wxGridStringTable()
+{
+}
+
+int wxGridStringTable::GetNumberRows()
+{
+    return m_data.GetCount();
+}
+
+int wxGridStringTable::GetNumberCols()
+{
+    if ( m_data.GetCount() > 0 )
+        return m_data[0].GetCount();
+    else
+        return 0;
+}
+
+wxString wxGridStringTable::GetValue( int row, int col )
+{
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
+    return m_data[row][col];
+}
+
+void wxGridStringTable::SetValue( int row, int col, const wxString& value )
+{
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
+    m_data[row][col] = value;
+}
+
+bool wxGridStringTable::IsEmptyCell( int row, int col )
+{
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
+    return (m_data[row][col] == wxEmptyString);
+}
+
+void wxGridStringTable::Clear()
+{
+    int row, col;
+    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 row, col;
+
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+
+    if ( pos >= curNumRows )
+    {
+        return AppendRows( numRows );
+    }
+
+    wxArrayString sa;
+    sa.Alloc( curNumCols );
+    for ( col = 0;  col < curNumCols;  col++ )
+    {
+        sa.Add( wxEmptyString );
+    }
+
+    for ( row = pos;  row < pos + numRows;  row++ )
+    {
+        m_data.Insert( sa, row );
+    }
+    UpdateAttrRows( 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 row, col;
+
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+
+    wxArrayString sa;
+    if ( curNumCols > 0 )
+    {
+        sa.Alloc( curNumCols );
+        for ( col = 0;  col < curNumCols;  col++ )
+        {
+            sa.Add( wxEmptyString );
+        }
+    }
+
+    for ( row = 0;  row < numRows;  row++ )
+    {
+        m_data.Add( sa );
+    }
+
+    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 n;
+
+    size_t curNumRows = m_data.GetCount();
+
+    if ( pos >= curNumRows )
+    {
+        wxString errmsg;
+        errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
+                      "Pos value is invalid for present table with %d rows",
+                      pos, numRows, curNumRows );
+        wxFAIL_MSG( wxT(errmsg) );
+        return FALSE;
+    }
+
+    if ( numRows > curNumRows - pos )
+    {
+        numRows = curNumRows - pos;
+    }
+
+    if ( numRows >= curNumRows )
+    {
+        m_data.Empty();  // don't release memory just yet
+    }
+    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 );
+    }
+
+    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() : 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 );
+        }
+    }
+    UpdateAttrCols( pos, numCols );
+    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, n;
+
+    size_t curNumRows = m_data.GetCount();
+    if ( !curNumRows )
+    {
+        // TODO: something better than this ?
+        //
+        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
+                        "Call AppendRows() first") );
+        return FALSE;
+    }
+
+    for ( row = 0;  row < curNumRows;  row++ )
+    {
+        for ( n = 0;  n < numCols;  n++ )
+        {
+            m_data[row].Add( wxEmptyString );
+        }
+    }
+
+    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, n;
+
+    size_t curNumRows = m_data.GetCount();
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+
+    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;
+    }
+
+    if ( numCols > curNumCols - pos )
+    {
+        numCols = curNumCols - pos;
+    }
+
+    for ( row = 0;  row < curNumRows;  row++ )
+    {
+        if ( numCols >= curNumCols )
+        {
+            m_data[row].Clear();
+        }
+        else
+        {
+            for ( n = 0;  n < numCols;  n++ )
+            {
+                m_data[row].Remove( pos );
+            }
+        }
+    }
+    UpdateAttrCols( pos, -((int)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_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
+    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+END_EVENT_TABLE()
+
+wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
+                                            wxWindowID id,
+                                            const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+{
+    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 );
+
+    m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawRowLabels( dc );
+}
+
+
+void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessRowLabelMouseEvent( event );
+}
+
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+    EVT_PAINT( wxGridColLabelWindow::OnPaint )
+    EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
+    EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
+END_EVENT_TABLE()
+
+wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
+                                            wxWindowID id,
+                                            const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+{
+    m_owner = parent;
+}
+
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+
+    // 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 );
+
+    m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawColLabels( dc );
+}
+
+
+void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessColLabelMouseEvent( event );
+}
+
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
+
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+    EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
+    EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+END_EVENT_TABLE()
+
+wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
+                                                  wxWindowID id,
+                                                  const wxPoint &pos, const wxSize &size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+{
+    m_owner = parent;
+}
+
+void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+
+    int client_height = 0;
+    int client_width = 0;
+    GetClientSize( &client_width, &client_height );
+
+    dc.SetPen( *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 );
+}
+
+
+void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessCornerLabelMouseEvent( event );
+}
+
+
+// This seems to be required for wxMotif otherwise the mouse
+// cursor must be in the cell edit control to get key events
+//
+void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
+{
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////
+
+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, wxWANTS_CHARS, "grid window" )
+{
+    m_owner = parent;
+    m_rowLabelWin = rowLblWin;
+    m_colLabelWin = colLblWin;
+    SetBackgroundColour( "WHITE" );
+}
+
+
+wxGridWindow::~wxGridWindow()
+{
+}
+
+
+void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxPaintDC dc( this );
+    m_owner->PrepareDC( dc );
+    wxRegion reg = GetUpdateRegion();
+    m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc );
+#if WXGRID_DRAW_LINES
+    m_owner->DrawAllGridLines( dc, reg );
+#endif
+    m_owner->DrawGridSpace( dc );
+    m_owner->DrawHighlight( dc );
+}
+
+
+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 );
+}
+
+
+void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
+{
+    m_owner->ProcessGridCellMouseEvent( event );
+}
+
+
+// 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 )
+{
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
+
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
+
+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()
+
+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();
+}
+
+
+wxGrid::~wxGrid()
+{
+    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
+//
+
+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;
+    m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+
+    // Set default cell attributes
+    m_defaultCellAttr->SetFont(GetFont());
+    m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
+    m_defaultCellAttr->SetTextColour(
+        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
+    m_defaultCellAttr->SetBackgroundColour(
+        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
+    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
+
+
+    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 = 0;
+    // subwindow components that make up the wxGrid
+    m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+                                                    -1,
+                                                    wxDefaultPosition,
+                                                    wxDefaultSize );
+
+    m_rowLabelWin = new wxGridRowLabelWindow( this,
+                                              -1,
+                                              wxDefaultPosition,
+                                              wxDefaultSize );
+
+    m_colLabelWin = new wxGridColLabelWindow( this,
+                                              -1,
+                                              wxDefaultPosition,
+                                              wxDefaultSize );
+
+    m_gridWin = new wxGridWindow( this,
+                                  m_rowLabelWin,
+                                  m_colLabelWin,
+                                  -1,
+                                  wxDefaultPosition,
+                                  wxDefaultSize );
+
+    SetTargetWindow( m_gridWin );
+}
+
+
+bool wxGrid::CreateGrid( int numRows, int numCols,
+                         wxGrid::wxGridSelectionModes selmode )
+{
+    if ( m_created )
+    {
+        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
+        return FALSE;
+    }
+    else
+    {
+        m_numRows = numRows;
+        m_numCols = numCols;
+
+        m_table = new wxGridStringTable( m_numRows, m_numCols );
+        m_table->SetView( this );
+        m_ownTable = TRUE;
+        Init();
+        m_selection = new wxGridSelection( this, selmode );
+        m_created = TRUE;
+    }
+    return m_created;
+}
+
+void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+{
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+    }
+    else
+        m_selection->SetSelectionMode( selmode );
+}
+
+bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
+                       wxGrid::wxGridSelectionModes selmode )
+{
+    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?
+
+        // At least, you now have to cope with m_selection
+        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
+        return FALSE;
+    }
+    else
+    {
+        m_numRows = table->GetNumberRows();
+        m_numCols = table->GetNumberCols();
+
+        m_table = table;
+        m_table->SetView( this );
+        if (takeOwnership)
+            m_ownTable = TRUE;
+        Init();
+        m_selection = new wxGridSelection( this, selmode );
+        m_created = TRUE;
+    }
+
+    return m_created;
+}
+
+
+void wxGrid::Init()
+{
+    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;
+
+    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;
+
+    // TODO: something better than this ?
+    //
+    m_labelFont = this->GetFont();
+    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+
+    m_rowLabelHorizAlign = wxLEFT;
+    m_rowLabelVertAlign  = wxCENTRE;
+
+    m_colLabelHorizAlign = wxCENTRE;
+    m_colLabelVertAlign  = wxTOP;
+
+    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
+
+    m_gridLineColour = wxColour( 128, 128, 255 );
+    m_gridLinesEnabled = TRUE;
+
+    m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
+    m_winCapture = (wxWindow *)NULL;
+    m_canDragRowSize = TRUE;
+    m_canDragColSize = TRUE;
+    m_canDragGridSize = TRUE;
+    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::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+    m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+
+    m_editable = TRUE;  // default for whole grid
+
+    m_inOnKeyDown = FALSE;
+    m_batchCount = 0;
+
+    m_extraWidth =
+    m_extraHeight = 50;
+
+    CalcDimensions();
+}
+
+// ----------------------------------------------------------------------------
+// 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;
+    for ( int i = 0;  i < m_numRows;  i++ )
+    {
+        m_rowHeights.Add( m_defaultRowHeight );
+        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;
+    for ( int i = 0;  i < m_numCols;  i++ )
+    {
+        m_colWidths.Add( m_defaultColWidth );
+        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_numRows > 0  &&  m_numCols > 0 )
+    {
+        int right = GetColRight( m_numCols-1 ) + m_extraWidth;
+        int bottom = GetRowBottom( m_numRows-1 ) + m_extraHeight;
+
+        // 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 );
+
+    if ( m_cornerLabelWin->IsShown() )
+        m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
+
+    if ( m_colLabelWin->IsShown() )
+        m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+
+    if ( m_rowLabelWin->IsShown() )
+        m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+
+    if ( 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;
+
+    // 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();
+    }
+
+    switch ( msg.GetId() )
+    {
+        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;
+
+        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+        {
+            int numRows = msg.GetCommandInt();
+            for ( i = 0;  i < numRows;  i++ )
+            {
+                m_rowHeights.Add( m_defaultRowHeight );
+                m_rowBottoms.Add( 0 );
+            }
+
+            int oldNumRows = m_numRows;
+            m_numRows += numRows;
+
+            int 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;
+            }
+            CalcDimensions();
+        }
+        return TRUE;
+
+        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numRows = msg.GetCommandInt2();
+            for ( i = 0;  i < numRows;  i++ )
+            {
+                m_rowHeights.Remove( pos );
+                m_rowBottoms.Remove( pos );
+            }
+            m_numRows -= numRows;
+
+            if ( !m_numRows )
+            {
+                m_numCols = 0;
+                m_colWidths.Clear();
+                m_colRights.Clear();
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetRow() >= m_numRows )
+                    m_currentCellCoords.Set( 0, 0 );
+
+                int h = 0;
+                for ( i = 0;  i < m_numRows;  i++ )
+                {
+                    h += m_rowHeights[i];
+                    m_rowBottoms[i] = h;
+                }
+            }
+
+            CalcDimensions();
+        }
+        return TRUE;
+
+        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numCols = msg.GetCommandInt2();
+            for ( i = 0;  i < numCols;  i++ )
+            {
+                m_colWidths.Insert( m_defaultColWidth, pos );
+                m_colRights.Insert( 0, pos );
+            }
+            m_numCols += numCols;
+
+            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;
+            }
+            CalcDimensions();
+        }
+        return TRUE;
+
+        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+        {
+            int numCols = msg.GetCommandInt();
+            for ( i = 0;  i < numCols;  i++ )
+            {
+                m_colWidths.Add( m_defaultColWidth );
+                m_colRights.Add( 0 );
+            }
+
+            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++ )
+            {
+                right += m_colWidths[i];
+                m_colRights[i] = right;
+            }
+            CalcDimensions();
+        }
+        return TRUE;
+
+        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+        {
+            size_t pos = msg.GetCommandInt();
+            int numCols = msg.GetCommandInt2();
+            for ( i = 0;  i < numCols;  i++ )
+            {
+                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();
+        }
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+{
+    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;
+        for ( row = 0;  row < m_numRows;  row++ )
+        {
+            if ( GetRowBottom(row) < top )
+                continue;
+
+            if ( GetRowTop(row) > bottom )
+                break;
+
+            m_rowLabelsExposed.Add( row );
+        }
+
+        iter++ ;
+    }
+}
+
+
+void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+{
+    wxRegionIterator iter( reg );
+    wxRect r;
+
+    m_colLabelsExposed.Empty();
+
+    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 = 0;  col < m_numCols;  col++ )
+        {
+            if ( GetColRight(col) < left )
+                continue;
+
+            if ( GetColLeft(col) > right )
+                break;
+
+            m_colLabelsExposed.Add( col );
+        }
+
+        iter++ ;
+    }
+}
+
+
+void wxGrid::CalcCellsExposed( wxRegion& reg )
+{
+    wxRegionIterator iter( reg );
+    wxRect r;
+
+    m_cellsExposed.Empty();
+    m_rowsExposed.Empty();
+    m_colsExposed.Empty();
+
+    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 = 0;  row < m_numRows;  row++ )
+        {
+            if ( GetRowBottom(row) <= top )
+                continue;
+
+            if ( GetRowTop(row) > bottom )
+                break;
+
+            m_rowsExposed.Add( row );
+
+            for ( col = 0;  col < m_numCols;  col++ )
+            {
+                if ( GetColRight(col) <= left )
+                    continue;
+
+                if ( GetColLeft(col) > right )
+                    break;
+
+                if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
+                    m_colsExposed.Add( col );
+                m_cellsExposed.Add( wxGridCellCoords( row, col ) );
+            }
+        }
+
+        iter++;
+    }
+}
+
+
+void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
+{
+    int x, y, row;
+    wxPoint pos( event.GetPosition() );
+    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+
+    if ( event.Dragging() )
+    {
+        m_isDragging = TRUE;
+
+        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 )
+                    {
+                        m_selection->SelectRow( row,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+
+                // default label to suppress warnings about "enumeration value
+                // 'xxx' not handled in switch
+                default:
+                    break;
+            }
+        }
+        return;
+    }
+
+    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 ( 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() )
+    {
+        if ( YToEdgeOfRow(y) < 0 )
+        {
+            row = YToRow(y);
+            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+        }
+    }
+
+
+    // ------------ 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 ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() )
+    {
+        row = YToRow(y);
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+        {
+            // 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() )
+    {
+        m_isDragging = TRUE;
+
+        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 )
+                    {
+                        m_selection->SelectCol( col,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+
+                // default label to suppress warnings about "enumeration value
+                // 'xxx' not handled in switch
+                default:
+                    break;
+            }
+        }
+        return;
+    }
+
+    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 ( 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() )
+    {
+        if ( XToEdgeOfCol(x) < 0 )
+        {
+            col = XToCol(x);
+            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
+        }
+    }
+
+
+    // ------------ 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 ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+        {
+            // no default action at the moment
+        }
+    }
+
+
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() )
+    {
+        col = XToCol(x);
+        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+        {
+            // 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 )
+        return;
+
+    if ( !win )
+    {
+        // by default use the grid itself
+        win = m_gridWin;
+    }
+
+    if ( m_winCapture )
+    {
+        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 );
+
+    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 ( IsCellEditControlEnabled() )
+            {
+                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;
+                    SelectBlock ( m_selectingKeyboard, coords );
+                }
+                else
+                {
+                    if ( !IsSelection() )
+                    {
+                        SelectBlock( coords, coords );
+                    }
+                    else
+                    {
+                        SelectBlock( 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 ( !event.ShiftDown() && !event.ControlDown() )
+            ClearSelection();
+        if ( event.ShiftDown() )
+        {
+            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 )
+        {
+            if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+                             coords.GetRow(),
+                             coords.GetCol(),
+                             event ) )
+            {
+                DisableCellEditControl();
+                MakeCellVisible( coords );
+
+                // if this is the second click on this cell then start
+                // the edit control
+                if ( m_waitForSlowClick &&
+                     (coords == m_currentCellCoords) &&
+                     CanEnableCellControl())
+                {
+                    EnableCellEditControl();
+
+                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+                    wxGridCellEditor *editor = attr->GetEditor(this,
+                                                               coords.GetRow(),
+                                                               coords.GetCol());
+                    editor->StartingClick();
+                    editor->DecRef();
+                    attr->DecRef();
+
+                    m_waitForSlowClick = FALSE;
+                }
+                else
+                {
+                    if ( event.ControlDown() )
+                    {
+                        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
+                        SetCurrentCell( coords );
+                    m_waitForSlowClick = TRUE;
+                }
+            }
+        }
+    }
+
+
+    // ------------ Left double click
+    //
+    else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+
+        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
+        {
+            SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+                       coords.GetRow(),
+                       coords.GetCol(),
+                       event );
+        }
+    }
+
+
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+        {
+            if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
+            {
+                if (m_winCapture)
+                {
+                    m_winCapture->ReleaseMouse();
+                    m_winCapture = NULL;
+                }
+                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() )
+    {
+        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, WXGRID_MIN_ROW_HEIGHT ) );
+
+        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 );
+        }
+
+        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;
+            m_gridWin->Refresh( FALSE, &rect );
+        }
+
+        ShowCellEditControl();
+    }
+}
+
+
+
+//
+// ------ interaction with data model
+//
+bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
+{
+    switch ( msg.GetId() )
+    {
+        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
+            return GetModelValues();
+
+        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
+            return SetModelValues();
+
+        case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
+        case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+        case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
+        case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
+        case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+        case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+            return Redimension( msg );
+
+        default:
+            return FALSE;
+    }
+}
+
+
+
+// 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();
+
+        m_table->Clear();
+        if ( !GetBatchCount() ) m_gridWin->Refresh();
+    }
+}
+
+
+bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        bool ok = m_table->InsertRows( pos, numRows );
+
+        // the table will have sent the results of the insert row
+        // operation to this view object as a grid table message
+        //
+        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 ?
+                //
+            }
+
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+
+            m_selection->UpdateRows( pos, numRows );
+            if ( !GetBatchCount() ) Refresh();
+        }
+
+        return ok;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+
+bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    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 );
+        }
+
+        // the table will have sent the results of the append row
+        // operation to this view object as a grid table message
+        //
+        if ( !GetBatchCount() ) Refresh();
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+
+bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        if (m_table->DeleteRows( pos, numRows ))
+        {
+
+            // the table will have sent the results of the delete row
+            // operation to this view object as a grid table message
+            //
+            m_selection->UpdateRows( pos, -((int)numRows) );
+            if ( !GetBatchCount() ) Refresh();
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+
+bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        bool ok = m_table->InsertCols( pos, numCols );
+
+        // the table will have sent the results of the insert col
+        // operation to this view object as a grid table message
+        //
+        if ( ok )
+        {
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+
+            m_selection->UpdateCols( pos, numCols );
+            if ( !GetBatchCount() ) Refresh();
+        }
+
+        return ok;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+
+bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    if ( m_table && m_table->AppendCols( numCols ) )
+    {
+        // the table will have sent the results of the append col
+        // operation to this view object as a grid table message
+        //
+        if ( m_currentCellCoords == wxGridNoCellCoords )
+        {
+            // if we have just inserted cols into an empty grid the current
+            // cell will be undefined...
+            //
+            SetCurrentCell( 0, 0 );
+        }
+
+        if ( !GetBatchCount() ) Refresh();
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+
+bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag
+
+    if ( !m_created )
+    {
+        wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
+        return FALSE;
+    }
+
+    if ( m_table )
+    {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
+        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
+            //
+            m_selection->UpdateCols( pos, -((int)numCols) );
+            if ( !GetBatchCount() ) Refresh();
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+
+
+//
+// ----- event handlers
+//
+
+// Generate a grid event based on a mouse event and
+// return the result of ProcessEvent()
+//
+bool wxGrid::SendEvent( const wxEventType type,
+                        int row, int col,
+                        wxMouseEvent& mouseEv )
+{
+    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_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 == 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() );
+
+        return GetEventHandler()->ProcessEvent(gridEvt);
+    }
+    else
+    {
+        wxGridEvent gridEvt( GetId(),
+                             type,
+                             this,
+                             row, col,
+                             mouseEv.GetX(), mouseEv.GetY(),
+                             FALSE,
+                             mouseEv.ControlDown(),
+                             mouseEv.ShiftDown(),
+                             mouseEv.AltDown(),
+                             mouseEv.MetaDown() );
+
+        return GetEventHandler()->ProcessEvent(gridEvt);
+    }
+}
+
+
+// Generate a grid event of specified type and return the result
+// of ProcessEvent().
+//
+bool wxGrid::SendEvent( const wxEventType type,
+                        int row, int col )
+{
+    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_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);
+    }
+}
+
+
+void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc( this );
+}
+
+
+// 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& WXUNUSED(event) )
+{
+    CalcWindowSizes();
+    CalcDimensions();
+}
+
+
+void wxGrid::OnKeyDown( wxKeyEvent& event )
+{
+    if ( m_inOnKeyDown )
+    {
+        // shouldn't be here - we are going round in circles...
+        //
+        wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
+    }
+
+    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 ) )
+    {
+
+        // try local handlers
+        //
+        if ( !event.ShiftDown() && 
+             m_selectingKeyboard != wxGridNoCellCoords )
+        {
+            if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
+                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;
+            m_selectingKeyboard = wxGridNoCellCoords;
+        }
+
+        switch ( event.KeyCode() )
+        {
+            case WXK_UP:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorUpBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorUp( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_DOWN:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorDownBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorDown( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_LEFT:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorLeftBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorLeft( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_RIGHT:
+                if ( event.ControlDown() )
+                {
+                    MoveCursorRightBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorRight( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_RETURN:
+                if ( event.ControlDown() )
+                {
+                    event.Skip();  // to let the edit control have the return
+                }
+                else
+                {
+                    MoveCursorDown( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_ESCAPE:
+                ClearSelection();
+                break;
+
+            case WXK_TAB:
+                if (event.ShiftDown())
+                    MoveCursorLeft( FALSE );
+                else
+                    MoveCursorRight( FALSE );
+                break;
+
+            case WXK_HOME:
+                if ( event.ControlDown() )
+                {
+                    MakeCellVisible( 0, 0 );
+                    SetCurrentCell( 0, 0 );
+                }
+                else
+                {
+                    event.Skip();
+                }
+                break;
+
+            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;
+
+            case WXK_NEXT:
+                MovePageDown();
+                break;
+
+            case WXK_SPACE:
+                if ( event.ControlDown() )
+                {
+                    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
+
+            default:
+                // alphanumeric keys or F2 (special key just for this) enable
+                // the cell edit control
+                // On just Shift/Control I get values for event.KeyCode()
+                // that are outside the range where isalnum's behaviour is
+                // well defined, so do an additional sanity check.
+                if ( !(event.AltDown() ||
+                       event.MetaDown() ||
+                       event.ControlDown()) &&
+                     ((isalnum((int)event.KeyCode()) &&
+                       (event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
+                      event.KeyCode() == WXK_F2) &&
+                     !IsCellEditControlEnabled() &&
+                     CanEnableCellControl() )
+                {
+                    EnableCellEditControl();
+                    int row = m_currentCellCoords.GetRow();
+                    int col = m_currentCellCoords.GetCol();
+                    wxGridCellAttr* attr = GetCellAttr(row, col);
+                    wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+                    editor->StartingKey(event);
+                    editor->DecRef();
+                    attr->DecRef();
+                }
+                else
+                {
+                    // let others process char events with modifiers or all
+                    // char events for readonly cells
+                    event.Skip();
+                }
+                break;
+        }
+    }
+
+    m_inOnKeyDown = FALSE;
+}
+
+void wxGrid::OnEraseBackground(wxEraseEvent&)
+{
+}
+
+void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords )
+    {
+        HideCellEditControl();
+        DisableCellEditControl();
+
+        // Clear the old current cell highlight
+        wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+
+        // Otherwise refresh redraws the highlight!
+        m_currentCellCoords = coords;
+
+        m_gridWin->Refresh( FALSE, &r );
+    }
+
+    m_currentCellCoords = coords;
+
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
+
+    wxGridCellAttr* attr = GetCellAttr(coords);
+    DrawCellHighlight(dc, attr);
+    attr->DecRef();
+
+#if 0
+        // SN: For my extended selection code, automatic
+        //     deselection is definitely not a good idea.
+        if ( IsSelection() )
+        {
+            wxRect r( SelectionToDeviceRect() );
+            ClearSelection();
+            if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+        }
+#endif
+}
+
+
+//
+// ------ functions to get/send data (see also public functions)
+//
+
+bool wxGrid::GetModelValues()
+{
+    if ( m_table )
+    {
+        // all we need to do is repaint the grid
+        //
+        m_gridWin->Refresh();
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+bool wxGrid::SetModelValues()
+{
+    int row, col;
+
+    if ( m_table )
+    {
+        for ( row = 0;  row < m_numRows;  row++ )
+        {
+            for ( col = 0;  col < m_numCols;  col++ )
+            {
+                m_table->SetValue( row, col, GetCellValue(row, col) );
+            }
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+
+// Note - this function only draws cells that are in the list of
+// exposed cells (usually set from the update region by
+// CalcExposedCells)
+//
+void wxGrid::DrawGridCellArea( wxDC& dc )
+{
+    if ( !m_numRows || !m_numCols ) return;
+
+    size_t i;
+    size_t numCells = m_cellsExposed.GetCount();
+
+    for ( i = 0;  i < numCells;  i++ )
+    {
+        DrawCell( dc, m_cellsExposed[i] );
+    }
+}
+
+
+void wxGrid::DrawGridSpace( wxDC& dc )
+{
+    if ( m_numRows  &&  m_numCols )
+    {
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+
+        int right, bottom;
+        CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+        if ( right > GetColRight(m_numCols-1)  ||
+             bottom > GetRowBottom(m_numRows-1) )
+        {
+            int left, top;
+            CalcUnscrolledPosition( 0, 0, &left, &top );
+
+            dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+            dc.SetPen( *wxTRANSPARENT_PEN );
+
+            if ( right > GetColRight(m_numCols-1) )
+                dc.DrawRectangle( GetColRight(m_numCols-1), top,
+                                  right - GetColRight(m_numCols-1), ch );
+
+            if ( bottom > GetRowBottom(m_numRows-1) )
+                dc.DrawRectangle( left, GetRowBottom(m_numRows-1),
+                                  cw, bottom - GetRowBottom(m_numRows-1) );
+        }
+    }
+}
+
+
+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;
+
+    wxRect rect;
+    rect.x = GetColLeft(col);
+    rect.y = GetRowTop(row);
+    rect.width = GetColWidth(col) - 1;
+    rect.height = GetRowHeight(row) - 1;
+
+    // if the editor is shown, we should use it and not the renderer
+    if ( isCurrent && IsCellEditControlEnabled() )
+    {
+        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::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
+{
+    int row = m_currentCellCoords.GetRow();
+    int col = m_currentCellCoords.GetCol();
+
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        return;
+
+    wxRect rect;
+    rect.x = GetColLeft(col);
+    rect.y = GetRowTop(row);
+    rect.width = GetColWidth(col) - 1;
+    rect.height = GetRowHeight(row) - 1;
+
+    // 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, attr->IsReadOnly() ? 1 : 3, wxSOLID));
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+    dc.DrawRectangle(rect);
+
+#if 0
+        // VZ: my experiments with 3d borders...
+
+        // how to properly set colours for arbitrary bg?
+        wxCoord x1 = rect.x,
+                y1 = rect.y,
+                x2 = rect.x + rect.width -1,
+                y2 = rect.y + rect.height -1;
+
+        dc.SetPen(*wxWHITE_PEN);
+        dc.DrawLine(x1, y1, x2, y1);
+        dc.DrawLine(x1, y1, x1, y2);
+
+        dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
+        dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
+
+        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;
+
+    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+
+    // right hand border
+    //
+    dc.DrawLine( GetColRight(col), GetRowTop(row),
+                 GetColRight(col), GetRowBottom(row) );
+
+    // bottom border
+    //
+    dc.DrawLine( GetColLeft(col), GetRowBottom(row),
+                 GetColRight(col), GetRowBottom(row) );
+}
+
+void wxGrid::DrawHighlight(wxDC& dc)
+{
+    // 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 )
+    {
+        m_currentCellCoords.Set(0, 0);
+    }
+
+    if ( IsCellEditControlEnabled() )
+    {
+        // 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 = m_cellsExposed.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( m_cellsExposed[n] == m_currentCellCoords )
+        {
+            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_GTK(reg) )
+{
+    if ( !m_gridLinesEnabled ||
+         !m_numRows ||
+         !m_numCols ) return;
+
+    int top, bottom, left, right;
+
+#ifndef __WXGTK__
+    if (reg.IsEmpty())
+    {
+      int cw, ch;
+      m_gridWin->GetClientSize(&cw, &ch);
+
+      // virtual coords of visible area
+      //
+      CalcUnscrolledPosition( 0, 0, &left, &top );
+      CalcUnscrolledPosition( cw, ch, &right, &bottom );
+    }
+    else
+    {
+      wxCoord x, y, w, h;
+      reg.GetBox(x, y, w, h);
+      CalcUnscrolledPosition( x, y, &left, &top );
+      CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
+    }
+#else
+      int cw, ch;
+      m_gridWin->GetClientSize(&cw, &ch);
+      CalcUnscrolledPosition( 0, 0, &left, &top );
+      CalcUnscrolledPosition( cw, ch, &right, &bottom );
+#endif
+
+    // avoid drawing grid lines past the last row and col
+    //
+    right = wxMin( right, GetColRight(m_numCols - 1) );
+    bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
+
+    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+
+    // horizontal grid lines
+    //
+    int i;
+    for ( i = 0; i < m_numRows; i++ )
+    {
+        int bot = GetRowBottom(i) - 1;
+
+        if ( bot > bottom )
+        {
+            break;
+        }
+
+        if ( bot >= top )
+        {
+            dc.DrawLine( left, bot, right, bot );
+        }
+    }
+
+
+    // vertical grid lines
+    //
+    for ( i = 0; i < m_numCols; i++ )
+    {
+        int colRight = GetColRight(i) - 1;
+        if ( colRight > right )
+        {
+            break;
+        }
+
+        if ( colRight >= left )
+        {
+            dc.DrawLine( colRight, top, colRight, bottom );
+        }
+    }
+}
+
+
+void wxGrid::DrawRowLabels( wxDC& dc )
+{
+    if ( !m_numRows || !m_numCols ) return;
+
+    size_t i;
+    size_t numLabels = m_rowLabelsExposed.GetCount();
+
+    for ( i = 0;  i < numLabels;  i++ )
+    {
+        DrawRowLabel( dc, m_rowLabelsExposed[i] );
+    }
+}
+
+
+void wxGrid::DrawRowLabel( wxDC& dc, int row )
+{
+    if ( GetRowHeight(row) <= 0 )
+        return;
+
+    int rowTop = GetRowTop(row),
+        rowBottom = GetRowBottom(row) - 1;
+
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawLine( m_rowLabelWidth-1, rowTop,
+                 m_rowLabelWidth-1, rowBottom );
+
+    dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
+
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 0, rowTop, 0, rowBottom );
+    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );
+
+    int hAlign, vAlign;
+    GetRowLabelAlignment( &hAlign, &vAlign );
+
+    wxRect rect;
+    rect.SetX( 2 );
+    rect.SetY( GetRowTop(row) + 2 );
+    rect.SetWidth( m_rowLabelWidth - 4 );
+    rect.SetHeight( GetRowHeight(row) - 4 );
+    DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
+}
+
+
+void wxGrid::DrawColLabels( wxDC& dc )
+{
+    if ( !m_numRows || !m_numCols ) return;
+
+    size_t i;
+    size_t numLabels = m_colLabelsExposed.GetCount();
+
+    for ( i = 0;  i < numLabels;  i++ )
+    {
+        DrawColLabel( dc, m_colLabelsExposed[i] );
+    }
+}
+
+
+void wxGrid::DrawColLabel( wxDC& dc, int col )
+{
+    if ( GetColWidth(col) <= 0 )
+        return;
+
+    int colLeft = GetColLeft(col),
+        colRight = GetColRight(col) - 1;
+
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawLine( colRight, 0,
+                 colRight, m_colLabelHeight-1 );
+
+    dc.DrawLine( colLeft, m_colLabelHeight-1,
+                 colRight, m_colLabelHeight-1 );
+
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 0, colRight, 0 );
+
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );
+
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );
+
+    int hAlign, vAlign;
+    GetColLabelAlignment( &hAlign, &vAlign );
+
+    wxRect rect;
+    rect.SetX( colLeft + 2 );
+    rect.SetY( 2 );
+    rect.SetWidth( GetColWidth(col) - 4 );
+    rect.SetHeight( m_colLabelHeight - 4 );
+    DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
+}
+
+
+void wxGrid::DrawTextRectangle( wxDC& dc,
+                                const wxString& value,
+                                const wxRect& rect,
+                                int horizAlign,
+                                int vertAlign )
+{
+    long textWidth, textHeight;
+    long lineWidth, lineHeight;
+    wxArrayString lines;
+
+    dc.SetClippingRegion( rect );
+    StringToLines( value, lines );
+    if ( lines.GetCount() )
+    {
+        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+
+        float x, y;
+        switch ( horizAlign )
+        {
+            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;
+        }
+
+        switch ( vertAlign )
+        {
+            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;
+        }
+
+        for ( size_t i = 0;  i < lines.GetCount();  i++ )
+        {
+            dc.DrawText( lines[i], (int)x, (int)y );
+            y += lineHeight;
+        }
+    }
+
+    dc.DestroyClippingRegion();
+}
+
+
+// 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 )
+{
+    int startPos = 0;
+    int pos;
+    wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
+    wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
+
+    while ( startPos < (int)tVal.Length() )
+    {
+        pos = tVal.Mid(startPos).Find( eol );
+        if ( pos < 0 )
+        {
+            break;
+        }
+        else if ( pos == 0 )
+        {
+            lines.Add( wxEmptyString );
+        }
+        else
+        {
+            lines.Add( value.Mid(startPos, pos) );
+        }
+        startPos += pos+1;
+    }
+    if ( startPos < (int)value.Length() )
+    {
+        lines.Add( value.Mid( startPos ) );
+    }
+}
+
+
+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;
+    }
+
+    *width = w;
+    *height = h;
+}
+
+
+//
+// ------ Edit control functions
+//
+
+
+void wxGrid::EnableEditing( bool edit )
+{
+    // TODO: improve this ?
+    //
+    if ( edit != m_editable )
+    {
+        m_editable = edit;
+
+        // FIXME IMHO this won't disable the edit control if edit == FALSE
+        //       because of the check in the beginning of
+        //       EnableCellEditControl() just below (VZ)
+        EnableCellEditControl(m_editable);
+    }
 }
 
-void wxGrid::OnGridScroll( wxScrollEvent& ev )
+
+void wxGrid::EnableCellEditControl( bool enable )
 {
-    // propagate the event up and see if it gets processed
-    //
-    wxWindow *parent = GetParent();
-    wxScrollEvent scrollEvt( ev );
-    if (parent->GetEventHandler()->ProcessEvent( scrollEvt )) return;
-    
-    HideCellEditControl();
+    if (! m_editable)
+        return;
 
-    if ( ev.GetEventObject() == m_horizScrollBar )
+    if ( m_currentCellCoords == wxGridNoCellCoords )
+        SetCurrentCell( 0, 0 );
+
+    if ( enable != m_cellEditCtrlEnabled )
     {
-        if ( ev.GetPosition() != m_scrollPosX )
+        // TODO allow the app to Veto() this event?
+        SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN);
+
+        if ( enable )
         {
-            SetHorizontalScrollPos( ev.GetPosition() );
+            // this should be checked by the caller!
+            wxASSERT_MSG( CanEnableCellControl(),
+                          _T("can't enable editing for this cell!") );
+
+            // do it before ShowCellEditControl()
+            m_cellEditCtrlEnabled = enable;
+
+            ShowCellEditControl();
         }
-    }
-    else
-    {
-        if ( ev.GetPosition() != m_scrollPosY )
+        else
         {
-            SetVerticalScrollPos( ev.GetPosition() );
+            HideCellEditControl();
+            SaveEditControlValue();
+
+            // do it after HideCellEditControl()
+            m_cellEditCtrlEnabled = enable;
         }
     }
-
-    ShowCellEditControl();
 }
 
-
-void wxGrid::SelectCell( const wxGridCellCoords& coords )
+bool wxGrid::IsCurrentCellReadOnly() const
 {
-    wxClientDC dc( this );
-
-    if ( m_currentCellCoords != wxGridNoCellCoords )
-    {
-        HideCurrentCellHighlight( dc );
-        HideCellEditControl();
-        SaveEditControlValue();
-    }
-
-    m_currentCellCoords = coords;
+    // const_cast
+    wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords);
+    bool readonly = attr->IsReadOnly();
+    attr->DecRef();
 
-    SetEditControlValue();
-    if ( IsOnScreen() )
-    {
-        ShowCellEditControl();
-        ShowCurrentCellHighlight( dc );
-    }
+    return readonly;
+}
 
-    if ( IsSelection() )
-    {
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-    }
+bool wxGrid::CanEnableCellControl() const
+{
+    return m_editable && !IsCurrentCellReadOnly();
 }
 
+bool wxGrid::IsCellEditControlEnabled() const
+{
+    // the cell edit control might be disable for all cells or just for the
+    // current one if it's read only
+    return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
+}
 
 void wxGrid::ShowCellEditControl()
 {
-    wxRect rect;
-    
-    if ( IsCellEditControlEnabled() )         
+    if ( IsCellEditControlEnabled() )
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
@@ -1994,35 +5915,46 @@ void wxGrid::ShowCellEditControl()
         }
         else
         {
-            rect = CellToRect( m_currentCellCoords );
-            
-            m_cellEditCtrl->SetSize( rect );
-            m_cellEditCtrl->Show( TRUE );
+            wxRect rect = CellToRect( m_currentCellCoords );
+            int row = m_currentCellCoords.GetRow();
+            int col = m_currentCellCoords.GetCol();
 
-            switch ( m_editCtrlType )
+            // 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
+            rect.x--;
+            rect.y--;
+
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+            if ( !editor->IsCreated() )
             {
-                case wxGRID_TEXTCTRL:
-                    ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd();
-                    break;
+                editor->Create(m_gridWin, -1,
+                               new wxGridCellEditorEvtHandler(this, editor));
+            }
 
-                case wxGRID_CHECKBOX:
-                    // TODO: anything ???
-                    //
-                    break;
+            editor->Show( TRUE, attr );
 
-                case wxGRID_CHOICE:
-                    // TODO: anything ???
-                    //
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    // TODO: anything ???
-                    //
-                    break;
-            }
+            editor->SetSize( rect );
 
-            m_cellEditCtrl->SetFocus();
-        }
+            editor->BeginEdit(row, col, this);
+
+            editor->DecRef();
+            attr->DecRef();
+         }
     }
 }
 
@@ -2031,118 +5963,36 @@ void wxGrid::HideCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
-        m_cellEditCtrl->Show( FALSE );
-    }
-}
-
-void wxGrid::SetEditControlValue( const wxString& value )
-{
-    if ( m_table )
-    {
-        wxString s;
-        s = ( value == wxEmptyString ? GetCellValue(m_currentCellCoords) : value );
-
-        if ( IsTopEditControlEnabled() )
-        {
-            switch ( m_editCtrlType )
-            {
-                case wxGRID_TEXTCTRL:
-                    ((wxGridTextCtrl *)m_topEditCtrl)->SetStartValue(s);
-                    break;
-
-                case wxGRID_CHECKBOX:
-                    // TODO: implement this
-                    //
-                    break;
-
-                case wxGRID_CHOICE:
-                    // TODO: implement this
-                    //
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    // TODO: implement this
-                    //
-                    break;
-            }
-        }
-
-        if ( IsCellEditControlEnabled() )
-        {
-            switch ( m_editCtrlType )
-            {
-                case wxGRID_TEXTCTRL:
-                    ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s);
-                    break;
-
-                case wxGRID_CHECKBOX:
-                    // TODO: implement this
-                    //
-                    break;
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
-                case wxGRID_CHOICE:
-                    // TODO: implement this
-                    //
-                    break;
-                
-                case wxGRID_COMBOBOX:
-                    // TODO: implement this
-                    //
-                    break;
-            }
-        }
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->Show( FALSE );
+        editor->DecRef();
+        attr->DecRef();
+        m_gridWin->SetFocus();
     }
 }
 
+
 void wxGrid::SaveEditControlValue()
 {
-    if ( m_table )
+    if ( IsCellEditControlEnabled() )
     {
-       wxWindow *ctrl = (wxWindow *)NULL;
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
 
-        if ( IsCellEditControlEnabled() )
-        {
-            ctrl = m_cellEditCtrl;
-        }
-        else if ( IsTopEditControlEnabled() )
-        {
-            ctrl = m_topEditCtrl;
-        }
-        else
-        {
-            return;
-        }
-        
-        bool valueChanged = FALSE;
-        
-        switch ( m_editCtrlType )
-        {
-            case wxGRID_TEXTCTRL:
-                valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() !=
-                                ((wxGridTextCtrl *)ctrl)->GetStartValue());
-                SetCellValue( m_currentCellCoords,
-                              ((wxTextCtrl *) ctrl)->GetValue() );
-                break;
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+        bool changed = editor->EndEdit(row, col, this);
 
-            case wxGRID_CHECKBOX:
-                // TODO: implement this
-                //
-                break;
+        editor->DecRef();
+        attr->DecRef();
 
-            case wxGRID_CHOICE:
-                // TODO: implement this
-                //
-                break;
-                
-            case wxGRID_COMBOBOX:
-                // TODO: implement this
-                //
-                break;
-        }
-        
-        if ( valueChanged )
+        if (changed)
         {
-            SendEvent( EVT_WXGRID_CELL_CHANGE,
+            SendEvent( wxEVT_GRID_CELL_CHANGE,
                        m_currentCellCoords.GetRow(),
                        m_currentCellCoords.GetCol() );
         }
@@ -2150,56 +6000,37 @@ void wxGrid::SaveEditControlValue()
 }
 
 
-int wxGrid::XYToArea( int x, int y )
-{
-    if ( x > m_left && x < m_right &&
-         y > m_top && y < m_bottom )
-    {
-        if ( y < m_top + m_colLabelHeight )
-        {
-            if ( x > m_left + m_rowLabelWidth )
-            {
-                return WXGRID_COLLABEL;
-            }
-            else
-            {
-                return WXGRID_CORNERLABEL;
-            }
-        }
-        else if ( x <= m_left + m_rowLabelWidth )
-        {
-            return WXGRID_ROWLABEL;
-        }
-        else
-        {
-            return WXGRID_CELL;
-        }
-    }
-
-    return WXGRID_NOAREA;
-}
-
+//
+// ------ 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 )
 {
-    coords.SetRow( YToRow(y) );
-    coords.SetCol( XToCol(x) );
+    int row = YToRow(y);
+    int col = XToCol(x);
+
+    if ( row == -1  ||  col == -1 )
+    {
+        coords = wxGridNoCellCoords;
+    }
+    else
+    {
+        coords.Set( row, col );
+    }
 }
 
 
 int wxGrid::YToRow( int y )
 {
     int i;
-    
-    if ( y > m_top + m_colLabelHeight )
+
+    for ( i = 0;  i < m_numRows;  i++ )
     {
-        for ( i = m_scrollPosY;  i < m_numRows;  i++ )
-        {
-            if ( y < m_rowBottoms[i] )
-            {
-                return i;
-            }
-        }
+        if ( y < GetRowBottom(i) )
+            return i;
     }
 
     return -1;
@@ -2209,16 +6040,11 @@ int wxGrid::YToRow( int y )
 int wxGrid::XToCol( int x )
 {
     int i;
-    
-    if ( x > m_left + m_rowLabelWidth )
+
+    for ( i = 0;  i < m_numCols;  i++ )
     {
-        for ( i = m_scrollPosX;  i < m_numCols;  i++ )
-        {
-            if ( x < m_colRights[i] )
-            {
-                return i;
-            }
-        }
+        if ( x < GetColRight(i) )
+            return i;
     }
 
     return -1;
@@ -2231,23 +6057,18 @@ int wxGrid::XToCol( int x )
 int wxGrid::YToEdgeOfRow( int y )
 {
     int i, d;
-    
-    if ( y > m_top + m_colLabelHeight )
+
+    for ( i = 0;  i < m_numRows;  i++ )
     {
-        for ( i = m_scrollPosY;  i < m_numRows;  i++ )
+        if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
         {
-            if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE )
-            {
-                d = abs( y - m_rowBottoms[i] );
-                {
-                    if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-                }
-            }
+            d = abs( y - GetRowBottom(i) );
+            if ( d < WXGRID_LABEL_EDGE_ZONE )
+                return i;
         }
     }
 
     return -1;
-    
 }
 
 
@@ -2257,23 +6078,18 @@ int wxGrid::YToEdgeOfRow( int y )
 int wxGrid::XToEdgeOfCol( int x )
 {
     int i, d;
-    
-    if ( x > m_left + m_rowLabelWidth )
+
+    for ( i = 0;  i < m_numCols;  i++ )
     {
-        for ( i = m_scrollPosX;  i < m_numCols;  i++ )
+        if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
         {
-            if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE )
-            {
-                d = abs( x - m_colRights[i] );
-                {
-                    if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
-                }
-            }
+            d = abs( x - GetColRight(i) );
+            if ( d < WXGRID_LABEL_EDGE_ZONE )
+                return i;
         }
     }
 
     return -1;
-    
 }
 
 
@@ -2281,89 +6097,315 @@ wxRect wxGrid::CellToRect( int row, int col )
 {
     wxRect rect( -1, -1, -1, -1 );
 
-    if ( row >= m_scrollPosY  &&  col >= m_scrollPosX )
+    if ( row >= 0  &&  row < m_numRows  &&
+         col >= 0  &&  col < m_numCols )
     {
-        rect.x = m_colRights[col] - m_colWidths[col];
-        rect.y = m_rowBottoms[row] - m_rowHeights[row];
-        rect.width = m_colWidths[col];
-        rect.height = m_rowHeights[ row ];
+        rect.x = GetColLeft(col);
+        rect.y = GetRowTop(row);
+        rect.width = GetColWidth(col);
+        rect.height = GetRowHeight(row);
     }
 
     return rect;
-}    
+}
+
+
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+{
+    // get the cell rectangle in logical coords
+    //
+    wxRect r( CellToRect( row, col ) );
+
+    // convert to device coords
+    //
+    int left, top, right, bottom;
+    CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
+    CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
+
+    // check against the client area of the grid window
+    //
+    int cw, ch;
+    m_gridWin->GetClientSize( &cw, &ch );
+
+    if ( wholeCellVisible )
+    {
+        // is the cell wholly visible ?
+        //
+        return ( left >= 0  &&  right <= cw  &&
+                 top >= 0  &&  bottom <= ch );
+    }
+    else
+    {
+        // 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 ) );
 
+        // convert to device coords
+        //
+        int left, top, right, bottom;
+        CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
+        CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
+
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+
+        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;
+
+                h += rowHeight;
+                ypos -= rowHeight;
+            }
+
+            // 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 ( left < 0 )
+        {
+            xpos = r.GetLeft();
+        }
+        else if ( right > cw )
+        {
+            int w = r.GetWidth();
+            xpos = r.GetLeft();
+            for ( i = col-1;  i >= 0;  i-- )
+            {
+                int colWidth = GetColWidth(i);
+                if ( w + colWidth > cw )
+                    break;
+
+                w += colWidth;
+                xpos -= colWidth;
+            }
+
+            // see comment for ypos above
+            xpos += GRID_SCROLL_LINE / 2;
+        }
+
+        if ( xpos != -1  ||  ypos != -1 )
+        {
+            if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
+            if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
+            Scroll( xpos, ypos );
+            AdjustScrollbars();
+        }
+    }
+}
+
+
+//
+// ------ Grid cursor movement functions
+//
 
-bool wxGrid::MoveCursorUp()
+bool wxGrid::MoveCursorUp( bool expandSelection )
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() > 0 )
     {
-        SelectCell( m_currentCellCoords.GetRow() - 1,
-                      m_currentCellCoords.GetCol() );
-
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
-
+        if ( expandSelection )
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+            MakeCellVisible( m_selectingKeyboard.GetRow(),
+                             m_selectingKeyboard.GetCol() );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
+                            m_currentCellCoords.GetCol() );
+        }
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+bool wxGrid::MoveCursorDown( bool expandSelection )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetRow() < m_numRows-1 )
+    {
+        if ( expandSelection )
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+            MakeCellVisible( m_selectingKeyboard.GetRow(),
+                             m_selectingKeyboard.GetCol() );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
+                            m_currentCellCoords.GetCol() );
+        }
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+bool wxGrid::MoveCursorLeft( bool expandSelection )
+{
+    if ( m_currentCellCoords != wxGridNoCellCoords  &&
+         m_currentCellCoords.GetCol() > 0 )
+    {
+        if ( expandSelection )
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+            MakeCellVisible( m_selectingKeyboard.GetRow(),
+                             m_selectingKeyboard.GetCol() );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() - 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() - 1 );
+        }
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool wxGrid::MoveCursorDown()
+
+bool wxGrid::MoveCursorRight( bool expandSelection )
 {
-    // TODO: allow for scrolling
-    //
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
+         m_currentCellCoords.GetCol() < m_numCols - 1 )
     {
-        SelectCell( m_currentCellCoords.GetRow() + 1,
-                      m_currentCellCoords.GetCol() );
-
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
-            
+        if ( expandSelection )
+        {
+            if ( m_selectingKeyboard == wxGridNoCellCoords )
+                m_selectingKeyboard = m_currentCellCoords;
+            m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+            MakeCellVisible( m_selectingKeyboard.GetRow(),
+                             m_selectingKeyboard.GetCol() );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() + 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() + 1 );
+        }
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool wxGrid::MoveCursorLeft()
+
+bool wxGrid::MovePageUp()
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+
+    int row = m_currentCellCoords.GetRow();
+    if ( row > 0 )
     {
-        SelectCell( m_currentCellCoords.GetRow(),
-                      m_currentCellCoords.GetCol() - 1 );
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+
+        int y = GetRowTop(row);
+        int newRow = YToRow( y - ch + 1 );
+        if ( newRow == -1 )
+        {
+            newRow = 0;
+        }
+        else if ( newRow == row )
+        {
+            newRow = row - 1;
+        }
+
+        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
+        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
-        
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool wxGrid::MoveCursorRight()
+bool wxGrid::MovePageDown()
 {
-    if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols - 1 )
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+
+    int row = m_currentCellCoords.GetRow();
+    if ( row < m_numRows )
     {
-        SelectCell( m_currentCellCoords.GetRow(),
-                      m_currentCellCoords.GetCol() + 1 );
+        int cw, ch;
+        m_gridWin->GetClientSize( &cw, &ch );
+
+        int y = GetRowTop(row);
+        int newRow = YToRow( y + ch );
+        if ( newRow == -1 )
+        {
+            newRow = m_numRows - 1;
+        }
+        else if ( newRow == row )
+        {
+            newRow = row + 1;
+        }
+
+        MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
+        SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
-            
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool wxGrid::MoveCursorUpBlock()
+bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
@@ -2371,7 +6413,7 @@ bool wxGrid::MoveCursorUpBlock()
     {
         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
@@ -2408,19 +6450,25 @@ bool wxGrid::MoveCursorUpBlock()
                 }
             }
         }
-        
-        SelectCell( row, col );
-
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
 
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool wxGrid::MoveCursorDownBlock()
+bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
@@ -2428,7 +6476,7 @@ bool wxGrid::MoveCursorDownBlock()
     {
         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
@@ -2465,11 +6513,18 @@ bool wxGrid::MoveCursorDownBlock()
                 }
             }
         }
-        
-        SelectCell( row, col );
 
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
@@ -2477,7 +6532,7 @@ bool wxGrid::MoveCursorDownBlock()
     return FALSE;
 }
 
-bool wxGrid::MoveCursorLeftBlock()
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
@@ -2485,7 +6540,7 @@ bool wxGrid::MoveCursorLeftBlock()
     {
         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
@@ -2522,11 +6577,18 @@ bool wxGrid::MoveCursorLeftBlock()
                 }
             }
         }
-        
-        SelectCell( row, col );
 
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
@@ -2534,7 +6596,7 @@ bool wxGrid::MoveCursorLeftBlock()
     return FALSE;
 }
 
-bool wxGrid::MoveCursorRightBlock()
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
@@ -2542,7 +6604,7 @@ bool wxGrid::MoveCursorRightBlock()
     {
         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
@@ -2579,11 +6641,18 @@ bool wxGrid::MoveCursorRightBlock()
                 }
             }
         }
-        
-        SelectCell( row, col );
 
-        if ( !IsVisible( m_currentCellCoords ) )
-            MakeCellVisible( m_currentCellCoords );
+        MakeCellVisible( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
@@ -2594,1181 +6663,748 @@ bool wxGrid::MoveCursorRightBlock()
 
 
 //
-// ----- grid drawing functions
+// ------ Label values and formatting
 //
 
-void wxGrid::DrawLabelAreas( wxDC& dc )
-{
-    int cw, ch;
-    GetClientSize(&cw, &ch);
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush( wxBrush(GetLabelBackgroundColour(), wxSOLID) );
-    
-    dc.DrawRectangle( m_left, m_top,
-                      cw - m_left, m_colLabelHeight );
-    
-    dc.DrawRectangle( m_left, m_top,
-                      m_rowLabelWidth, ch - m_top );
-}
-
-
-void wxGrid::DrawColLabels( wxDC& dc )
-{
-    int cw, ch;
-    GetClientSize(&cw, &ch);
-
-    if (m_colLabelHeight == 0) return;
-
-    DrawColLabelBorders( dc );
-
-    wxRect rect;
-    rect.y = m_top + 1;
-    rect.height = m_colLabelHeight - 1;
-
-    int labelLeft = m_left + m_rowLabelWidth;
-    int i;
-    
-    for ( i = m_scrollPosX;  i < m_numCols;  i++ )
-    {
-        if ( labelLeft > cw) break;
-
-        rect.x = 1 + labelLeft;
-        rect.width = m_colWidths[i];
-        DrawColLabel( dc, rect, i );
-            
-        labelLeft += m_colWidths[i];
-    }
-}
-
-
-void wxGrid::DrawColLabelBorders( wxDC& dc )
-{
-    if ( m_colLabelHeight <= 0 ) return;
-
-    int i;
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-
-    dc.SetPen( *wxBLACK_PEN );
-  
-    // horizontal lines
-    //
-    dc.DrawLine( m_left, m_top, cw, m_top );
-
-    dc.DrawLine( m_left, m_top + m_colLabelHeight,
-                 cw,     m_top + m_colLabelHeight );
-
-    // vertical lines
-    //
-    int colLeft = m_left + m_rowLabelWidth;
-    for ( i = m_scrollPosX;  i <= m_numCols;  i++ )
-    {
-        if (colLeft > cw) break;
-
-        dc.DrawLine( colLeft, m_top,
-                     colLeft, m_top + m_colLabelHeight);
-
-        if ( i < m_numCols ) colLeft += m_colWidths[i];
-    }
-
-    // Draw white highlights for a 3d effect
-    //
-    dc.SetPen( *wxWHITE_PEN );
-
-    colLeft = m_left + m_rowLabelWidth;
-    for ( i = m_scrollPosX; i < m_numCols; i++ )
-    {
-        if (colLeft > cw) break;
-
-        dc.DrawLine(colLeft + 1, m_top + 1,
-                    colLeft + m_colWidths[i], m_top + 1);
-
-        dc.DrawLine(colLeft + 1, m_top + 1,
-                    colLeft + 1, m_top + m_colLabelHeight);
-        
-        colLeft += m_colWidths[i];
-    }
-}
-
-
-void wxGrid::DrawColLabel( wxDC& dc, const wxRect& rect, int col )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
 {
-    wxRect rect2;
-    rect2 = rect;
-    rect2.x += 3;
-    rect2.y += 2;
-    rect2.width -= 5;
-    rect2.height -= 4;
-    
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextBackground( GetLabelBackgroundColour() );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
-    
-    int hAlign, vAlign;
-    GetColLabelAlignment( &hAlign, &vAlign );
-    DrawTextRectangle( dc, GetColLabelValue( col ), rect2, hAlign, vAlign );
+    *horiz = m_rowLabelHorizAlign;
+    *vert  = m_rowLabelVertAlign;
 }
 
-
-void wxGrid::DrawRowLabels( wxDC& dc )
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
 {
-    int cw, ch;
-    GetClientSize(&cw, &ch);
-
-    if (m_rowLabelWidth == 0) return;
-
-    DrawRowLabelBorders( dc );
-
-    wxRect rect;
-    rect.x = m_left + 1;
-    rect.width = m_rowLabelWidth - 1;
-
-    int labelTop = m_top + m_colLabelHeight;
-    int i;
-    
-    for ( i = m_scrollPosY;  i < m_numRows;  i++ )
-    {
-        if ( labelTop > ch ) break;
-
-        rect.y = 1 + labelTop;
-        rect.height = m_rowHeights[i];
-        DrawRowLabel( dc, rect, i );
-            
-        labelTop += m_rowHeights[i];
-    }
+    *horiz = m_colLabelHorizAlign;
+    *vert  = m_colLabelVertAlign;
 }
 
-
-void wxGrid::DrawRowLabelBorders( wxDC& dc )
+wxString wxGrid::GetRowLabelValue( int row )
 {
-    if ( m_rowLabelWidth <= 0 ) return;
-
-    int i;
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-
-    dc.SetPen( *wxBLACK_PEN );
-  
-    // vertical lines
-    //
-    dc.DrawLine( m_left, m_top, m_left, ch );
-
-    dc.DrawLine( m_left + m_rowLabelWidth, m_top,
-                 m_left + m_rowLabelWidth, ch );
-
-    // horizontal lines
-    //
-    int rowTop = m_top + m_colLabelHeight;
-    for ( i = m_scrollPosY;  i <= m_numRows;  i++ )
+    if ( m_table )
     {
-        if ( rowTop > ch ) break;
-
-        dc.DrawLine( m_left, rowTop,
-                     m_left + m_rowLabelWidth, rowTop );
-
-        if ( i < m_numRows ) rowTop += m_rowHeights[i];
+        return m_table->GetRowLabelValue( row );
     }
-
-    // Draw white highlights for a 3d effect
-    //
-    dc.SetPen( *wxWHITE_PEN );
-
-    rowTop = m_top + m_colLabelHeight;
-    for ( i = m_scrollPosY; i < m_numRows; i++ )
+    else
     {
-        if ( rowTop > ch ) break;
-
-        dc.DrawLine( m_left + 1, rowTop + 1,
-                     m_left + m_rowLabelWidth, rowTop + 1 );
-
-        dc.DrawLine( m_left + 1, rowTop + 1,
-                     m_left + 1, rowTop + m_rowHeights[i] );
-        
-        rowTop += m_rowHeights[i];
+        wxString s;
+        s << row;
+        return s;
     }
 }
 
-
-void wxGrid::DrawRowLabel( wxDC& dc, const wxRect& rect, int row )
-{
-    wxRect rect2;
-    rect2 = rect;
-    rect2.x += 3;
-    rect2.y += 2;
-    rect2.width -= 5;
-    rect2.height -= 4;
-    
-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextBackground( GetLabelBackgroundColour() );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
-    
-    int hAlign, vAlign;
-    GetRowLabelAlignment( &hAlign, &vAlign );
-    DrawTextRectangle( dc, GetRowLabelValue( row ), rect2, hAlign, vAlign );
-}
-
-
-void wxGrid::DrawCellArea( wxDC& dc )
-{
-  int cw, ch;
-  GetClientSize(&cw, &ch);
-
-  dc.SetPen( *wxTRANSPARENT_PEN );
-  dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
-
-  int left = m_left + m_rowLabelWidth + 1;
-  int top  = m_top + m_colLabelHeight + 1;
-
-  dc.DrawRectangle( left, top, cw - left, ch - top );
-}
-
-
-void wxGrid::DrawGridLines( wxDC& dc )
+wxString wxGrid::GetColLabelValue( int col )
 {
-    if ( !m_gridLinesEnabled || !m_numRows || !m_numCols ) return;
-    
-    int i;
-    int cw, ch;
-    GetClientSize(&cw, &ch);
-
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
-
-    // horizontal grid lines
-    //
-    int rowTop = m_top + m_colLabelHeight + m_rowHeights[m_scrollPosY];
-    for ( i = m_scrollPosY + 1; i <= m_numRows; i++ )
+    if ( m_table )
     {
-        if ( rowTop > ch ) break;
-
-        dc.DrawLine( m_left + m_rowLabelWidth + 1, rowTop,
-                     m_right, rowTop);
-
-        if ( i < m_numRows ) rowTop += m_rowHeights[i];
+        return m_table->GetColLabelValue( col );
     }
-
-
-    // vertical grid lines
-    //
-    int colLeft = m_left + m_rowLabelWidth + m_colWidths[m_scrollPosX];
-    for ( i = m_scrollPosX + 1; i <= m_numCols; i++ )
+    else
     {
-        if ( colLeft > cw ) break;
-
-        dc.DrawLine( colLeft, m_top + m_colLabelHeight + 1,
-                     colLeft, m_bottom );
-
-        if ( i < m_numCols ) colLeft += m_colWidths[i];
+        wxString s;
+        s << col;
+        return s;
     }
 }
 
 
-void wxGrid::DrawCells( wxDC& dc )
+void wxGrid::SetRowLabelSize( int width )
 {
-    if ( !m_numRows || !m_numCols ) return;
-    
-    int row, col;
-        
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-    
-    wxRect rect;
-
-    if ( m_table )
+    width = wxMax( width, 0 );
+    if ( width != m_rowLabelWidth )
     {
-        rect.y = m_top + m_colLabelHeight;
-        for ( row = m_scrollPosY;  row < m_numRows;  row++ )
+        if ( width == 0 )
         {
-            if ( rect.y > ch ) break;
-
-            rect.height = m_rowHeights[ row ];
-            rect.x = m_left + m_rowLabelWidth;
-
-            for ( col = m_scrollPosX;  col < m_numCols;  col++ )
-            {
-                if ( rect.x > cw ) break;
-
-                rect.width = m_colWidths[col];
-                DrawCellBackground( dc, rect, row, col );
-                DrawCellValue( dc, rect, row, col );
-                rect.x += rect.width;
-            }
-            rect.y += rect.height;
+            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 );
         }
-    }
-}
-
-
-void wxGrid::DrawCellBackground( wxDC& dc, const wxRect& rect, int row, int col )
-{
-    wxRect rect2;
-    rect2 = rect;
-    rect2.x += 1;
-    rect2.y += 1;
-    rect2.width -= 2;
-    rect2.height -= 2;
-    
-    dc.SetBackgroundMode( wxSOLID );
-    
-    if ( IsInSelection( row, col ) )
-    {
-        // TODO: improve this
-        //
-        dc.SetBrush( *wxBLACK_BRUSH );
-    }
-    else
-    {
-        dc.SetBrush( wxBrush(GetCellBackgroundColour(row, col), wxSOLID) );
-    }
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle( rect2 );
-}
-
-
-void wxGrid::DrawCellValue( wxDC& dc, const wxRect& rect, int row, int col )
-{
-    wxRect rect2;
-    rect2 = rect;
-    rect2.x += 3;
-    rect2.y += 2;
-    rect2.width -= 5;
-    rect2.height -= 4;
-    
-    dc.SetBackgroundMode( wxTRANSPARENT );
 
-    if ( IsInSelection( row, col ) )
-    {
-        // TODO: improve this
-        //
-        dc.SetTextBackground( wxColour(0, 0, 0) );
-        dc.SetTextForeground( wxColour(255, 255, 255) );
-    }
-    else
-    {
-        dc.SetTextBackground( GetCellBackgroundColour(row, col) );
-        dc.SetTextForeground( GetCellTextColour(row, col) );
+        m_rowLabelWidth = width;
+        CalcWindowSizes();
+        Refresh( TRUE );
     }
-    dc.SetFont( GetCellFont(row, col) );
-    
-    int hAlign, vAlign;
-    GetCellAlignment( row, col, &hAlign, &vAlign );
-    DrawTextRectangle( dc, GetCellValue( row, col ), rect2, hAlign, vAlign );
 }
 
 
-void wxGrid::DrawCellHighlight( wxDC& dc, int row, int col )
+void wxGrid::SetColLabelSize( int height )
 {
-    // TODO: bounds checking on row, col ?
-    //
-
-    if ( row >= m_scrollPosY  &&  col >= m_scrollPosX )
+    height = wxMax( height, 0 );
+    if ( height != m_colLabelHeight )
     {
-        long x, y;
-
-        int cw, ch;
-        GetClientSize( &cw, &ch );
-    
-        x = m_colRights[col] - m_colWidths[col];
-        if ( x >= cw ) return;
-        
-        y = m_rowBottoms[row] - m_rowHeights[row];
-        if ( y >= ch ) return;
-
-        dc.SetLogicalFunction( wxXOR );
-        dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) );
-        dc.SetBrush( *wxTRANSPARENT_BRUSH );
-
-        dc.DrawRectangle( x, y,
-                          m_colWidths[col] + 2,
-                          m_rowHeights[row] + 2 );
+        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 );
+        }
 
-        dc.SetLogicalFunction( wxCOPY );
+        m_colLabelHeight = height;
+        CalcWindowSizes();
+        Refresh( TRUE );
     }
 }
 
 
-// This function is handy when you just want to update one or a few
-// cells.  For example, it is used by SetCellValue()
-//
-void wxGrid::DrawCell( int row, int col )
+void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
-    if ( !GetBatchCount() )
+    if ( m_labelBackgroundColour != colour )
     {
-        if ( !IsVisible( wxGridCellCoords(row, col) ) ) return;
-    
-        int cw, ch;
-        GetClientSize( &cw, &ch );
-    
-        wxRect rect( CellToRect( row, col ) );
+        m_labelBackgroundColour = colour;
+        m_rowLabelWin->SetBackgroundColour( colour );
+        m_colLabelWin->SetBackgroundColour( colour );
+        m_cornerLabelWin->SetBackgroundColour( colour );
 
-        if ( m_table )
+        if ( !GetBatchCount() )
         {
-            wxClientDC dc( this );
-            DrawCellBackground( dc, rect, row, col );
-            DrawCellValue( dc, rect, row, col );
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
+            m_cornerLabelWin->Refresh();
         }
     }
 }
 
-
-// this is just to make other code more obvious
-//
-void wxGrid::HideCurrentCellHighlight( wxDC& dc )
+void wxGrid::SetLabelTextColour( const wxColour& colour )
 {
-    if ( m_currentCellHighlighted  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+    if ( m_labelTextColour != colour )
     {
-        DrawCellHighlight( dc, m_currentCellCoords );
-        m_currentCellHighlighted = FALSE;
+        m_labelTextColour = colour;
+        if ( !GetBatchCount() )
+        {
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
+        }
     }
 }
 
-
-// this is just to make other code more obvious
-//
-void wxGrid::ShowCurrentCellHighlight( wxDC& dc )
+void wxGrid::SetLabelFont( const wxFont& font )
 {
-    if ( !m_currentCellHighlighted  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+    m_labelFont = font;
+    if ( !GetBatchCount() )
     {
-        DrawCellHighlight( dc, m_currentCellCoords );
-        m_currentCellHighlighted = TRUE;
+        m_rowLabelWin->Refresh();
+        m_colLabelWin->Refresh();
     }
 }
 
-
-void wxGrid::DrawTextRectangle( wxDC& dc,
-                                const wxString& value,
-                                const wxRect& rect,
-                                int horizAlign,
-                                int vertAlign )
+void wxGrid::SetRowLabelAlignment( int horiz, int vert )
 {
-    int i;
-    long textWidth, textHeight;
-    long lineWidth, lineHeight;
-    wxArrayString lines;
-    
-    // see if we are already clipping
-    //
-    wxRect clipRect;
-    dc.GetClippingBox( clipRect );
-
-    bool alreadyClipping = TRUE;
-    wxRect intersectRect;
-
-    if ( clipRect.x == 0 && clipRect.y == 0 &&
-         clipRect.width == 0 && clipRect.height == 0)
+    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
     {
-        alreadyClipping = FALSE;
-        intersectRect = rect;
+        m_rowLabelHorizAlign = horiz;
     }
-    else
+
+    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
     {
-        // Find the intersection of the clipping rectangle and our
-        // rectangle
-        //
-        wxRegion region( rect );
-        region.Intersect( clipRect );
-        if ( region.IsEmpty() )
-        {
-            // nothing to do
-            //
-            return;
-        }
-        intersectRect = region.GetBox();
+        m_rowLabelVertAlign = vert;
     }
 
-    if ( alreadyClipping ) dc.DestroyClippingRegion();
-
-    dc.SetClippingRegion( intersectRect );
+    if ( !GetBatchCount() )
+    {
+        m_rowLabelWin->Refresh();
+    }
+}
 
-    StringToLines( value, lines );
-    if ( lines.GetCount() )
+void wxGrid::SetColLabelAlignment( int horiz, int vert )
+{
+    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
     {
-        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
-        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
-        
-        float x, y;
-        switch ( horizAlign )
-        {
-            case wxRIGHT:
-                x = rect.x + (rect.width - textWidth - 1.0);
-                break;
+        m_colLabelHorizAlign = horiz;
+    }
 
-            case wxCENTRE:
-                x = rect.x + ((rect.width - textWidth)/2.0);
-                break;
+    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    {
+        m_colLabelVertAlign = vert;
+    }
 
-            case wxLEFT:
-            default:
-                x = rect.x + 1.0;
-                break;
-        }
+    if ( !GetBatchCount() )
+    {
+        m_colLabelWin->Refresh();
+    }
+}
 
-        switch ( vertAlign )
+void wxGrid::SetRowLabelValue( int row, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetRowLabelValue( row, s );
+        if ( !GetBatchCount() )
         {
-            case wxBOTTOM:
-                y = rect.y + (rect.height - textHeight - 1);
-                break;
-
-            case wxCENTRE:
-                y = rect.y + ((rect.height - textHeight)/2.0);
-                break;
-
-            case wxTOP:
-            default:
-                y = rect.y + 1.0;
-                break;
+            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 );
+            }
         }
+    }
+}
 
-        for ( i = 0;  i < lines.GetCount();  i++ )
+void wxGrid::SetColLabelValue( int col, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetColLabelValue( col, s );
+        if ( !GetBatchCount() )
         {
-            dc.DrawText( lines[i], (long)x, (long)y );
-            y += lineHeight;
+            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 );
+            }
         }
     }
-    
-    dc.DestroyClippingRegion();
-    if (alreadyClipping) dc.SetClippingRegion( clipRect );
 }
 
+void wxGrid::SetGridLineColour( const wxColour& colour )
+{
+    if ( m_gridLineColour != colour )
+    {
+        m_gridLineColour = colour;
+
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        DrawAllGridLines( dc, wxRegion() );
+    }
+}
 
-// Split multi line text up into an array of strings.  Any existing
-// contents of the string array are preserved.
-//
-void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
+void wxGrid::EnableGridLines( bool enable )
 {
-    // TODO: this won't work for WXMAC ? (lines end with '\r')
-    //
-    int startPos = 0;
-    int pos;
-    while ( startPos < value.Length() )
+    if ( enable != m_gridLinesEnabled )
     {
-        pos = value.Mid(startPos).Find( '\n' );
-        if ( pos < 0 )
-        {
-            break;
-        }
-        else if ( pos == 0 )
-        {
-            lines.Add( wxEmptyString );
-        }
-        else
+        m_gridLinesEnabled = enable;
+
+        if ( !GetBatchCount() )
         {
-            if ( value[startPos+pos-1] == '\r' )
+            if ( enable )
             {
-                lines.Add( value.Mid(startPos, pos-1) );
+                wxClientDC dc( m_gridWin );
+                PrepareDC( dc );
+                DrawAllGridLines( dc, wxRegion() );
             }
             else
             {
-                lines.Add( value.Mid(startPos, pos) );
+                m_gridWin->Refresh();
             }
         }
-        startPos += pos+1;
-    }
-    if ( startPos < value.Length() )
-    {
-        lines.Add( value.Mid( startPos ) );
     }
 }
 
 
-void wxGrid::GetTextBoxSize( wxDC& dc,
-                             wxArrayString& lines,
-                             long *width, long *height )
+int wxGrid::GetDefaultRowSize()
 {
-    long w = 0;
-    long h = 0;
-    long lineW, lineH;
+    return m_defaultRowHeight;
+}
 
-    int i;
-    for ( i = 0;  i < lines.GetCount();  i++ )
-    {
-        dc.GetTextExtent( lines[i], &lineW, &lineH );
-        w = wxMax( w, lineW );
-        h += lineH;
-    }
+int wxGrid::GetRowSize( int row )
+{
+    wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
-    *width = w;
-    *height = h;
+    return GetRowHeight(row);
 }
 
+int wxGrid::GetDefaultColSize()
+{
+    return m_defaultColWidth;
+}
 
-//
-// ------ functions to get/send data (see also public functions)
-//
+int wxGrid::GetColSize( int col )
+{
+    wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 
-bool wxGrid::GetModelValues()
+    return GetColWidth(col);
+}
+
+// ============================================================================
+// 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
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
 {
-    if ( m_table )
-    {
-        // all we need to do is repaint the grid
-        //
-        Refresh();
-        return TRUE;
-    }
+    m_defaultCellAttr->SetBackgroundColour(col);
+#ifdef __WXGTK__
+    m_gridWin->SetBackgroundColour(col);
+#endif
+}
 
-    return FALSE;
+void wxGrid::SetDefaultCellTextColour( const wxColour& col )
+{
+    m_defaultCellAttr->SetTextColour(col);
 }
 
+void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
+{
+    m_defaultCellAttr->SetAlignment(horiz, vert);
+}
 
-bool wxGrid::SetModelValues()
+void wxGrid::SetDefaultCellFont( const wxFont& font )
 {
-    int row, col;
-    
-    if ( m_table )
-    {
-        for ( row = m_scrollPosY;  row < m_numRows;  row++ )
-        {
-            for ( col = m_scrollPosX;  col < m_numCols;  col++ )
-            {
-                m_table->SetValue( row, col, GetCellValue(row, col) );
-            }
-        }
+    m_defaultCellAttr->SetFont(font);
+}
 
-        return TRUE;
-    }
-    
-    return FALSE;
+void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
+{
+    m_defaultCellAttr->SetRenderer(renderer);
 }
 
+void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
+{
+    m_defaultCellAttr->SetEditor(editor);
+}
 
-//
-// ------ public functions
-//
+// ----------------------------------------------------------------------------
+// access to the default attrbiutes
+// ----------------------------------------------------------------------------
 
-bool wxGrid::CreateGrid( int numRows, int numCols )
+wxColour wxGrid::GetDefaultCellBackgroundColour()
 {
-    if ( m_created )
-    {
-        wxLogError( "wxGrid::CreateGrid(numRows, numCols) called more than once" );
-        return FALSE;
-    }
-    else
-    {
-        m_numRows = numRows;
-        m_numCols = numCols;
-        
-        m_table = new wxGridStringTable( m_numRows, m_numCols );
-        m_table->SetView( this );
-        Init();
-        m_created = TRUE;
-    }
-    
-    return m_created;
+    return m_defaultCellAttr->GetBackgroundColour();
 }
 
+wxColour wxGrid::GetDefaultCellTextColour()
+{
+    return m_defaultCellAttr->GetTextColour();
+}
 
-// 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()
+wxFont wxGrid::GetDefaultCellFont()
 {
-    if ( m_table )
-    {
-        m_table->Clear();
-        SetEditControlValue();
-        if ( !GetBatchCount() ) Refresh();
-    }
+    return m_defaultCellAttr->GetFont();
+}
+
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+{
+    m_defaultCellAttr->GetAlignment(horiz, vert);
+}
+
+wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
+{
+    return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
+}
+
+wxGridCellEditor *wxGrid::GetDefaultEditor() const
+{
+    return m_defaultCellAttr->GetEditor(NULL,0,0);
+}
+
+// ----------------------------------------------------------------------------
+// access to cell attributes
+// ----------------------------------------------------------------------------
+
+wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxColour colour = attr->GetBackgroundColour();
+    attr->DecRef();
+    return colour;
+}
+
+wxColour wxGrid::GetCellTextColour( int row, int col )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxColour colour = attr->GetTextColour();
+    attr->DecRef();
+    return colour;
+}
+
+wxFont wxGrid::GetCellFont( int row, int col )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    wxFont font = attr->GetFont();
+    attr->DecRef();
+    return font;
+}
+
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    attr->GetAlignment(horiz, vert);
+    attr->DecRef();
+}
+
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+{
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+    attr->DecRef();
+
+    return renderer;
 }
 
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+{
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+    attr->DecRef();
 
-bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+    return editor;
+}
+
+bool wxGrid::IsReadOnly(int row, int col) const
 {
-    // TODO: something with updateLabels flag
+    wxGridCellAttr* attr = GetCellAttr(row, col);
+    bool isReadOnly = attr->IsReadOnly();
+    attr->DecRef();
+    return isReadOnly;
+}
 
-    if ( !m_created )
-    {
-        wxLogError( "Called wxGrid::InsertRows() before calling CreateGrid()" );
-        return FALSE;
-    }
-    
-    if ( m_table )
-    {
-        bool ok = m_table->InsertRows( pos, numRows );
+// ----------------------------------------------------------------------------
+// attribute support: cache, automatic provider creation, ...
+// ----------------------------------------------------------------------------
 
-        // the table will have sent the results of the insert row
-        // operation to this view object as a grid table message
-        //
-        if ( ok )
-        {
-            if ( !GetBatchCount() ) Refresh();
-        }
-        SetEditControlValue();
-        return ok;
-    }
-    else
+bool wxGrid::CanHaveAttributes()
+{
+    if ( !m_table )
     {
         return FALSE;
     }
+
+    return m_table->CanHaveAttributes();
 }
 
-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::ClearAttrCache()
 {
-    // TODO: something with updateLabels flag
-    
-    if ( !m_created )
-    {
-        wxLogError( "Called wxGrid::AppendRows() before calling CreateGrid()" );
-        return FALSE;
-    }
-    
-    if ( m_table && m_table->AppendRows( numRows ) )
-    {
-        // the table will have sent the results of the append row
-        // operation to this view object as a grid table message
-        //
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
+    if ( m_attrCache.row != -1 )
     {
-        return FALSE;
+        wxSafeDecRef(m_attrCache.attr);
+        m_attrCache.row = -1;
     }
 }
 
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {
-    // TODO: something with updateLabels flag
+    wxGrid *self = (wxGrid *)this;  // const_cast
 
-    if ( !m_created )
-    {
-        wxLogError( "Called wxGrid::DeleteRows() before calling CreateGrid()" );
-        return FALSE;
-    }
-    
-    if ( m_table && m_table->DeleteRows( pos, numRows ) )
-    {
-        // the table will have sent the results of the delete row
-        // operation to this view object as a grid table message
-        //
-        if ( m_numRows > 0 )
-            SetEditControlValue();
-        else
-            HideCellEditControl();
-        
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    self->ClearAttrCache();
+    self->m_attrCache.row = row;
+    self->m_attrCache.col = col;
+    self->m_attrCache.attr = attr;
+    wxSafeIncRef(attr);
 }
 
-bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 {
-    // TODO: something with updateLabels flag
-    
-    if ( !m_created )
+    if ( row == m_attrCache.row && col == m_attrCache.col )
     {
-        wxLogError( "Called wxGrid::InsertCols() before calling CreateGrid()" );
-        return FALSE;
-    }
+        *attr = m_attrCache.attr;
+        wxSafeIncRef(m_attrCache.attr);
 
-    if ( m_table )
-    {
-        HideCellEditControl();
-        bool ok = m_table->InsertCols( pos, numCols );
-        if ( ok )
-        {
-            // the table will have sent the results of the insert col
-            // operation to this view object as a grid table message
-            //
-            if ( !GetBatchCount() ) Refresh();
-        }
-        SetEditControlValue();
-        return ok;
+#ifdef DEBUG_ATTR_CACHE
+        gs_nAttrCacheHits++;
+#endif
+
+        return TRUE;
     }
     else
     {
+#ifdef DEBUG_ATTR_CACHE
+        gs_nAttrCacheMisses++;
+#endif
         return FALSE;
     }
 }
 
-bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 {
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
+    wxGridCellAttr *attr;
+    if ( !LookupAttr(row, col, &attr) )
     {
-       wxLogError( "Called wxGrid::AppendCols() before calling CreateGrid()" );
-       return FALSE;
+        attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
+        CacheAttr(row, col, attr);
     }
-
-    if ( m_table && m_table->AppendCols( numCols ) )
+    if (attr)
     {
-       // the table will have sent the results of the append col
-       // operation to this view object as a grid table message
-       //
-       if ( !GetBatchCount() ) Refresh();
-       return TRUE;
+        attr->SetDefAttr(m_defaultCellAttr);
     }
     else
     {
-       return FALSE;
+        attr = m_defaultCellAttr;
+        attr->IncRef();
     }
+
+    return attr;
 }
 
-bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
-    // TODO: something with updateLabels flag
-    
-    if ( !m_created )
-    {
-        wxLogError( "Called wxGrid::DeleteCols() before calling CreateGrid()" );
-        return FALSE;
-    }
-    
-    if ( m_table && m_table->DeleteCols( pos, numCols ) )
-    {
-        // the table will have sent the results of the delete col
-        // operation to this view object as a grid table message
-        //
-        if ( m_numCols > 0 )
-            SetEditControlValue();
-        else
-            HideCellEditControl();
-        
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
+    wxGridCellAttr *attr;
+    if ( !LookupAttr(row, col, &attr) || !attr )
     {
-        return FALSE;
-    }
-}
-    
+        wxASSERT_MSG( m_table,
+                      _T("we may only be called if CanHaveAttributes() "
+                         "returned TRUE and then m_table should be !NULL") );
 
+        attr = m_table->GetAttr(row, col);
+        if ( !attr )
+        {
+            attr = new wxGridCellAttr;
 
+            // artificially inc the ref count to match DecRef() in caller
+            attr->IncRef();
 
-// ------ control panel and cell edit control
-//
+            m_table->SetAttr(attr, row, col);
+        }
 
-void wxGrid::EnableEditing( bool edit )
-{
-    // TODO: improve this ?
-    //
-    if ( edit != m_editable )
-    {
-        m_editable = edit;
-        if ( !m_editable ) HideCellEditControl();
-        m_topEditCtrlEnabled = m_editable;
-        m_cellEditCtrlEnabled = m_editable;
-        if ( !m_editable ) ShowCellEditControl();            
+        CacheAttr(row, col, attr);
     }
+    attr->SetDefAttr(m_defaultCellAttr);
+    return attr;
 }
 
+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
 
-void wxGrid::EnableTopEditControl( bool enable )
+void wxGrid::SetColFormatBool(int col)
 {
-    if ( enable != m_topEditCtrlEnabled )
-    {
-        HideCellEditControl();
-        m_topEditCtrlEnabled = enable;
-        CalcDimensions();
-        m_topEditCtrl->Show( enable );
+    SetColFormatCustom(col, wxGRID_VALUE_BOOL);
+}
 
-        if ( m_currentCellCoords != wxGridNoCellCoords )
-          SetEditControlValue();
-          
-        ShowCellEditControl();
-        if ( !GetBatchCount() ) Refresh();
-    }
+void wxGrid::SetColFormatNumber(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
 }
 
-void wxGrid::EnableCellEditControl( bool enable )
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
 {
-    if ( m_cellEditCtrl &&
-         enable != m_cellEditCtrlEnabled )
+    wxString typeName = wxGRID_VALUE_FLOAT;
+    if ( (width != -1) || (precision != -1) )
     {
-        HideCellEditControl();
-        SaveEditControlValue();
-        
-        m_cellEditCtrlEnabled = enable;
-
-        SetEditControlValue();
-        ShowCellEditControl();
+        typeName << _T(':') << width << _T(',') << precision;
     }
-}
-
-
-//
-// ------ grid formatting functions
-//
 
-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
-{
-    *horiz = m_rowLabelHorizAlign;
-    *vert  = m_rowLabelVertAlign;
+    SetColFormatCustom(col, typeName);
 }
 
-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {
-    *horiz = m_colLabelHorizAlign;
-    *vert  = m_colLabelVertAlign;
+    wxGridCellAttr *attr = new wxGridCellAttr;
+    wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
+    attr->SetRenderer(renderer);
+
+    SetColAttr(col, attr);
 }
 
-wxString wxGrid::GetRowLabelValue( int row )
+// ----------------------------------------------------------------------------
+// setting cell attributes: this is forwarded to the table
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
-        return m_table->GetRowLabelValue( row );
+        m_table->SetRowAttr(attr, row);
     }
     else
     {
-        wxString s;
-        s << row;
-        return s;
+        wxSafeDecRef(attr);
     }
 }
 
-wxString wxGrid::GetColLabelValue( int col )
+void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
-        return m_table->GetColLabelValue( col );
+        m_table->SetColAttr(attr, col);
     }
     else
     {
-        wxString s;
-        s << col;
-        return s;
+        wxSafeDecRef(attr);
     }
 }
 
-void wxGrid::SetRowLabelSize( int width )
-{
-    m_rowLabelWidth = wxMax( 0, width );
-    CalcDimensions();
-    ShowCellEditControl();
-    if ( !GetBatchCount() ) Refresh();
-}
-
-void wxGrid::SetColLabelSize( int height )
-{
-    m_colLabelHeight = wxMax( 0, height );
-    CalcDimensions();
-    ShowCellEditControl();
-    if ( !GetBatchCount() ) Refresh();
-}
-
-void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
-{
-    m_labelBackgroundColour = colour;
-    if ( !GetBatchCount() ) Refresh();
-}
-
-void wxGrid::SetLabelTextColour( const wxColour& colour )
-{
-    m_labelTextColour = colour;
-    if ( !GetBatchCount() ) Refresh();
-}
-
-void wxGrid::SetLabelFont( const wxFont& font )
+void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour )
 {
-    m_labelFont = font;
-    if ( !GetBatchCount() ) Refresh();
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetBackgroundColour(colour);
+        attr->DecRef();
+    }
 }
 
-void wxGrid::SetRowLabelAlignment( int horiz, int vert )
+void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour )
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
-    {
-        m_rowLabelHorizAlign = horiz;
-    }
-    
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( CanHaveAttributes() )
     {
-        m_rowLabelVertAlign = vert;
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetTextColour(colour);
+        attr->DecRef();
     }
-
-    if ( !GetBatchCount() ) Refresh();
 }
 
-void wxGrid::SetColLabelAlignment( int horiz, int vert )
+void wxGrid::SetCellFont( int row, int col, const wxFont& font )
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
-    {
-        m_colLabelHorizAlign = horiz;
-    }
-    
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( CanHaveAttributes() )
     {
-        m_colLabelVertAlign = vert;
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetFont(font);
+        attr->DecRef();
     }
-
-    if ( !GetBatchCount() ) Refresh();
 }
 
-void wxGrid::SetRowLabelValue( int row, const wxString& s )
+void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
-        m_table->SetRowLabelValue( row, s );
-        if ( !GetBatchCount() ) Refresh();
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetAlignment(horiz, vert);
+        attr->DecRef();
     }
 }
 
-void wxGrid::SetColLabelValue( int col, const wxString& s )
+void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
 {
-    if ( m_table )
+    if ( CanHaveAttributes() )
     {
-        m_table->SetColLabelValue( col, s );
-        if ( !GetBatchCount() ) Refresh();
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetRenderer(renderer);
+        attr->DecRef();
     }
 }
 
-void wxGrid::SetGridLineColour( const wxColour& colour )
+void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor)
 {
-    m_gridLineColour = colour;
-    
-    wxClientDC dc( this );
-    DrawGridLines( dc );
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetEditor(editor);
+        attr->DecRef();
+    }
 }
 
-void wxGrid::EnableGridLines( bool enable )
+void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
 {
-    if ( enable != m_gridLinesEnabled )
+    if ( CanHaveAttributes() )
     {
-        m_gridLinesEnabled = enable;
-        if ( !GetBatchCount() ) Refresh();
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetReadOnly(isReadOnly);
+        attr->DecRef();
     }
 }
 
+// ----------------------------------------------------------------------------
+// Data type registration
+// ----------------------------------------------------------------------------
 
-int wxGrid::GetDefaultRowSize()
+void wxGrid::RegisterDataType(const wxString& typeName,
+                              wxGridCellRenderer* renderer,
+                              wxGridCellEditor* editor)
 {
-    return m_defaultRowHeight;
+    m_typeRegistry->RegisterDataType(typeName, renderer, editor);
 }
 
-int wxGrid::GetRowSize( int row )
-{
-    if ( row >= 0  &&  row < m_numRows )
-        return m_rowHeights[row];
-    else
-        return 0;  // TODO: log an error here
-}
 
-int wxGrid::GetDefaultColSize()
+wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
 {
-    return m_defaultColWidth;
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultEditorForType(typeName);
 }
 
-int wxGrid::GetColSize( int col )
+wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
 {
-    if ( col >= 0  &&  col < m_numCols )
-        return m_colWidths[col];
-    else
-        return 0;  // TODO: log an error here
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultRendererForType(typeName);
 }
 
-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxGridCellEditor*
+wxGrid::GetDefaultEditorForType(const wxString& typeName) const
 {
-    // TODO: replace this temp test code
-    //
-    return wxColour( 255, 255, 255 );
-}
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
 
-wxColour wxGrid::GetCellBackgroundColour( int row, int col )
-{
-    // TODO: replace this temp test code
-    //
-    return wxColour( 255, 255, 255 );    
-}
+        return NULL;
+    }
 
-wxColour wxGrid::GetDefaultCellTextColour()
-{
-    // TODO: replace this temp test code
-    //
-    return wxColour( 0, 0, 0 );    
+    return m_typeRegistry->GetEditor(index);
 }
 
-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxGridCellRenderer*
+wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
-    // TODO: replace this temp test code
-    //
-    return wxColour( 0, 0, 0 );    
-}
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
 
+        return NULL;
+    }
 
-wxColour wxGrid::GetCellHighlightColour()
-{
-    // TODO: replace this temp test code
-    //
-    return wxColour( 0, 0, 0 );    
+    return m_typeRegistry->GetRenderer(index);
 }
 
 
-wxFont wxGrid::GetDefaultCellFont()
-{
-    return m_defaultCellFont;
-}
+// ----------------------------------------------------------------------------
+// row/col size
+// ----------------------------------------------------------------------------
 
-wxFont wxGrid::GetCellFont( int row, int col )
+void wxGrid::EnableDragRowSize( bool enable )
 {
-    // TODO: replace this temp test code
-    //
-    return m_defaultCellFont;
+    m_canDragRowSize = enable;
 }
 
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+
+void wxGrid::EnableDragColSize( bool enable )
 {
-    // TODO: replace this temp test code
-    //
-    *horiz = wxLEFT;
-    *vert  = wxTOP;
+    m_canDragColSize = enable;
 }
 
-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::EnableDragGridSize( bool enable )
 {
-    // TODO: replace this temp test code
-    //
-    *horiz = wxLEFT;
-    *vert  = wxTOP;
+    m_canDragGridSize = enable;
 }
 
+
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
-    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
-
-    if ( resizeExistingRows )
-    {
-        // TODO: what do we do about events here ?
-        // Generate an event for each resize ?
-        //
-        int row;
-        for ( row = 0;  row < m_numRows;  row++ )
-        {
-            m_rowHeights[row] = m_defaultRowHeight;
-        }
+    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
+
+    if ( resizeExistingRows )
+    {
+        InitRowHeights();
+
         CalcDimensions();
-        if ( !GetBatchCount() ) Refresh();
     }
 }
 
 void wxGrid::SetRowSize( int row, int height )
 {
-    if ( row >= 0  &&  row < m_numRows )
-    {
-        m_rowHeights[row] = wxMax( 0, height );
-        CalcDimensions();
-        if ( !GetBatchCount() ) Refresh();
+    wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 
-        // Note: we are ending the event *after* doing
-        // default processing in this case
-        //
-        SendEvent( EVT_WXGRID_ROW_SIZE,
-                   row, -1 );
+    if ( m_rowHeights.IsEmpty() )
+    {
+        // need to really create the array
+        InitRowHeights();
     }
-    else
+
+    int h = wxMax( 0, height );
+    int diff = h - m_rowHeights[row];
+
+    m_rowHeights[row] = h;
+    int i;
+    for ( i = row;  i < m_numRows;  i++ )
     {
-        // TODO: log an error here
+        m_rowBottoms[i] += diff;
     }
+    CalcDimensions();
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
@@ -3777,319 +7413,259 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 
     if ( resizeExistingCols )
     {
-        // TODO: what do we do about events here ?
-        // Generate an event for each resize ?
-        //
-        int col;
-        for ( col = 0;  col < m_numCols;  col++ )
-        {
-            m_colWidths[col] = m_defaultColWidth;
-        }
+        InitColWidths();
+
         CalcDimensions();
-        if ( !GetBatchCount() ) Refresh();
     }
 }
 
 void wxGrid::SetColSize( int col, int width )
 {
-    if ( col >= 0  &&  col < m_numCols )
-    {
-        m_colWidths[col] = wxMax( 0, width );
-        CalcDimensions();
-        if ( !GetBatchCount() ) Refresh();
+    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 
-        // Note: we are ending the event *after* doing
-        // default processing in this case
-        //
-        SendEvent( EVT_WXGRID_COL_SIZE,
-                   -1, col );
-    }
-    else
+    // should we check that it's bigger than GetColMinimalWidth(col) here?
+
+    if ( m_colWidths.IsEmpty() )
     {
-        // TODO: log an error here
+        // need to really create the array
+        InitColWidths();
     }
-}
 
-void wxGrid::SetDefaultCellBackgroundColour( const wxColour& )
-{
-    // TODO: everything !!!
-    //
-}
+    int w = wxMax( 0, width );
+    int diff = w - m_colWidths[col];
+    m_colWidths[col] = w;
 
-void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& )
-{
-    // TODO: everything !!!
-    //
+    int i;
+    for ( i = col;  i < m_numCols;  i++ )
+    {
+        m_colRights[i] += diff;
+    }
+    CalcDimensions();
 }
 
-void wxGrid::SetDefaultCellTextColour( const wxColour& )
-{
-    // TODO: everything !!!
-    //
-}
 
-void wxGrid::SetCellTextColour( int row, int col, const wxColour& )
+void wxGrid::SetColMinimalWidth( int col, int width )
 {
-    // TODO: everything !!!
-    //
+    m_colMinWidths.Put(col, width);
 }
 
-void wxGrid::SetCellHighlightColour( const wxColour& )
+void wxGrid::SetRowMinimalHeight( int row, int width )
 {
-    // TODO: everything !!!
-    //
+    m_rowMinHeights.Put(row, width);
 }
 
-void wxGrid::SetDefaultCellFont( const wxFont& )
+int wxGrid::GetColMinimalWidth(int col) const
 {
-    // TODO: everything !!!
-    //
+    long value = m_colMinWidths.Get(col);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
 }
 
-void wxGrid::SetCellFont( int row, int col, const wxFont& )
+int wxGrid::GetRowMinimalHeight(int row) const
 {
-    // TODO: everything !!!
-    //
+    long value = m_rowMinHeights.Get(row);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
 }
 
-void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
-{
-    // TODO: everything !!!
-    //
-}
+// ----------------------------------------------------------------------------
+// auto sizing
+// ----------------------------------------------------------------------------
 
-void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
+void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 {
-    // TODO: everything !!!
-    //
-}
+    wxClientDC dc(m_gridWin);
 
+    // init both of them to avoid compiler warnings, even if weo nly need one
+    int row = -1,
+        col = -1;
+    if ( column )
+        col = colOrRow;
+    else
+        row = colOrRow;
 
-//
-// ------ cell value accessor functions
-//
-
-void wxGrid::SetCellValue( int row, int col, const wxString& s )
-{
-    if ( m_table )
+    wxCoord extent, extentMax = 0;
+    int max = column ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
     {
-        m_table->SetValue( row, col, s.c_str() );
-        DrawCell( row, col );
-        if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col )
+        if ( column )
+            row = rowOrCol;
+        else
+            col = rowOrCol;
+
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        if ( renderer )
         {
-            SetEditControlValue( s );
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+            if ( extent > extentMax )
+            {
+                extentMax = extent;
+            }
+
+            renderer->DecRef();
         }
+
+        attr->DecRef();
     }
-}    
 
+    // now also compare with the column label extent
+    wxCoord w, h;
+    dc.SetFont( GetLabelFont() );
 
+    if ( column )
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    else
+        dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
 
-//
-// ------ interaction with data model
-//
-bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
-{
-    switch ( msg.GetId() )
+    extent = column ? w : h;
+    if ( extent > extentMax )
     {
-        case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
-            return GetModelValues();
+        extentMax = extent;
+    }
 
-        case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
-            return SetModelValues();
+    if ( !extentMax )
+    {
+        // empty column - give default extent (notice that if extentMax is less
+        // than default extent but != 0, it's ok)
+        extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
+    }
+    else
+    {
+        if ( column )
+        {
+            // leave some space around text
+            extentMax += 10;
+        }
+    }
 
-        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 );
+    if ( column )
+        SetColSize(col, extentMax);
+    else
+        SetRowSize(row, extentMax);
 
-        default:
-            return FALSE;
+    if ( setAsMin )
+    {
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);
     }
 }
 
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
+{
+    int width = m_rowLabelWidth;
 
-//
-// ------ Grid location functions
-//
-//  (see also inline functions in grid.h)
+    for ( int col = 0; col < m_numCols; col++ )
+    {
+        if ( !calcOnly )
+        {
+            AutoSizeColumn(col, setAsMin);
+        }
 
+        width += GetColWidth(col);
+    }
 
-// check to see if a cell location is wholly visible
-//
-bool wxGrid::IsVisible( const wxGridCellCoords& coords )
-{
-    return ( coords.GetRow() >= m_scrollPosY  &&
-             coords.GetRow() < m_scrollPosY + m_wholeRowsVisible  &&
-             coords.GetCol() >= m_scrollPosX  &&
-             coords.GetCol() < m_scrollPosX + m_wholeColsVisible );
+    return width;
 }
 
-
-// make the specified cell location visible by doing a minimal amount
-// of scrolling
-//
-void wxGrid::MakeCellVisible( int row, int col )
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
-    int lastX = m_scrollPosX;
-    int lastY = m_scrollPosY;
-    
-    if ( row >= 0  &&  row < m_numRows  &&
-         col >= 0  &&  col < m_numCols )
-    {
-        if ( row < m_scrollPosY )
-        {
-            SetVerticalScrollPos( row );
-        }
-        else if ( row >= m_scrollPosY + m_wholeRowsVisible )
-        {
-            int i;
-            int h = m_rowBottoms[row];
-            for ( i = m_scrollPosY; i < m_numRows && h > m_bottom; i++ )
-            {
-                h -= m_rowHeights[i];
-            }
-            SetVerticalScrollPos( i );
-        }
+    int height = m_colLabelHeight;
 
-        if ( col < m_scrollPosX )
-        {
-            SetHorizontalScrollPos( col );
-        }
-        else if ( col >= m_scrollPosX + m_wholeColsVisible )
+    for ( int row = 0; row < m_numRows; row++ )
+    {
+        if ( !calcOnly )
         {
-            int i;
-            int w = m_colRights[col];
-            for ( i = m_scrollPosX; i < m_numCols && w > m_right; i++ )
-            {
-                w -= m_colWidths[i];
-            }
-            SetHorizontalScrollPos( i );
+            AutoSizeRow(row, setAsMin);
         }
 
-        if ( m_scrollPosX != lastX  ||  m_scrollPosY != lastY )
-        {
-            // The cell was not visible before but not it is
-            //
-            ShowCellEditControl();
-        }
-    }
-    else
-    {
-        // TODO: log an error
+        height += GetRowHeight(row);
     }
+
+    return height;
 }
 
+void wxGrid::AutoSize()
+{
+    // set the size too
+    SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+}
 
-void wxGrid::SetVerticalScrollPos( int topMostRow )
+wxSize wxGrid::DoGetBestSize() const
 {
-    if ( m_vertScrollBar && topMostRow != m_scrollPosY )
-    {
-        m_scrollPosY = topMostRow;
+    // don't set sizes, only calculate them
+    wxGrid *self = (wxGrid *)this;  // const_cast
 
-        CalcDimensions();
-        Refresh();
-    }
+    return wxSize(self->SetOrCalcColumnSizes(TRUE),
+                  self->SetOrCalcRowSizes(TRUE));
 }
 
+void wxGrid::Fit()
+{
+    AutoSize();
+}
+
+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
 
-void wxGrid::SetHorizontalScrollPos( int leftMostCol )
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
-    if ( m_horizScrollBar && leftMostCol != m_scrollPosX )
+    if ( m_table )
     {
-        m_scrollPosX = leftMostCol;
+        m_table->SetValue( row, col, s.c_str() );
+        if ( !GetBatchCount() )
+        {
+            wxClientDC dc( m_gridWin );
+            PrepareDC( dc );
+            DrawCell( dc, wxGridCellCoords(row, col) );
+        }
 
-        CalcDimensions();
-        Refresh();
+        if ( m_currentCellCoords.GetRow() == row &&
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlEnabled())
+        {
+            HideCellEditControl();
+            ShowCellEditControl(); // will reread data from table
+        }
     }
 }
 
 
 //
-// ------ block, row and col selection
+// ------ Block, row and col selection
 //
 
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
-    if ( IsSelection() && addToSelected )
-    {
-        if ( m_selectedTopLeft.GetRow() > row )
-            m_selectedTopLeft.SetRow( row );
-        
-        m_selectedTopLeft.SetCol( 0 );
-        
-        if ( m_selectedBottomRight.GetRow() < row )
-            m_selectedBottomRight.SetRow( row );
-        
-        m_selectedBottomRight.SetCol( m_numCols - 1 );
-    }
-    else
-    {
+    if ( IsSelection() && !addToSelected )
         ClearSelection();
-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-    }
-
-    if ( !GetBatchCount() )
-    {
-        wxRect rect( SelectionToRect() );
-        if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect );
-    }
-    
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_WXGRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
 
-    GetEventHandler()->ProcessEvent(gridEvt);
+    m_selection->SelectRow( row );
 }
 
 
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
-    if ( addToSelected && m_selectedTopLeft != wxGridNoCellCoords )
-    {
-        if ( m_selectedTopLeft.GetCol() > col )
-            m_selectedTopLeft.SetCol( col );
-
-        m_selectedTopLeft.SetRow( 0 );
-
-        if ( m_selectedBottomRight.GetCol() < col )
-            m_selectedBottomRight.SetCol( col );
-
-        m_selectedBottomRight.SetRow( m_numRows - 1 );
-    }
-    else
-    {
+    if ( IsSelection() && !addToSelected )
         ClearSelection();
-        m_selectedTopLeft.Set( 0, col );
-        m_selectedBottomRight.Set( m_numRows-1, col );
-    }
-
-    if ( !GetBatchCount() )
-    {
-        wxRect rect( SelectionToRect() );
-        if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect );
-    }
 
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    EVT_WXGRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
-
-    GetEventHandler()->ProcessEvent(gridEvt);
+    m_selection->SelectCol( col );
 }
 
 
 void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 {
     int temp;
-    
+    wxGridCellCoords updateTopLeft, updateBottomRight;
+
     if ( topRow > bottomRow )
     {
         temp = topRow;
@@ -4104,89 +7680,187 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
         rightCol = temp;
     }
 
-    m_selectedTopLeft.Set( topRow, leftCol );
-    m_selectedBottomRight.Set( bottomRow, rightCol );
+    updateTopLeft = wxGridCellCoords( topRow, leftCol );
+    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
 
-    if ( !GetBatchCount() )
+    if ( m_selectingTopLeft != updateTopLeft ||
+         m_selectingBottomRight != updateBottomRight )
     {
-        wxRect rect( SelectionToRect() );
-        if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect );
-    }
+        // 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;
 
-    // only generate an event if the block is not being selected by
-    // dragging the mouse (in which case the event will be generated in
-    // OnMouse) }
-    if ( !m_isDragging )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        EVT_WXGRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
-    
-        GetEventHandler()->ProcessEvent(gridEvt);
+        // Store intermediate values
+        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
+        wxCoord oldTop    = m_selectingTopLeft.GetRow();
+        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+        // Determine the outer/inner coordinates.
+        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 )
+        {
+            need_refresh[1] = TRUE;
+            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            leftCol ),
+                                         wxGridCellCoords ( topRow - 1,
+                                                            rightCol ) );
+        }
+
+        if ( oldRight > rightCol )
+        {
+            need_refresh[2] = TRUE;
+            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            rightCol + 1 ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            oldRight ) );
+        }
+
+        if ( oldBottom > bottomRow )
+        {
+            need_refresh[3] = TRUE;
+            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+                                                            leftCol ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            rightCol ) );
+        }
+
+
+        // Change Selection
+        m_selectingTopLeft = updateTopLeft;
+        m_selectingBottomRight = updateBottomRight;
+
+        // various Refresh() calls
+        for (i = 0; i < 4; i++ )
+            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+                m_gridWin->Refresh( FALSE, &(rect[i]) );
     }
+
+    // never generate an event as it will be generated from
+    // wxGridSelection::SelectBlock!
 }
 
 void wxGrid::SelectAll()
 {
-    m_selectedTopLeft.Set( 0, 0 );
-    m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+    m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+}
 
-    if ( !GetBatchCount() ) Refresh();
+bool wxGrid::IsSelection()
+{
+    return ( m_selection->IsSelection() ||
+             ( m_selectingTopLeft != wxGridNoCellCoords &&
+               m_selectingBottomRight != wxGridNoCellCoords ) );
 }
 
+bool wxGrid::IsInSelection( int row, int col )
+{
+    return ( m_selection->IsInSelection( row, col ) ||
+             ( row >= m_selectingTopLeft.GetRow() &&
+               col >= m_selectingTopLeft.GetCol() &&
+               row <= m_selectingBottomRight.GetRow() &&
+               col <= m_selectingBottomRight.GetCol() ) );
+}
 
 void wxGrid::ClearSelection()
 {
-    if ( IsSelection() )
-    {
-        wxRect rect( SelectionToRect() );
-        if ( rect != wxGridNoCellRect )
-        {
-            Refresh( TRUE, &rect );
-        }
-
-        m_selectedTopLeft = wxGridNoCellCoords;
-        m_selectedBottomRight = wxGridNoCellCoords;
-    }
-}    
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;
+    m_selection->ClearSelection();
+}
 
 
-wxRect wxGrid::SelectionToRect()
+// This function returns the rectangle that encloses the given block
+// in device coords clipped to the client size of the grid window.
+//
+wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
+                                  const wxGridCellCoords &bottomRight )
 {
-    wxRect rect;
+    wxRect rect( wxGridNoCellRect );
     wxRect cellRect;
 
-    if ( IsSelection() )
+    cellRect = CellToRect( topLeft );
+    if ( cellRect != wxGridNoCellRect )
     {
-        cellRect = CellToRect( m_selectedTopLeft );
-        if ( cellRect != wxGridNoCellRect )
-        {
-            rect = cellRect;
-        }
-        else
-        {
-            rect = wxRect( m_left, m_top, 0, 0 );
-        }
-        
-        cellRect = CellToRect( m_selectedBottomRight );
-        if ( cellRect != wxGridNoCellRect )
-        {
-            rect += cellRect;
-        }
-        else
-        {
-            return wxGridNoCellRect;
-        }
+        rect = cellRect;
+    }
+    else
+    {
+        rect = wxRect( 0, 0, 0, 0 );
     }
 
+    cellRect = CellToRect( bottomRight );
+    if ( cellRect != wxGridNoCellRect )
+    {
+        rect += cellRect;
+    }
+    else
+    {
+        return wxGridNoCellRect;
+    }
+
+    // convert to scrolled coords
+    //
+    int left, top, right, bottom;
+    CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
+    CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+
+    int cw, ch;
+    m_gridWin->GetClientSize( &cw, &ch );
+
+    rect.SetLeft( wxMax(0, left) );
+    rect.SetTop( wxMax(0, top) );
+    rect.SetRight( wxMin(cw, right) );
+    rect.SetBottom( wxMin(ch, bottom) );
+
     return rect;
 }
 
 
 
-
 //
 // ------ Grid event classes
 //
@@ -4194,7 +7868,7 @@ wxRect wxGrid::SelectionToRect()
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
 
 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 )
 {
@@ -4202,11 +7876,12 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
     m_col = col;
     m_x = x;
     m_y = y;
+    m_selecting = sel;
     m_control = control;
     m_shift = shift;
     m_alt = alt;
     m_meta = meta;
-    
+
     SetEventObject(obj);
 }
 
@@ -4225,7 +7900,7 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
     m_shift = shift;
     m_alt = alt;
     m_meta = meta;
-    
+
     SetEventObject(obj);
 }
 
@@ -4233,13 +7908,15 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
 IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
 
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
-                                              const wxGridCellCoords& topLeft,
-                                              const wxGridCellCoords& bottomRight,
-                                              bool control, bool shift, bool alt, bool meta )
-       : wxNotifyEvent( type, id )
+                                               const wxGridCellCoords& topLeft,
+                                               const wxGridCellCoords& bottomRight,
+                                               bool sel, bool control,
+                                               bool shift, bool alt, bool meta )
+        : wxNotifyEvent( type, id )
 {
     m_topLeft     = topLeft;
     m_bottomRight = bottomRight;
+    m_selecting   = sel;
     m_control     = control;
     m_shift       = shift;
     m_alt         = alt;
@@ -4250,4 +7927,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 
 
 #endif // ifndef wxUSE_NEW_GRID
-