fixed typo : _ instead of wxT

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6f7e9dbe171b16653d66d119de34ee2984ffa401..4a3a28cce051a4c579aad4616e23776020fd99e2 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -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:
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by:


@@ -41,13 +41,19 @@
     #include "wx/log.h"
     #include "wx/textctrl.h"
     #include "wx/checkbox.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
     #include "wx/checkbox.h"

+    #include "wx/combobox.h"
+    #include "wx/valtext.h"

 #endif
 
 #endif
 

-// this include needs to be outside precomp for BCC

 #include "wx/textfile.h"
 #include "wx/textfile.h"

+#include "wx/spinctrl.h"
+#include "wx/tokenzr.h"

 
 #include "wx/grid.h"
 
 #include "wx/grid.h"

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

 
 

+// Required for wxIs... functions
+#include <ctype.h>

 
 // ----------------------------------------------------------------------------
 // array classes
 
 // ----------------------------------------------------------------------------
 // array classes


@@ -226,6 +232,8 @@ private:
 class WXDLLEXPORT wxGridRowOrColAttrData
 {
 public:
 class WXDLLEXPORT wxGridRowOrColAttrData
 {
 public:

+    // empty ctor to suppress warnings
+    wxGridRowOrColAttrData() { }

     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);
     ~wxGridRowOrColAttrData();
 
     void SetAttr(wxGridCellAttr *attr, int rowOrCol);


@@ -247,6 +255,62 @@ public:
                            m_colAttrs;
 };
 
                            m_colAttrs;
 };
 

+
+// ----------------------------------------------------------------------------
+// data structures used for the data type registry
+// ----------------------------------------------------------------------------
+
+struct wxGridDataTypeInfo
+{
+    wxGridDataTypeInfo(const wxString& typeName,
+                       wxGridCellRenderer* renderer,
+                       wxGridCellEditor* editor)
+        : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
+        { }
+
+    ~wxGridDataTypeInfo()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
+
+    wxString            m_typeName;
+    wxGridCellRenderer* m_renderer;
+    wxGridCellEditor*   m_editor;
+};
+
+
+WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+
+
+class WXDLLEXPORT wxGridTypeRegistry
+{
+public:
+    ~wxGridTypeRegistry();
+
+    void RegisterDataType(const wxString& typeName,
+                     wxGridCellRenderer* renderer,
+                     wxGridCellEditor* editor);
+
+    // find one of already registered data types
+    int FindRegisteredDataType(const wxString& typeName);
+
+    // try to FindRegisteredDataType(), if this fails and typeName is one of
+    // standard typenames, register it and return its index
+    int FindDataType(const wxString& typeName);
+
+    // try to FindDataType(), if it fails see if it is not one of already
+    // registered data types with some params in which case clone the
+    // registered data type and set params for it
+    int FindOrCloneDataType(const wxString& typeName);
+
+    wxGridCellRenderer* GetRenderer(int index);
+    wxGridCellEditor*   GetEditor(int index);
+
+private:
+    wxGridDataTypeInfoArray m_typeinfo;
+};
+

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


@@ -265,6 +329,10 @@ public:
     static size_t gs_nAttrCacheMisses = 0;
 #endif // DEBUG_ATTR_CACHE
 
     static size_t gs_nAttrCacheMisses = 0;
 #endif // DEBUG_ATTR_CACHE
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+

 wxGridCellCoords wxGridNoCellCoords( -1, -1 );
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 wxGridCellCoords wxGridNoCellCoords( -1, -1 );
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 


@@ -272,6 +340,10 @@ wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 // TODO: fixed so far - make configurable later (and also different for x/y)
 static const size_t GRID_SCROLL_LINE = 10;
 
 // 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
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -295,14 +367,29 @@ void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
                               wxWindowID WXUNUSED(id),
                               wxEvtHandler* evtHandler)
 {
                               wxWindowID WXUNUSED(id),
                               wxEvtHandler* evtHandler)
 {

-    if (evtHandler)
+    if ( evtHandler )

         m_control->PushEventHandler(evtHandler);
 }
 
         m_control->PushEventHandler(evtHandler);
 }
 

+void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
+                                       wxGridCellAttr *attr)
+{
+    // erase the background because we might not fill the cell
+    wxClientDC dc(m_control->GetParent());
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+    dc.DrawRectangle(rectCell);
+
+    // redraw the control we just painted over
+    m_control->Refresh();
+}
+

 void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {
 void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {

+        m_control->PopEventHandler(TRUE /* delete it*/);
+

         m_control->Destroy();
         m_control = NULL;
     }
         m_control->Destroy();
         m_control = NULL;
     }


@@ -319,23 +406,14 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
         // set the colours/fonts if we have any
         if ( attr )
         {
         // set the colours/fonts if we have any
         if ( attr )
         {

-            if ( attr->HasTextColour() )
-            {
-                m_colFgOld = m_control->GetForegroundColour();
-                m_control->SetForegroundColour(attr->GetTextColour());
-            }
+            m_colFgOld = m_control->GetForegroundColour();
+            m_control->SetForegroundColour(attr->GetTextColour());

 
 

-            if ( attr->HasBackgroundColour() )
-            {
-                m_colBgOld = m_control->GetBackgroundColour();
-                m_control->SetBackgroundColour(attr->GetBackgroundColour());
-            }
+            m_colBgOld = m_control->GetBackgroundColour();
+            m_control->SetBackgroundColour(attr->GetBackgroundColour());

 
 

-            if ( attr->HasFont() )
-            {
-                m_fontOld = m_control->GetFont();
-                m_control->SetFont(attr->GetFont());
-            }
+            m_fontOld = m_control->GetFont();
+            m_control->SetFont(attr->GetFont());

 
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
 
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes


@@ -368,7 +446,7 @@ void wxGridCellEditor::SetSize(const wxRect& rect)
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));

-    m_control->SetSize(rect);
+    m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);

 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)


@@ -379,11 +457,11 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 {
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 {

-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    event.Skip();
+}

 
 

-    // pass the event to the control
-    m_control->GetEventHandler()->ProcessEvent(event);
+void wxGridCellEditor::StartingClick()
+{

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


@@ -392,6 +470,7 @@ void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {

+    m_maxChars = 0;

 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,


@@ -405,9 +484,51 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
 #endif
                               );
 
 #endif
                               );
 

+    // TODO: use m_maxChars
+

     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 

+void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
+                                           wxGridCellAttr * WXUNUSED(attr))
+{
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
+}
+
+void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
+{
+    wxRect rect(rectOrig);
+
+    // Make the edit control large enough to allow for internal
+    // margins
+    //
+    // TODO: remove this if the text ctrl sizing is improved esp. for
+    // unix
+    //
+#if defined(__WXGTK__)
+    if (rect.x != 0)
+    {
+        rect.x += 1;
+        rect.y += 1;
+        rect.width -= 1;
+        rect.height -= 1;
+    }
+#else // !GTK
+    int extra_x = ( rect.x > 2 )? 2 : 1;
+    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);
+}

 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 
 void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
 {


@@ -415,13 +536,18 @@ void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);

-    Text()->SetValue(m_startValue);
+
+    DoBeginEdit(m_startValue);
+}
+
+void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
+{
+    Text()->SetValue(startValue);

     Text()->SetInsertionPointEnd();
     Text()->SetFocus();
 }
 
     Text()->SetInsertionPointEnd();
     Text()->SetFocus();
 }
 

-
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellTextEditor::EndEdit(int row, int col,

                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,


@@ -447,7 +573,12 @@ void wxGridCellTextEditor::Reset()
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 

-    Text()->SetValue(m_startValue);
+    DoReset(m_startValue);
+}
+
+void wxGridCellTextEditor::DoReset(const wxString& startValue)
+{
+    Text()->SetValue(startValue);

     Text()->SetInsertionPointEnd();
 }
 
     Text()->SetInsertionPointEnd();
 }
 


@@ -491,6 +622,251 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
 #endif
 }
 
 #endif
 }
 

+void wxGridCellTextEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // reset to default
+        m_maxChars = 0;
+    }
+    else
+    {
+        long tmp;
+        if ( !params.ToLong(&tmp) )
+        {
+            wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string "
+                          "'%s' ignored"), params.c_str());
+        }
+        else
+        {
+            m_maxChars = (size_t)tmp;
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellNumberEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max)
+{
+    m_min = min;
+    m_max = max;
+}
+
+void wxGridCellNumberEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
+{
+    if ( HasRange() )
+    {
+        // 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);
+
+#if wxUSE_VALIDATORS
+        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+    }
+}
+
+void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+    {
+        m_valueOld = table->GetValueAsLong(row, col);
+    }
+    else
+    {
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToLong(&m_valueOld))
+        {
+            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+            return;
+        }
+    }
+
+    if ( HasRange() )
+    {
+        Spin()->SetValue(m_valueOld);
+    }
+    else
+    {
+        DoBeginEdit(GetString());
+    }
+}
+
+bool wxGridCellNumberEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    bool changed;
+    long value;
+
+    if ( HasRange() )
+    {
+        value = Spin()->GetValue();
+        changed = value != m_valueOld;
+    }
+    else
+    {
+        changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld);
+    }
+
+    if ( changed )
+    {
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
+            grid->GetTable()->SetValueAsLong(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, wxString::Format("%ld", value));
+    }
+
+    return changed;
+}
+
+void wxGridCellNumberEditor::Reset()
+{
+    if ( HasRange() )
+    {
+        Spin()->SetValue(m_valueOld);
+    }
+    else
+    {
+        DoReset(GetString());
+    }
+}
+
+void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
+{
+    if ( !HasRange() )
+    {
+        long keycode = event.KeyCode();
+        if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
+        {
+            wxGridCellTextEditor::StartingKey(event);
+
+            // skip Skip() below
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+void wxGridCellNumberEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // reset to default
+        m_min =
+        m_max = -1;
+    }
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_min = (int)tmp;
+
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_max = (int)tmp;
+
+                // skip the error message below
+                return;
+            }
+        }
+
+        wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string "
+                      "'%s' ignored"), params.c_str());
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellFloatEditor
+// ----------------------------------------------------------------------------
+
+void wxGridCellFloatEditor::Create(wxWindow* parent,
+                                   wxWindowID id,
+                                   wxEvtHandler* evtHandler)
+{
+    wxGridCellTextEditor::Create(parent, id, evtHandler);
+
+#if wxUSE_VALIDATORS
+    Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+}
+
+void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
+    {
+        m_valueOld = table->GetValueAsDouble(row, col);
+    }
+    else
+    {
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToDouble(&m_valueOld))
+        {
+            wxFAIL_MSG( _T("this cell doesn't have float value") );
+            return;
+        }
+    }
+
+    DoBeginEdit(GetString());
+}
+
+bool wxGridCellFloatEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    double value;
+    if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) )
+    {
+        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;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+void wxGridCellFloatEditor::Reset()
+{
+    DoReset(GetString());
+}
+
+void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
+{
+    long keycode = event.KeyCode();
+    if ( isdigit(keycode) ||
+         keycode == '+' || keycode == '-' || keycode == '.' )
+    {
+        wxGridCellTextEditor::StartingKey(event);
+
+        // skip Skip() below
+        return;
+    }
+
+    event.Skip();
+}
+

 // ----------------------------------------------------------------------------
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------


@@ -508,41 +884,57 @@ void wxGridCellBoolEditor::Create(wxWindow* parent,
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {

-    m_rectCell = 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) )
+    {
+        // reset to default size if it had been made smaller
+        size = sizeBest;
+
+        resize = TRUE;
+    }
+
+    if ( size.x >= minSize || size.y >= minSize )
+    {
+        // leave 1 pixel margin
+        size.x = size.y = minSize - 2;
+
+        resize = TRUE;
+    }
+
+    if ( resize )
+    {
+        m_control->SetSize(size);
+    }
+

     // position it in the centre of the rectangle (TODO: support alignment?)
     // position it in the centre of the rectangle (TODO: support alignment?)

-    wxCoord w, h;
-    m_control->GetSize(&w, &h);

 
 

+#if defined(__WXGTK__) || defined (__WXMOTIF__)

     // the checkbox without label still has some space to the right in wxGTK,
     // so shift it to the right
     // the checkbox without label still has some space to the right in wxGTK,
     // so shift it to the right

-#ifdef __WXGTK__
-    w += 8;
-#endif // GTK
+    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 - w/2, r.y + r.height/2 - h/2);
+    m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);

 }
 
 void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 {
 }
 
 void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 {

-    wxGridCellEditor::Show(show, attr);
-    if ( !show )
-        return;
-
-    // get the bg colour to use
-    wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
+    m_control->Show(show);

 
 

-    // erase the background because we don't fill the cell
-    if ( m_rectCell.width > 0 )
+    if ( show )

     {
     {

-        wxClientDC dc(m_control->GetParent());
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(wxBrush(colBg, wxSOLID));
-        dc.DrawRectangle(m_rectCell);
-
-        m_rectCell.width = 0;
+        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
+        CBox()->SetBackgroundColour(colBg);

     }
     }

-
-    CBox()->SetBackgroundColour(colBg);

 }
 
 void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
 }
 
 void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)


@@ -550,13 +942,15 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 

-    m_startValue = !!grid->GetTable()->GetValue(row, col); // FIXME-DATA
+    if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+    else
+        m_startValue = !!grid->GetTable()->GetValue(row, col);

     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
 
 bool wxGridCellBoolEditor::EndEdit(int row, int col,
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
 
 bool wxGridCellBoolEditor::EndEdit(int row, int col,

-                                   bool saveValue,

                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,


@@ -569,8 +963,10 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
 
     if ( changed )
     {
 
     if ( changed )
     {

-        // FIXME-DATA
-        grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+        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);

     }
 
     return changed;
     }
 
     return changed;


@@ -584,9 +980,129 @@ void wxGridCellBoolEditor::Reset()
     CBox()->SetValue(m_startValue);
 }
 
     CBox()->SetValue(m_startValue);
 }
 

-void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
+void wxGridCellBoolEditor::StartingClick()

 {
 {

-    event.Skip();
+    CBox()->SetValue(!CBox()->GetValue());
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+                                               const wxChar* choices[],
+                                               bool allowOthers)
+                      : m_allowOthers(allowOthers)
+{
+    if ( count )
+    {
+        m_choices.Alloc(count);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add(choices[n]);
+        }
+    }
+}
+
+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);
+
+    delete [] choices;
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
+
+void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
+                                             wxGridCellAttr * attr)
+{
+    // 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 wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    m_startValue = grid->GetTable()->GetValue(row, col);
+
+    Combo()->SetValue(m_startValue);
+    size_t count = m_choices.GetCount();
+    for (size_t i=0; i<count; i++)
+    {
+        if (m_startValue == m_choices[i])
+        {
+            Combo()->SetSelection(i);
+            break;
+        }
+    }
+    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());
+    }

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


@@ -612,60 +1128,158 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
 
             break;
 
 

-        default:
-            event.Skip();
-    }
-}
+        default:
+            event.Skip();
+    }
+}
+
+void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+{
+    switch ( event.KeyCode() )
+    {
+        case WXK_ESCAPE:
+        case WXK_TAB:
+        case WXK_RETURN:
+            break;
+
+        default:
+            event.Skip();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
+
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
+{
+    // nothing to do
+}
+
+wxGridCellWorker::~wxGridCellWorker()
+{
+}
+
+// ============================================================================
+// renderer classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellRenderer::Draw(wxGrid& grid,
+                              wxGridCellAttr& attr,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int row, int col,
+                              bool isSelected)
+{
+    dc.SetBackgroundMode( wxSOLID );
+
+    if ( isSelected )
+    {
+        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+    }
+    else
+    {
+        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+    }
+
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle(rect);
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellStringRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
+                                                     wxGridCellAttr& attr,
+                                                     wxDC& dc,
+                                                     bool isSelected)
+{
+    dc.SetBackgroundMode( wxTRANSPARENT );
+
+    // TODO some special colours for attr.IsReadOnly() case?
+
+    if ( isSelected )
+    {
+        dc.SetTextBackground( grid.GetSelectionBackground() );
+        dc.SetTextForeground( grid.GetSelectionForeground() );
+    }
+    else
+    {
+        dc.SetTextBackground( attr.GetBackgroundColour() );
+        dc.SetTextForeground( attr.GetTextColour() );
+    }
+
+    dc.SetFont( attr.GetFont() );
+}
+
+wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+                                               wxDC& dc,
+                                               const wxString& text)
+{
+    wxCoord x, y;
+    dc.SetFont(attr.GetFont());
+    dc.GetTextExtent(text, &x, &y);
+
+    return wxSize(x, y);
+}
+
+wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, grid.GetCellValue(row, col));
+}
+
+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);
+
+    // now we only have to draw the text
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
+
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);

 
 

-void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
-{
-    switch ( event.KeyCode() )
-    {
-        case WXK_ESCAPE:
-        case WXK_TAB:
-        case WXK_RETURN:
-            break;
+    wxRect rect = rectCell;
+    rect.Inflate(-1);

 
 

-        default:
-            event.Skip();
-    }
+    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                           rect, hAlign, vAlign);

 }
 
 }
 

-// ============================================================================
-// renderer classes
-// ============================================================================
-

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

-// wxGridCellRenderer
+// wxGridCellNumberRenderer

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

-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int row, int col,
-                              bool isSelected)
+wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)

 {
 {

-    dc.SetBackgroundMode( wxSOLID );
-
-    if ( isSelected )
+    wxGridTableBase *table = grid.GetTable();
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )

     {
     {

-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+        text.Printf(_T("%ld"), table->GetValueAsLong(row, col));

     }
     else
     {
     }
     else
     {

-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+        text = table->GetValue(row, col);

     }
 
     }
 

-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle(rect);
+    return text;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxGridCellStringRenderer
-// ----------------------------------------------------------------------------
-
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
+void wxGridCellNumberRenderer::Draw(wxGrid& grid,

                                     wxGridCellAttr& attr,
                                     wxDC& dc,
                                     const wxRect& rectCell,
                                     wxGridCellAttr& attr,
                                     wxDC& dc,
                                     const wxRect& rectCell,


@@ -674,40 +1288,209 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 

-    // now we only have to draw the text
-    dc.SetBackgroundMode( wxTRANSPARENT );
+    SetTextColoursAndFont(grid, attr, dc, isSelected);

 
 

-    // TODO some special colours for attr.IsReadOnly() case?
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxRIGHT;

 
 

-    if ( isSelected )
+    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));
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellFloatRenderer
+// ----------------------------------------------------------------------------
+
+wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
+{
+    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();
+
+    bool hasDouble;
+    double val;
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )

     {
     {

-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
+        val = table->GetValueAsDouble(row, col);
+        hasDouble = TRUE;

     }
     else
     {
     }
     else
     {

-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
+        text = table->GetValue(row, col);
+        hasDouble = text.ToDouble(&val);

     }
     }

-    dc.SetFont( attr.GetFont() );

 
 

+    if ( hasDouble )
+    {
+        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
+
+    return text;
+}
+
+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);
+
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
+
+    // draw the text right aligned by default

     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);

+    hAlign = wxRIGHT;

 
     wxRect rect = rectCell;
 
     wxRect rect = rectCell;

-    rect.x++;
-    rect.y++;
-    rect.width -= 2;
-    rect.height -= 2;
+    rect.Inflate(-1);

 
 

-    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                           rect, hAlign, vAlign);
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
+
+wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
+                                            wxGridCellAttr& attr,
+                                            wxDC& dc,
+                                            int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
+
+void wxGridCellFloatRenderer::SetParameters(const wxString& params)
+{
+    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) )
+            {
+                ok = FALSE;
+            }
+            else
+            {
+                SetWidth((int)width);
+
+                tmp = params.AfterFirst(_T(','));
+                if ( !!tmp )
+                {
+                    long precision;
+                    if ( !tmp.ToLong(&precision) )
+                    {
+                        ok = FALSE;
+                    }
+                    else
+                    {
+                        SetPrecision((int)precision);
+                    }
+                }
+            }
+        }
+
+        if ( !ok )
+        {
+            wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string "
+                          "'%s ignored"), params.c_str());
+        }
+    }

 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 

+wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
+
+// FIXME these checkbox size calculations are really ugly...
+
+// between checkmark and box
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
+
+wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
+                                           wxGridCellAttr& WXUNUSED(attr),
+                                           wxDC& WXUNUSED(dc),
+                                           int WXUNUSED(row),
+                                           int WXUNUSED(col))
+{
+    // compute it only once (no locks for MT safeness in GUI thread...)
+    if ( !ms_sizeCheckMark.x )
+    {
+        // get checkbox size
+        wxCoord checkSize = 0;
+        wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
+        wxSize size = checkbox->GetBestSize();
+        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+
+        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+        checkSize -= size.y / 2;
+#endif
+
+        delete checkbox;
+
+        ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
+    }
+
+    return ms_sizeCheckMark;
+}
+

 void wxGridCellBoolRenderer::Draw(wxGrid& grid,
                                   wxGridCellAttr& attr,
                                   wxDC& dc,
 void wxGridCellBoolRenderer::Draw(wxGrid& grid,
                                   wxGridCellAttr& attr,
                                   wxDC& dc,


@@ -717,31 +1500,86 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
 
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
 

-    // position it in the centre (ignoring alignment - TODO)
-    static const wxCoord checkSize = 16;
+    // draw a check mark in the centre (ignoring alignment - TODO)
+    wxSize size = GetBestSize(grid, attr, dc, row, col);

 
 

-    wxRect rectMark;
-    rectMark.x = rect.x + rect.width/2 - checkSize/2;
-    rectMark.y = rect.y + rect.height/2 - checkSize/2;
-    rectMark.width = rectMark.height = checkSize;
+    // don't draw outside the cell
+    wxCoord minSize = wxMin(rect.width, rect.height);
+    if ( size.x >= minSize || size.y >= minSize )
+    {
+        // and even leave (at least) 1 pixel margin
+        size.x = size.y = minSize - 2;
+    }

 
 

-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectMark);
+    // 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;

 
 

-    rectMark.Inflate(-4);
+    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 ( !!grid.GetTable()->GetValue(row, col) ) // FIXME-DATA
+    if ( value )

     {
     {

+        wxRect rectMark = rectBorder;
+#ifdef __WXMSW__
+        // MSW DrawCheckMark() is weird (and should probably be changed...)
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+        rectMark.x++;
+        rectMark.y++;
+#else // !MSW
+        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
+#endif // MSW/!MSW
+

         dc.SetTextForeground(attr.GetTextColour());
         dc.DrawCheckMark(rectMark);
     }
         dc.SetTextForeground(attr.GetTextColour());
         dc.DrawCheckMark(rectMark);
     }

+
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
+    dc.DrawRectangle(rectBorder);

 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellAttr
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellAttr
 // ----------------------------------------------------------------------------
 

+wxGridCellAttr *wxGridCellAttr::Clone() const
+{
+    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();
+    }
+
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
+
+    attr->SetDefAttr(m_defGridAttr);
+
+    return attr;
+}
+

 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())
 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())


@@ -804,30 +1642,69 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 }
 
 
 }
 
 

-wxGridCellRenderer* wxGridCellAttr::GetRenderer() const
+// 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 (HasRenderer())
-        return m_renderer;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetRenderer();
-    else
+    wxGridCellRenderer* renderer = NULL;
+
+    if ( m_defGridAttr != this || grid == NULL )
+    {
+        renderer = m_renderer;      // use local attribute
+        if ( renderer )
+            renderer->IncRef();
+    }
+
+    if ( !renderer && grid )        // get renderer for the data type
+    {
+        // GetDefaultRendererForCell() will do IncRef() for us
+        renderer = grid->GetDefaultRendererForCell(row, col);
+    }
+
+    if ( !renderer )
+    {
+        // 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);
+    }
+
+    if ( !renderer)

     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));

-        return NULL;

     }
     }

+
+    return renderer;

 }
 
 }
 

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

 {
 {

-    if (HasEditor())
-        return m_editor;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetEditor();
-    else
+    wxGridCellEditor* editor = NULL;
+
+    if ( m_defGridAttr != this || grid == NULL )
+    {
+        editor = m_editor;      // use local attribute
+        if ( editor )
+            editor->IncRef();
+    }
+
+    if ( !editor && grid )                   // get renderer for the data type
+        editor = grid->GetDefaultEditorForCell(row, col);
+
+    if ( !editor )
+        // if we still don't have one then use the grid default
+        editor = m_defGridAttr->GetEditor(NULL,0,0);
+
+    if ( !editor )

     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));

-        return NULL;

     }
     }

+
+    return editor;

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


@@ -981,8 +1858,8 @@ wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
 
 void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
 {
 
 void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
 {

-    int n = m_rowsOrCols.Index(rowOrCol);
-    if ( n == wxNOT_FOUND )
+    int i = m_rowsOrCols.Index(rowOrCol);
+    if ( i == wxNOT_FOUND )

     {
         // add the attribute
         m_rowsOrCols.Add(rowOrCol);
     {
         // add the attribute
         m_rowsOrCols.Add(rowOrCol);


@@ -990,17 +1867,19 @@ void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
     }
     else
     {
     }
     else
     {

+        size_t n = (size_t)i;

         if ( attr )
         {
             // change the attribute
         if ( attr )
         {
             // change the attribute

-            m_attrs[(size_t)n] = attr;
+            m_attrs[n]->DecRef();
+            m_attrs[n] = attr;

         }
         else
         {
             // remove this attribute
         }
         else
         {
             // remove this attribute

-            m_attrs[(size_t)n]->DecRef();
-            m_rowsOrCols.RemoveAt((size_t)n);
-            m_attrs.RemoveAt((size_t)n);
+            m_attrs[n]->DecRef();
+            m_rowsOrCols.RemoveAt(n);
+            m_attrs.RemoveAt(n);

         }
     }
 }
         }
     }
 }


@@ -1119,18 +1998,161 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
     {
         m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
 
     {
         m_data->m_cellAttrs.UpdateAttrCols( pos, numCols );
 

-        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
-    }
+        m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols );
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
+
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+    size_t count = m_typeinfo.Count();
+    for ( size_t i = 0; i < count; i++ )
+        delete m_typeinfo[i];
+}
+
+
+void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
+                                          wxGridCellRenderer* renderer,
+                                          wxGridCellEditor* editor)
+{
+    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+
+    // is it already registered?
+    int loc = FindRegisteredDataType(typeName);
+    if ( loc != wxNOT_FOUND )
+    {
+        delete m_typeinfo[loc];
+        m_typeinfo[loc] = info;
+    }
+    else
+    {
+        m_typeinfo.Add(info);
+    }
+}
+
+int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)
+{
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( typeName == m_typeinfo[i]->m_typeName )
+        {
+            return i;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+{
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+        if ( typeName == wxGRID_VALUE_STRING )
+        {
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_BOOL )
+        {
+            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;
+    }
+
+    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
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxGridTableBase
 // ----------------------------------------------------------------------------
 

-//////////////////////////////////////////////////////////////////////
-//
-// Abstract base class for grid data (the model)
-//

 IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 
 
 IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
 
 


@@ -1151,6 +2173,16 @@ void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
     m_attrProvider = 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 )
 wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
 {
     if ( m_attrProvider )


@@ -1169,7 +2201,7 @@ void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now

-        attr->SafeDecRef();
+        wxSafeDecRef(attr);

     }
 }
 
     }
 }
 


@@ -1183,7 +2215,7 @@ void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now

-        attr->SafeDecRef();
+        wxSafeDecRef(attr);

     }
 }
 
     }
 }
 


@@ -1197,7 +2229,7 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now

-        attr->SafeDecRef();
+        wxSafeDecRef(attr);

     }
 }
 
     }
 }
 


@@ -1269,7 +2301,8 @@ bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
 wxString wxGridTableBase::GetRowLabelValue( int row )
 {
     wxString s;
 wxString wxGridTableBase::GetRowLabelValue( int row )
 {
     wxString s;

-    s << row;
+    s << row + 1; // RD: Starting the rows at zero confuses users, no matter
+                  //     how much it makes sense to us geeks.

     return s;
 }
 
     return s;
 }
 


@@ -1300,6 +2333,64 @@ wxString wxGridTableBase::GetColLabelValue( int col )
 }
 
 
 }
 
 

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

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


@@ -1365,12 +2456,12 @@ wxGridStringTable::~wxGridStringTable()
 {
 }
 
 {
 }
 

-long wxGridStringTable::GetNumberRows()
+int wxGridStringTable::GetNumberRows()

 {
     return m_data.GetCount();
 }
 
 {
     return m_data.GetCount();
 }
 

-long wxGridStringTable::GetNumberCols()
+int wxGridStringTable::GetNumberCols()

 {
     if ( m_data.GetCount() > 0 )
         return m_data[0].GetCount();
 {
     if ( m_data.GetCount() > 0 )
         return m_data[0].GetCount();


@@ -1380,26 +2471,28 @@ long wxGridStringTable::GetNumberCols()
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {

-    // TODO: bounds checking
-    //
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+

     return m_data[row][col];
 }
 
     return m_data[row][col];
 }
 

-void wxGridStringTable::SetValue( int row, int col, const wxString& s )
+void wxGridStringTable::SetValue( int row, int col, const wxString& value )

 {
 {

-    // TODO: bounds checking
-    //
-    m_data[row][col] = s;
+    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 )
 {
 }
 
 bool wxGridStringTable::IsEmptyCell( int row, int col )
 {

-    // TODO: bounds checking
-    //
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+

     return (m_data[row][col] == wxEmptyString);
 }
 
     return (m_data[row][col] == wxEmptyString);
 }
 

-

 void wxGridStringTable::Clear()
 {
     int row, col;
 void wxGridStringTable::Clear()
 {
     int row, col;


@@ -1729,7 +2822,7 @@ END_EVENT_TABLE()
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )

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


@@ -1782,7 +2875,7 @@ END_EVENT_TABLE()
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )

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


@@ -1835,7 +2928,7 @@ END_EVENT_TABLE()
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )

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


@@ -1889,7 +2982,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )

-        : wxPanel( parent, id, pos, size, 0, "grid window" )
+        : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;


@@ -1913,6 +3006,8 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif

+    m_owner->DrawGridSpace( dc );
+    m_owner->DrawHighlight( dc );

 }
 
 
 }
 
 


@@ -1938,10 +3033,10 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event )
     if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
     if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 

-void wxGridWindow::OnEraseBackground(wxEraseEvent&)
-{ }
-

 
 

+void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+{
+}

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


@@ -1962,7 +3057,9 @@ wxGrid::wxGrid( wxWindow *parent,
                  const wxSize& size,
                  long style,
                  const wxString& name )
                  const wxSize& size,
                  long style,
                  const wxString& name )

-  : wxScrolledWindow( parent, id, pos, size, style, name )
+  : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
+    m_colMinWidths(GRID_HASH_SIZE),
+    m_rowMinHeights(GRID_HASH_SIZE)

 {
     Create();
 }
 {
     Create();
 }


@@ -1971,7 +3068,7 @@ wxGrid::wxGrid( wxWindow *parent,
 wxGrid::~wxGrid()
 {
     ClearAttrCache();
 wxGrid::~wxGrid()
 {
     ClearAttrCache();

-    m_defaultCellAttr->SafeDecRef();
+    wxSafeDecRef(m_defaultCellAttr);

 
 #ifdef DEBUG_ATTR_CACHE
     size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
 
 #ifdef DEBUG_ATTR_CACHE
     size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;


@@ -1983,6 +3080,9 @@ wxGrid::~wxGrid()
 
     if (m_ownTable)
         delete m_table;
 
     if (m_ownTable)
         delete m_table;

+
+    delete m_typeRegistry;
+    delete m_selection;

 }
 
 
 }
 
 


@@ -1993,7 +3093,6 @@ wxGrid::~wxGrid()
 void wxGrid::Create()
 {
     m_created = FALSE;    // set to TRUE by CreateGrid
 void wxGrid::Create()
 {
     m_created = FALSE;    // set to TRUE by CreateGrid

-    m_displayed = TRUE; // FALSE;  // set to TRUE by OnPaint

 
     m_table        = (wxGridTableBase *) NULL;
     m_ownTable     = FALSE;
 
     m_table        = (wxGridTableBase *) NULL;
     m_ownTable     = FALSE;


@@ -2002,7 +3101,16 @@ void wxGrid::Create()
 
     m_defaultCellAttr = new wxGridCellAttr;
     m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
 
     m_defaultCellAttr = new wxGridCellAttr;
     m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);

-    // RD:  Should we fill the default attrs now or is waiting until Init() okay?
+
+    // 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_numRows = 0;


@@ -2012,6 +3120,10 @@ void wxGrid::Create()
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 

+    // create the type registry
+    m_typeRegistry = new wxGridTypeRegistry;
+    m_selection = 0;
+    // subwindow components that make up the wxGrid

     m_cornerLabelWin = new wxGridCornerLabelWindow( this,
                                                     -1,
                                                     wxDefaultPosition,
     m_cornerLabelWin = new wxGridCornerLabelWindow( this,
                                                     -1,
                                                     wxDefaultPosition,


@@ -2038,7 +3150,8 @@ void wxGrid::Create()
 }
 
 
 }
 
 

-bool wxGrid::CreateGrid( int numRows, int numCols )
+bool wxGrid::CreateGrid( int numRows, int numCols,
+                         wxGrid::wxGridSelectionModes selmode )

 {
     if ( m_created )
     {
 {
     if ( m_created )
     {


@@ -2054,13 +3167,24 @@ bool wxGrid::CreateGrid( int numRows, int numCols )
         m_table->SetView( this );
         m_ownTable = TRUE;
         Init();
         m_table->SetView( this );
         m_ownTable = TRUE;
         Init();

+        m_selection = new wxGridSelection( this, selmode );

         m_created = TRUE;
     }
         m_created = TRUE;
     }

-

     return m_created;
 }
 
     return m_created;
 }
 

-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
+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 )
     {
 {
     if ( m_created )
     {


@@ -2069,6 +3193,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
         // View at runtime.  Is there anything in the implmentation that would
         // prevent this?
 
         // 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;
     }
         wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
         return FALSE;
     }


@@ -2082,6 +3207,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
         if (takeOwnership)
             m_ownTable = TRUE;
         Init();
         if (takeOwnership)
             m_ownTable = TRUE;
         Init();

+        m_selection = new wxGridSelection( this, selmode );

         m_created = TRUE;
     }
 
         m_created = TRUE;
     }
 


@@ -2091,8 +3217,6 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
 
 void wxGrid::Init()
 {
 
 void wxGrid::Init()
 {

-    int i;
-

     if ( m_numRows <= 0 )
         m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
 
     if ( m_numRows <= 0 )
         m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
 


@@ -2136,42 +3260,14 @@ void wxGrid::Init()
     m_defaultRowHeight += 4;
 #endif
 
     m_defaultRowHeight += 4;
 #endif
 

-    m_rowHeights.Alloc( m_numRows );
-    m_rowBottoms.Alloc( m_numRows );
-    int rowBottom = 0;
-    for ( i = 0;  i < m_numRows;  i++ )
-    {
-        m_rowHeights.Add( m_defaultRowHeight );
-        rowBottom += m_defaultRowHeight;
-        m_rowBottoms.Add( rowBottom );
-    }
-
-    m_colWidths.Alloc( m_numCols );
-    m_colRights.Alloc( m_numCols );
-    int colRight = 0;
-    for ( i = 0;  i < m_numCols;  i++ )
-    {
-        m_colWidths.Add( m_defaultColWidth );
-        colRight += m_defaultColWidth;
-        m_colRights.Add( colRight );
-    }
-
-    // Set default cell attributes
-    m_defaultCellAttr->SetFont(GetFont());
-    m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
-    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
-    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
-    m_defaultCellAttr->SetTextColour(
-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
-    m_defaultCellAttr->SetBackgroundColour(
-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-
-

     m_gridLineColour = wxColour( 128, 128, 255 );
     m_gridLinesEnabled = TRUE;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     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_dragLastPos  = -1;
     m_dragRowOrCol = -1;
     m_isDragging = FALSE;


@@ -2184,8 +3280,8 @@ void wxGrid::Init()
 
     m_currentCellCoords = wxGridNoCellCoords;
 
 
     m_currentCellCoords = wxGridNoCellCoords;
 

-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;

     m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 
     m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 


@@ -2194,8 +3290,88 @@ void wxGrid::Init()
     m_inOnKeyDown = FALSE;
     m_batchCount = 0;
 
     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()
 {
 
 void wxGrid::CalcDimensions()
 {


@@ -2204,8 +3380,8 @@ void wxGrid::CalcDimensions()
 
     if ( m_numRows > 0  &&  m_numCols > 0 )
     {
 
     if ( m_numRows > 0  &&  m_numCols > 0 )
     {

-        int right = m_colRights[ m_numCols-1 ] + 50;
-        int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
+        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
         //
 
         // TODO: restore the scroll position that we had before sizing
         //


@@ -2244,6 +3420,18 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;
 
 {
     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:
     switch ( msg.GetId() )
     {
         case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:


@@ -2449,13 +3637,13 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
         // find the row labels within these bounds
         //
         int row;
         // find the row labels within these bounds
         //
         int row;

-        int rowTop;

         for ( row = 0;  row < m_numRows;  row++ )
         {
         for ( row = 0;  row < m_numRows;  row++ )
         {

-            if ( m_rowBottoms[row] < top ) continue;
+            if ( GetRowBottom(row) < top )
+                continue;

 
 

-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
+            if ( GetRowTop(row) > bottom )
+                break;

 
             m_rowLabelsExposed.Add( row );
         }
 
             m_rowLabelsExposed.Add( row );
         }


@@ -2498,13 +3686,13 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
         // find the cells within these bounds
         //
         int col;
         // find the cells within these bounds
         //
         int col;

-        int colLeft;

         for ( col = 0;  col < m_numCols;  col++ )
         {
         for ( col = 0;  col < m_numCols;  col++ )
         {

-            if ( m_colRights[col] < left ) continue;
+            if ( GetColRight(col) < left )
+                continue;

 
 

-            colLeft = m_colRights[col] - m_colWidths[col];
-            if ( colLeft > right ) break;
+            if ( GetColLeft(col) > right )
+                break;

 
             m_colLabelsExposed.Add( col );
         }
 
             m_colLabelsExposed.Add( col );
         }


@@ -2550,29 +3738,31 @@ void wxGrid::CalcCellsExposed( wxRegion& reg )
         // find the cells within these bounds
         //
         int row, col;
         // find the cells within these bounds
         //
         int row, col;

-        int colLeft, rowTop;

         for ( row = 0;  row < m_numRows;  row++ )
         {
         for ( row = 0;  row < m_numRows;  row++ )
         {

-            if ( m_rowBottoms[row] <= top ) continue;
+            if ( GetRowBottom(row) <= top )
+                continue;

 
 

-            rowTop = m_rowBottoms[row] - m_rowHeights[row];
-            if ( rowTop > bottom ) break;
+            if ( GetRowTop(row) > bottom )
+                break;

 
             m_rowsExposed.Add( row );
 
             for ( col = 0;  col < m_numCols;  col++ )
             {
 
             m_rowsExposed.Add( row );
 
             for ( col = 0;  col < m_numCols;  col++ )
             {

-                if ( m_colRights[col] <= left ) continue;
+                if ( GetColRight(col) <= left )
+                    continue;

 
 

-                colLeft = m_colRights[col] - m_colWidths[col];
-                if ( colLeft > right ) break;
+                if ( GetColLeft(col) > right )
+                    break;

 
 

-                if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col );
+                if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
+                    m_colsExposed.Add( col );

                 m_cellsExposed.Add( wxGridCellCoords( row, col ) );
             }
         }
 
                 m_cellsExposed.Add( wxGridCellCoords( row, col ) );
             }
         }
 

-        iter++ ;
+        iter++;

     }
 }
 
     }
 }
 


@@ -2600,9 +3790,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                     wxClientDC dc( m_gridWin );
                     PrepareDC( dc );
                     y = wxMax( y,
                     wxClientDC dc( m_gridWin );
                     PrepareDC( dc );
                     y = wxMax( y,

-                               m_rowBottoms[m_dragRowOrCol] -
-                               m_rowHeights[m_dragRowOrCol] +
-                               WXGRID_MIN_ROW_HEIGHT );
+                               GetRowTop(m_dragRowOrCol) +
+                               GetRowMinimalHeight(m_dragRowOrCol) );

                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {
                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {


@@ -2614,10 +3803,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:

-                    if ( (row = YToRow( y )) >= 0  &&
-                         !IsInSelection( row, 0 ) )
-                    {
-                        SelectRow( row, TRUE );
+                    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
                     }
 
                 // default label to suppress warnings about "enumeration value


@@ -2654,7 +3846,23 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             if ( row >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
             if ( row >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {

-                SelectRow( row, event.ShiftDown() );
+               if ( !event.ShiftDown() && !event.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);
             }
         }
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
             }
         }


@@ -2662,7 +3870,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         {
             // starting to drag-resize a row
             //
         {
             // starting to drag-resize a row
             //

-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
+            if ( CanDragRowSize() )
+                ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);

         }
     }
 
         }
     }
 


@@ -2732,7 +3941,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 // don't capture the mouse yet
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 // don't capture the mouse yet

-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+                if ( CanDragRowSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);

             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )


@@ -2765,10 +3975,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
                     wxClientDC dc( m_gridWin );
                     PrepareDC( dc );
 
                     wxClientDC dc( m_gridWin );
                     PrepareDC( dc );

-                    x = wxMax( x,
-                               m_colRights[m_dragRowOrCol] -
-                               m_colWidths[m_dragRowOrCol] +
-                               WXGRID_MIN_COL_WIDTH );
+
+                    x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+                                  GetColMinimalWidth(m_dragRowOrCol));

                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {
                     dc.SetLogicalFunction(wxINVERT);
                     if ( m_dragLastPos >= 0 )
                     {


@@ -2780,10 +3989,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_COL:
                 break;
 
                 case WXGRID_CURSOR_SELECT_COL:

-                    if ( (col = XToCol( x )) >= 0  &&
-                         !IsInSelection( 0, col ) )
-                    {
-                        SelectCol( col, TRUE );
+                    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
                     }
 
                 // default label to suppress warnings about "enumeration value


@@ -2820,7 +4032,22 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             if ( col >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
             if ( col >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {

-                SelectCol( col, event.ShiftDown() );
+               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);
             }
         }
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
             }
         }


@@ -2828,7 +4055,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         {
             // starting to drag-resize a col
             //
         {
             // starting to drag-resize a col
             //

-            ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
+            if ( CanDragColSize() )
+                ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);

         }
     }
 
         }
     }
 


@@ -2898,7 +4126,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 // don't capture the cursor yet
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 // don't capture the cursor yet

-                ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+                if ( CanDragColSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);

             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )


@@ -3040,7 +4269,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             // Hide the edit control, so it
             // won't interfer with drag-shrinking.
             if ( IsCellEditControlEnabled() )
             // Hide the edit control, so it
             // won't interfer with drag-shrinking.
             if ( IsCellEditControlEnabled() )

+            {

                 HideCellEditControl();
                 HideCellEditControl();

+                SaveEditControlValue();
+            }

 
             // Have we captured the mouse yet?
             if (! m_winCapture)
 
             // Have we captured the mouse yet?
             if (! m_winCapture)


@@ -3051,20 +4283,29 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             if ( coords != wxGridNoCellCoords )
             {
 
             if ( coords != wxGridNoCellCoords )
             {

-                if ( !IsSelection() )
-                {
-                    SelectBlock( coords, coords );
-                }
-                else
-                {
-                    SelectBlock( m_currentCellCoords, coords );
+               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
                 }
 
                 if (! IsVisible(coords))
                 {
                     MakeCellVisible(coords);
                     // TODO: need to introduce a delay or something here.  The

-                    // scrolling is way to fast, at least on MSW.
+                    // scrolling is way to fast, at least on MSW - also on GTK.

                 }
             }
         }
                 }
             }
         }


@@ -3076,10 +4317,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
 
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );

-            y = wxMax( y,
-                    m_rowBottoms[m_dragRowOrCol] -
-                    m_rowHeights[m_dragRowOrCol] +
-                    WXGRID_MIN_ROW_HEIGHT );
+            y = wxMax( y, GetRowTop(m_dragRowOrCol) +
+                          GetRowMinimalHeight(m_dragRowOrCol) );

             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {
             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {


@@ -3096,9 +4335,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
 
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );

-            x = wxMax( x,
-                    m_colRights[m_dragRowOrCol] -
-                    m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH );
+            x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+                          GetColMinimalWidth(m_dragRowOrCol) );

             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {
             dc.SetLogicalFunction(wxINVERT);
             if ( m_dragLastPos >= 0 )
             {


@@ -3114,194 +4352,239 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     m_isDragging = FALSE;
     m_startDragPos = wxDefaultPosition;
 
     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

 
 

-    if ( coords != wxGridNoCellCoords )
+    // ------------ Left button pressed
+    //
+    if ( event.LeftDown() && coords != wxGridNoCellCoords )

     {
     {

-        // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
-        //     immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
-        //     wxGTK
-#if 0
-        if ( event.Entering() || event.Leaving() )
+        if ( !event.ShiftDown() && !event.ControlDown() )
+            ClearSelection();
+        if ( event.ShiftDown() )

         {
         {

-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+            m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                      m_currentCellCoords.GetCol(),
+                                      coords.GetRow(),
+                                      coords.GetCol(),
+                                      event.ControlDown(),
+                                      event.ShiftDown(),
+                                      event.AltDown(),
+                                      event.MetaDown() );

         }
         }

-        else
-#endif // 0
-
-        // ------------ Left button pressed
-        //
-        if ( event.LeftDown() )
+        else if ( XToEdgeOfCol(x) < 0  &&
+                  YToEdgeOfRow(y) < 0 )

         {
         {

-            DisableCellEditControl();
-            if ( event.ShiftDown() )
-            {
-                SelectBlock( m_currentCellCoords, coords );
-            }
-            else if ( XToEdgeOfCol(x) < 0  &&
-                      YToEdgeOfRow(y) < 0 )
+            if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+                             coords.GetRow(),
+                             coords.GetCol(),
+                             event ) )

             {
             {

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

                 {
                 {

-                    MakeCellVisible( coords );
+                    EnableCellEditControl();

 
 

-                    // if this is the second click on this cell then start
-                    // the edit control
-                    if ( m_waitForSlowClick &&
-                         (coords == m_currentCellCoords) &&
-                         CanEnableCellControl())
-                    {
-                        EnableCellEditControl();
-                        m_waitForSlowClick = FALSE;
-                    }
-                    else
-                    {
-                        SetCurrentCell( coords );
-                        m_waitForSlowClick = TRUE;
-                    }
+                    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() )
+    // ------------ Left double click
+    //
+    else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+
+        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )

         {
         {

-            DisableCellEditControl();
-            if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
-            {
-                SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
-                           coords.GetRow(),
-                           coords.GetCol(),
-                           event );
-            }
+            SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+                       coords.GetRow(),
+                       coords.GetCol(),
+                       event );

         }
         }

+    }

 
 
 
 

-        // ------------ Left button released
-        //
-        else if ( event.LeftUp() )
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )

         {
         {

-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )

             {
             {

-                if ( IsSelection() )
+                if (m_winCapture)

                 {
                 {

-                    if (m_winCapture)
-                    {
-                        m_winCapture->ReleaseMouse();
-                        m_winCapture = NULL;
-                    }
-                    SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event );
+                    m_winCapture->ReleaseMouse();
+                    m_winCapture = NULL;

                 }
                 }

-
-                // Show the edit control, if it has been hidden for
-                // drag-shrinking.
-                ShowCellEditControl();
+                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;

             }
             }

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

 
 

-                // 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 button down
-        //
-        else if ( event.RightDown() )
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
+                         coords.GetRow(),
+                         coords.GetCol(),
+                         event ) )

         {
         {

-            DisableCellEditControl();
-            if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
-            {
-                // no default action at the moment
-            }
+            // 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 );

 
 

-        // ------------ Right double click
+        // Dragging on the corner of a cell to resize in both
+        // directions is not implemented yet...

         //
         //

-        else if ( event.RightDClick() )
+        if ( dragRow >= 0  &&  dragCol >= 0 )

         {
         {

-            DisableCellEditControl();
-            if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
-            {
-                // no default action at the moment
-            }
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            return;

         }
 
         }
 

-        // ------------ Moving and no button action
-        //
-        else if ( event.Moving() && !event.IsButton() )
+        if ( dragRow >= 0 )

         {
         {

-            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;
-            }
+            m_dragRowOrCol = dragRow;

 
 

-            if ( dragRow >= 0 )
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )

             {
             {

-                m_dragRowOrCol = dragRow;
-
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
+                if ( CanDragRowSize() && CanDragGridSize() )

                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
                     ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);

-                }
-
-                return;

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

+            }

 
 

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

 
 

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

 
 

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

             {
             {

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

         }
     }
 }
         }
     }
 }


@@ -3322,8 +4605,9 @@ void wxGrid::DoEndDragResizeRow()
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
         HideCellEditControl();
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
         HideCellEditControl();

+        SaveEditControlValue();

 
 

-        int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
+        int rowTop = GetRowTop(m_dragRowOrCol);

         SetRowSize( m_dragRowOrCol,
                     wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
 
         SetRowSize( m_dragRowOrCol,
                     wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
 


@@ -3360,10 +4644,12 @@ void wxGrid::DoEndDragResizeCol()
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
         HideCellEditControl();
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
         HideCellEditControl();

+        SaveEditControlValue();

 
 

-        int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
+        int colLeft = GetColLeft(m_dragRowOrCol);

         SetColSize( m_dragRowOrCol,
         SetColSize( m_dragRowOrCol,

-                    wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+                    wxMax( m_dragLastPos - colLeft,
+                           GetColMinimalWidth(m_dragRowOrCol) ) );

 
         if ( !GetBatchCount() )
         {
 
         if ( !GetBatchCount() )
         {


@@ -3421,8 +4707,10 @@ void wxGrid::ClearGrid()
 {
     if ( m_table )
     {
 {
     if ( m_table )
     {

+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+

         m_table->Clear();
         m_table->Clear();

-        SetEditControlValue();

         if ( !GetBatchCount() ) m_gridWin->Refresh();
     }
 }
         if ( !GetBatchCount() ) m_gridWin->Refresh();
     }
 }


@@ -3467,11 +4755,10 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
                 SetCurrentCell( 0, 0 );
             }
 
                 SetCurrentCell( 0, 0 );
             }
 

-            ClearSelection();
+            m_selection->UpdateRows( pos, numRows );

             if ( !GetBatchCount() ) Refresh();
         }
 
             if ( !GetBatchCount() ) Refresh();
         }
 

-        SetEditControlValue();

         return ok;
     }
     else
         return ok;
     }
     else


@@ -3504,7 +4791,6 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
         //
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
         //

-        ClearSelection();

         if ( !GetBatchCount() ) Refresh();
         return TRUE;
     }
         if ( !GetBatchCount() ) Refresh();
         return TRUE;
     }


@@ -3536,7 +4822,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
             // the table will have sent the results of the delete row
             // operation to this view object as a grid table message
             //
             // the table will have sent the results of the delete row
             // operation to this view object as a grid table message
             //

-            ClearSelection();
+            m_selection->UpdateRows( pos, -((int)numRows) );

             if ( !GetBatchCount() ) Refresh();
             return TRUE;
         }
             if ( !GetBatchCount() ) Refresh();
             return TRUE;
         }


@@ -3575,11 +4861,10 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
                 SetCurrentCell( 0, 0 );
             }
 
                 SetCurrentCell( 0, 0 );
             }
 

-            ClearSelection();
+            m_selection->UpdateCols( pos, numCols );

             if ( !GetBatchCount() ) Refresh();
         }
 
             if ( !GetBatchCount() ) Refresh();
         }
 

-        SetEditControlValue();

         return ok;
     }
     else
         return ok;
     }
     else


@@ -3612,7 +4897,6 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
             SetCurrentCell( 0, 0 );
         }
 
             SetCurrentCell( 0, 0 );
         }
 

-        ClearSelection();

         if ( !GetBatchCount() ) Refresh();
         return TRUE;
     }
         if ( !GetBatchCount() ) Refresh();
         return TRUE;
     }


@@ -3643,7 +4927,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
             // the table will have sent the results of the delete col
             // operation to this view object as a grid table message
             //
             // the table will have sent the results of the delete col
             // operation to this view object as a grid table message
             //

-            ClearSelection();
+            m_selection->UpdateCols( pos, -((int)numCols) );

             if ( !GetBatchCount() ) Refresh();
             return TRUE;
         }
             if ( !GetBatchCount() ) Refresh();
             return TRUE;
         }


@@ -3682,11 +4966,13 @@ bool wxGrid::SendEvent( const wxEventType type,
     }
     else if ( type == wxEVT_GRID_RANGE_SELECT )
     {
     }
     else if ( type == wxEVT_GRID_RANGE_SELECT )
     {

+        // Right now, it should _never_ end up here! 

         wxGridRangeSelectEvent gridEvt( GetId(),
                                         type,
                                         this,
         wxGridRangeSelectEvent gridEvt( GetId(),
                                         type,
                                         this,

-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight,
+                                        m_selectingTopLeft,
+                                        m_selectingBottomRight,
+                                        TRUE,

                                         mouseEv.ControlDown(),
                                         mouseEv.ShiftDown(),
                                         mouseEv.AltDown(),
                                         mouseEv.ControlDown(),
                                         mouseEv.ShiftDown(),
                                         mouseEv.AltDown(),


@@ -3701,6 +4987,7 @@ bool wxGrid::SendEvent( const wxEventType type,
                              this,
                              row, col,
                              mouseEv.GetX(), mouseEv.GetY(),
                              this,
                              row, col,
                              mouseEv.GetX(), mouseEv.GetY(),

+                             FALSE,

                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),


@@ -3743,16 +5030,6 @@ bool wxGrid::SendEvent( const wxEventType type,
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc( this );
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc( this );

-
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
-         m_numRows && m_numCols )
-    {
-        m_currentCellCoords.Set(0, 0);
-        SetEditControlValue();
-        ShowCellEditControl();
-    }
-
-    m_displayed = TRUE;

 }
 
 
 }
 
 


@@ -3787,56 +5064,69 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
     if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
     {
 
     if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
     {
 

-        // TODO:  Should also support Shift-cursor keys for
-        //        extending the selection.  Maybe add a flag to
-        //        MoveCursorXXX() and MoveCursorXXXBlock() and
-        //        just send event.ShiftDown().
-

         // try local handlers
         //
         // 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() )
                 {
         switch ( event.KeyCode() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )
                 {

-                    MoveCursorUpBlock();
+                    MoveCursorUpBlock( event.ShiftDown() );

                 }
                 else
                 {
                 }
                 else
                 {

-                    MoveCursorUp();
+                    MoveCursorUp( event.ShiftDown() );

                 }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
                 {

-                    MoveCursorDownBlock();
+                    MoveCursorDownBlock( event.ShiftDown() );

                 }
                 else
                 {
                 }
                 else
                 {

-                    MoveCursorDown();
+                    MoveCursorDown( event.ShiftDown() );

                 }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
                 {

-                    MoveCursorLeftBlock();
+                    MoveCursorLeftBlock( event.ShiftDown() );

                 }
                 else
                 {
                 }
                 else
                 {

-                    MoveCursorLeft();
+                    MoveCursorLeft( event.ShiftDown() );

                 }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
                 {

-                    MoveCursorRightBlock();
+                    MoveCursorRightBlock( event.ShiftDown() );

                 }
                 else
                 {
                 }
                 else
                 {

-                    MoveCursorRight();
+                    MoveCursorRight( event.ShiftDown() );

                 }
                 break;
 
                 }
                 break;
 


@@ -3847,15 +5137,19 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 else
                 {
                 }
                 else
                 {

-                    MoveCursorDown();
+                    MoveCursorDown( event.ShiftDown() );

                 }
                 break;
 
                 }
                 break;
 

+            case WXK_ESCAPE:
+                ClearSelection();
+                break;
+

             case WXK_TAB:
                 if (event.ShiftDown())
             case WXK_TAB:
                 if (event.ShiftDown())

-                    MoveCursorLeft();
+                    MoveCursorLeft( FALSE );

                 else
                 else

-                    MoveCursorRight();
+                    MoveCursorRight( FALSE );

                 break;
 
             case WXK_HOME:
                 break;
 
             case WXK_HOME:


@@ -3890,32 +5184,54 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 MovePageDown();
                 break;
 
                 MovePageDown();
                 break;
 

-            // We don't want these keys to trigger the edit control, any others?
-            case WXK_SHIFT:
-            case WXK_ALT:
-            case WXK_CONTROL:
-            case WXK_CAPITAL:
-                event.Skip();
-                break;
-

             case WXK_SPACE:
             case WXK_SPACE:

+               if ( event.ControlDown() )
+               {
+                   m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+                                                     m_currentCellCoords.GetCol(),
+                                                     event.ControlDown(),
+                                                     event.ShiftDown(),
+                                                     event.AltDown(),
+                                                     event.MetaDown() );
+                   break;
+               }

                 if ( !IsEditable() )
                 {
                 if ( !IsEditable() )
                 {

-                    MoveCursorRight();
+                    MoveCursorRight( FALSE );

                     break;
                 }
                 // Otherwise fall through to default
 
             default:
                     break;
                 }
                 // Otherwise fall through to default
 
             default:

-                // now try the cell edit control
-                //
-                if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
+                // 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(event.KeyCode()) &&
+                       (event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
+                      event.KeyCode() == WXK_F2) &&
+                     !IsCellEditControlEnabled() &&
+                     CanEnableCellControl() )

                 {
                     EnableCellEditControl();
                 {
                     EnableCellEditControl();

-                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                    attr->GetEditor()->StartingKey(event);
+                    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();
                 }
                     attr->DecRef();
                 }

+                else
+                {
+                    // let others process char events with modifiers or all
+                    // char events for readonly cells
+                    event.Skip();
+                }

                 break;
         }
     }
                 break;
         }
     }


@@ -3923,24 +5239,15 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
     m_inOnKeyDown = FALSE;
 }
 
     m_inOnKeyDown = FALSE;
 }
 

-

 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
 
 void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 {
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
 
 void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 {

-    if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
-    {
-        // the event has been intercepted - do nothing
-        return;
-    }
-
-    if ( m_displayed  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+    if ( m_currentCellCoords != wxGridNoCellCoords )

     {
         HideCellEditControl();
     {
         HideCellEditControl();

-        SaveEditControlValue();

         DisableCellEditControl();
 
         // Clear the old current cell highlight
         DisableCellEditControl();
 
         // Clear the old current cell highlight


@@ -3954,24 +5261,23 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 
     m_currentCellCoords = coords;
 
 
     m_currentCellCoords = coords;
 

-    SetEditControlValue();
-
-    if ( m_displayed )
-    {
-        wxClientDC dc(m_gridWin);
-        PrepareDC(dc);
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);

 
 

-        wxGridCellAttr* attr = GetCellAttr(coords);
-        DrawCellHighlight(dc, attr);
-        attr->DecRef();
+    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 );
         }
         if ( IsSelection() )
         {
             wxRect r( SelectionToDeviceRect() );
             ClearSelection();
             if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
         }

-    }
+#endif

 }
 
 
 }
 
 


@@ -4033,12 +5339,43 @@ void wxGrid::DrawGridCellArea( wxDC& dc )
 }
 
 
 }
 
 

+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();
 
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
     int col = coords.GetCol();
 

-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )

         return;
 
     // we draw the cell border ourselves
         return;
 
     // we draw the cell border ourselves


@@ -4047,23 +5384,31 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
         DrawCellBorder( dc, coords );
 #endif
 
         DrawCellBorder( dc, coords );
 #endif
 

-    // don't draw the cell over the active edit control!
-    if ( (coords == m_currentCellCoords) && IsCellEditControlEnabled() )
-        return;
+    wxGridCellAttr* attr = GetCellAttr(row, col);

 
 

-    // but all the rest is drawn by the cell renderer and hence may be
-    // customized
-    wxRect rect;
-    rect.x = m_colRights[col] - m_colWidths[col];
-    rect.y = m_rowBottoms[row] - m_rowHeights[row];
-    rect.width = m_colWidths[col]-1;
-    rect.height = m_rowHeights[row]-1;
+    bool isCurrent = coords == m_currentCellCoords;

 
 

-    wxGridCellAttr* attr = GetCellAttr(row, col);
-    attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
+    wxRect rect;
+    rect.x = GetColLeft(col);
+    rect.y = GetRowTop(row);
+    rect.width = GetColWidth(col) - 1;
+    rect.height = GetRowHeight(row) - 1;

 
 

-    if (m_currentCellCoords == coords)
-        DrawCellHighlight(dc, attr);
+    // 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();
 }
 
     attr->DecRef();
 }


@@ -4073,75 +5418,98 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
     int row = m_currentCellCoords.GetRow();
     int col = m_currentCellCoords.GetCol();
 
     int row = m_currentCellCoords.GetRow();
     int col = m_currentCellCoords.GetCol();
 

-    if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+    if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )

         return;
 
     wxRect rect;
         return;
 
     wxRect rect;

-    rect.x = m_colRights[col] - m_colWidths[col];
-    rect.y = m_rowBottoms[row] - m_rowHeights[row];
-    rect.width = m_colWidths[col] - 1;
-    rect.height = m_rowHeights[row] - 1;
+    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);

 
 

-    if ( attr->IsReadOnly() )
-    {
-        // hmmm... what could we do here to show that the cell is disabled?
-        // for now, I just draw a thinner border than for the other ones, but
-        // it doesn't look really good
-        dc.SetPen(wxPen(m_gridLineColour, 2, wxSOLID));
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawRectangle(rect);

 
 

-        dc.DrawRectangle(rect);
-    }
-    else
-    {
-        // VZ: my experiments with 3d borders...

 #if 0
 #if 0

-        dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        // VZ: my experiments with 3d borders...

 
 

-        dc.DrawRectangle(rect);
-#else //1
-        // FIXME we should properly set colours for arbitrary bg
+        // how to properly set colours for arbitrary bg?

         wxCoord x1 = rect.x,
                 y1 = rect.y,
         wxCoord x1 = rect.x,
                 y1 = rect.y,

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

 
         dc.SetPen(*wxWHITE_PEN);
 
         dc.SetPen(*wxWHITE_PEN);

-        dc.DrawLine(x1, y1, x2 - 1, y1);
-        dc.DrawLine(x1, y1, x1, y2 - 1);
+        dc.DrawLine(x1, y1, x2, y1);
+        dc.DrawLine(x1, y1, x1, y2);

 
 

-        dc.SetPen(*wxLIGHT_GREY_PEN);

         dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
         dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);

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

-        dc.DrawLine(x2, y1, x2, y2);
-#endif // 0/1
-    }
+        dc.DrawLine(x2, y1, x2, y2+1);
+#endif // 0

 }
 
 }
 

+

 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {
 void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 {

-    if ( m_colWidths[coords.GetCol()] <=0  ||
-         m_rowHeights[coords.GetRow()] <= 0 ) return;
-
-    dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );

     int row = coords.GetRow();
     int col = coords.GetCol();
     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
     //
 
     // right hand border
     //

-    dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
-                 m_colRights[col], m_rowBottoms[row] );
+    dc.DrawLine( GetColRight(col), GetRowTop(row),
+                 GetColRight(col), GetRowBottom(row) );

 
     // bottom border
     //
 
     // bottom border
     //

-    dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
-                 m_colRights[col], m_rowBottoms[row] );
+    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
 
 // TODO: remove this ???
 // This is used to redraw all grid lines e.g. when the grid line colour


@@ -4155,6 +5523,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
 
     int top, bottom, left, right;
 
 
     int top, bottom, left, right;
 

+#ifndef __WXGTK__

     if (reg.IsEmpty())
     {
       int cw, ch;
     if (reg.IsEmpty())
     {
       int cw, ch;


@@ -4172,11 +5541,17 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
       CalcUnscrolledPosition( x, y, &left, &top );
       CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
     }
       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
     //
 
     // avoid drawing grid lines past the last row and col
     //

-    right = wxMin( right, m_colRights[m_numCols-1] );
-    bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] );
+    right = wxMin( right, GetColRight(m_numCols - 1) );
+    bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );

 
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
 
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 


@@ -4185,13 +5560,16 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
     int i;
     for ( i = 0; i < m_numRows; i++ )
     {
     int i;
     for ( i = 0; i < m_numRows; i++ )
     {

-        if ( m_rowBottoms[i]-1 > bottom )
+        int bot = GetRowBottom(i) - 1;
+
+        if ( bot > bottom )

         {
             break;
         }
         {
             break;
         }

-        else if ( m_rowBottoms[i]-1 >= top )
+
+        if ( bot >= top )

         {
         {

-            dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
+            dc.DrawLine( left, bot, right, bot );

         }
     }
 
         }
     }
 


@@ -4200,13 +5578,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
     //
     for ( i = 0; i < m_numCols; i++ )
     {
     //
     for ( i = 0; i < m_numCols; i++ )
     {

-        if ( m_colRights[i]-1 > right )
+        int colRight = GetColRight(i) - 1;
+        if ( colRight > right )

         {
             break;
         }
         {
             break;
         }

-        else if ( m_colRights[i]-1 >= left )
+
+        if ( colRight >= left )

         {
         {

-            dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+            dc.DrawLine( colRight, top, colRight, bottom );

         }
     }
 }
         }
     }
 }


@@ -4228,19 +5608,20 @@ void wxGrid::DrawRowLabels( wxDC& dc )
 
 void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
 
 void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {

-    if ( m_rowHeights[row] <= 0 ) return;
+    if ( GetRowHeight(row) <= 0 )
+        return;

 
 

-    int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+    int rowTop = GetRowTop(row),
+        rowBottom = GetRowBottom(row) - 1;

 
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawLine( m_rowLabelWidth-1, rowTop,
 
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawLine( m_rowLabelWidth-1, rowTop,

-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+                 m_rowLabelWidth-1, rowBottom );

 
 

-    dc.DrawLine( 0, m_rowBottoms[row]-1,
-                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+    dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );

 
     dc.SetPen( *wxWHITE_PEN );
 
     dc.SetPen( *wxWHITE_PEN );

-    dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+    dc.DrawLine( 0, rowTop, 0, rowBottom );

     dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
 
     dc.SetBackgroundMode( wxTRANSPARENT );


@@ -4252,9 +5633,9 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 
     wxRect rect;
     rect.SetX( 2 );
 
     wxRect rect;
     rect.SetX( 2 );

-    rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 );
+    rect.SetY( GetRowTop(row) + 2 );

     rect.SetWidth( m_rowLabelWidth - 4 );
     rect.SetWidth( m_rowLabelWidth - 4 );

-    rect.SetHeight( m_rowHeights[row] - 4 );
+    rect.SetHeight( GetRowHeight(row) - 4 );

     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 


@@ -4275,20 +5656,22 @@ void wxGrid::DrawColLabels( wxDC& dc )
 
 void wxGrid::DrawColLabel( wxDC& dc, int col )
 {
 
 void wxGrid::DrawColLabel( wxDC& dc, int col )
 {

-    if ( m_colWidths[col] <= 0 ) return;
+    if ( GetColWidth(col) <= 0 )
+        return;

 
 

-    int colLeft = m_colRights[col] - m_colWidths[col];
+    int colLeft = GetColLeft(col),
+        colRight = GetColRight(col) - 1;

 
     dc.SetPen( *wxBLACK_PEN );
 
     dc.SetPen( *wxBLACK_PEN );

-    dc.DrawLine( m_colRights[col]-1, 0,
-                 m_colRights[col]-1, m_colLabelHeight-1 );
+    dc.DrawLine( colRight, 0,
+                 colRight, m_colLabelHeight-1 );

 
     dc.DrawLine( colLeft, m_colLabelHeight-1,
 
     dc.DrawLine( colLeft, m_colLabelHeight-1,

-                 m_colRights[col]-1, m_colLabelHeight-1 );
+                 colRight, m_colLabelHeight-1 );

 
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
 
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );

-    dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
+    dc.DrawLine( colLeft, 0, colRight, 0 );

 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );


@@ -4302,9 +5685,9 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     GetColLabelAlignment( &hAlign, &vAlign );
 
     wxRect rect;
     GetColLabelAlignment( &hAlign, &vAlign );
 
     wxRect rect;

-    rect.SetX( m_colRights[col] - m_colWidths[col] + 2 );
+    rect.SetX( colLeft + 2 );

     rect.SetY( 2 );
     rect.SetY( 2 );

-    rect.SetWidth( m_colWidths[col] - 4 );
+    rect.SetWidth( GetColWidth(col) - 4 );

     rect.SetHeight( m_colLabelHeight - 4 );
     DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
 }
     rect.SetHeight( m_colLabelHeight - 4 );
     DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
 }


@@ -4469,7 +5852,6 @@ void wxGrid::EnableCellEditControl( bool enable )
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
 
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
 

-            SetEditControlValue();

             ShowCellEditControl();
         }
         else
             ShowCellEditControl();
         }
         else


@@ -4505,11 +5887,6 @@ bool wxGrid::IsCellEditControlEnabled() const
     return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
 }
 
     return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
 }
 

-wxWindow *wxGrid::GetGridWindow() const
-{
-    return m_gridWin;
-}
-

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


@@ -4526,70 +5903,38 @@ void wxGrid::ShowCellEditControl()
 
             // convert to scrolled coords
             //
 
             // convert to scrolled coords
             //

-            int left, top, right, bottom;
-            CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
-            CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
-
-            // cell is shifted by one pixel
-            left--;
-            top--;
-            right--;
-            bottom--;
+            CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

 
 

-            // Make the edit control large enough to allow for internal
-            // margins
-            //
-            // TODO: remove this if the text ctrl sizing is improved esp. for
-            // unix
-            //
-            int extra;
-#if defined(__WXMOTIF__)
-            if ( row == 0  || col == 0 )
-            {
-                extra = 2;
-            }
-            else
-            {
-                extra = 4;
-            }
-#else
-            if ( row == 0  || col == 0 )
-            {
-                extra = 1;
-            }
-            else
-            {
-                extra = 2;
-            }
-#endif
+            // 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

 
 

-#if defined(__WXGTK__)
-            int top_diff = 0;
-            int left_diff = 0;
-            if (left != 0) left_diff++;
-            if (top != 0) top_diff++;
-            rect.SetLeft( left + left_diff );
-            rect.SetTop( top + top_diff );
-            rect.SetRight( rect.GetRight() - left_diff );
-            rect.SetBottom( rect.GetBottom() - top_diff );
-#else
-            rect.SetLeft( wxMax(0, left - extra) );
-            rect.SetTop( wxMax(0, top - extra) );
-            rect.SetRight( rect.GetRight() + 2*extra );
-            rect.SetBottom( rect.GetBottom() + 2*extra );
-#endif
+            // cell is shifted by one pixel
+            rect.x--;
+            rect.y--;

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

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

             if ( !editor->IsCreated() )
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));
             }
 
             if ( !editor->IsCreated() )
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));
             }
 

-            editor->SetSize( rect );

             editor->Show( TRUE, attr );
             editor->Show( TRUE, attr );

+
+            editor->SetSize( rect );
+

             editor->BeginEdit(row, col, this);
             editor->BeginEdit(row, col, this);

+
+            editor->DecRef();

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


@@ -4604,20 +5949,15 @@ void wxGrid::HideCellEditControl()
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);

-        attr->GetEditor()->Show( FALSE );
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->Show( FALSE );
+        editor->DecRef();

         attr->DecRef();
         m_gridWin->SetFocus();
     }
 }
 
 
         attr->DecRef();
         m_gridWin->SetFocus();
     }
 }
 
 

-void wxGrid::SetEditControlValue( const wxString& value )
-{
-    // RD: The new Editors get the value from the table themselves now.  This
-    // method can probably be removed...
-}
-
-

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


@@ -4626,8 +5966,10 @@ void wxGrid::SaveEditControlValue()
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);

-        bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this);
+        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+        bool changed = editor->EndEdit(row, col, this);

 
 

+        editor->DecRef();

         attr->DecRef();
 
         if (changed)
         attr->DecRef();
 
         if (changed)


@@ -4669,10 +6011,11 @@ int wxGrid::YToRow( int y )
 
     for ( i = 0;  i < m_numRows;  i++ )
     {
 
     for ( i = 0;  i < m_numRows;  i++ )
     {

-        if ( y < m_rowBottoms[i] ) return i;
+        if ( y < GetRowBottom(i) )
+            return i;

     }
 
     }
 

-    return m_numRows; //-1;
+    return -1;

 }
 
 
 }
 
 


@@ -4682,10 +6025,11 @@ int wxGrid::XToCol( int x )
 
     for ( i = 0;  i < m_numCols;  i++ )
     {
 
     for ( i = 0;  i < m_numCols;  i++ )
     {

-        if ( x < m_colRights[i] ) return i;
+        if ( x < GetColRight(i) )
+            return i;

     }
 
     }
 

-    return m_numCols; //-1;
+    return -1;

 }
 
 
 }
 
 


@@ -4698,12 +6042,11 @@ int wxGrid::YToEdgeOfRow( int y )
 
     for ( i = 0;  i < m_numRows;  i++ )
     {
 
     for ( i = 0;  i < m_numRows;  i++ )
     {

-        if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE )
+        if ( GetRowHeight(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;

         }
     }
 
         }
     }
 


@@ -4720,12 +6063,11 @@ int wxGrid::XToEdgeOfCol( int x )
 
     for ( i = 0;  i < m_numCols;  i++ )
     {
 
     for ( i = 0;  i < m_numCols;  i++ )
     {

-        if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE )
+        if ( GetColWidth(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;

         }
     }
 
         }
     }
 


@@ -4740,10 +6082,10 @@ wxRect wxGrid::CellToRect( int row, int col )
     if ( row >= 0  &&  row < m_numRows  &&
          col >= 0  &&  col < m_numCols )
     {
     if ( row >= 0  &&  row < m_numRows  &&
          col >= 0  &&  col < m_numCols )
     {

-        rect.x = m_colRights[col] - m_colWidths[col];
-        rect.y = m_rowBottoms[row] - m_rowHeights[row];
-        rect.width = m_colWidths[col];
-        rect.height = m_rowHeights[ row ];
+        rect.x = GetColLeft(col);
+        rect.y = GetRowTop(row);
+        rect.width = GetColWidth(col);
+        rect.height = GetRowHeight(row);

     }
 
     return rect;
     }
 
     return rect;


@@ -4818,10 +6160,12 @@ void wxGrid::MakeCellVisible( int row, int col )
             ypos = r.GetTop();
             for ( i = row-1;  i >= 0;  i-- )
             {
             ypos = r.GetTop();
             for ( i = row-1;  i >= 0;  i-- )
             {

-                if ( h + m_rowHeights[i] > ch ) break;
+                int rowHeight = GetRowHeight(i);
+                if ( h + rowHeight > ch )
+                    break;

 
 

-                h += m_rowHeights[i];
-                ypos -= m_rowHeights[i];
+                h += rowHeight;
+                ypos -= rowHeight;

             }
 
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             }
 
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't


@@ -4840,10 +6184,12 @@ void wxGrid::MakeCellVisible( int row, int col )
             xpos = r.GetLeft();
             for ( i = col-1;  i >= 0;  i-- )
             {
             xpos = r.GetLeft();
             for ( i = col-1;  i >= 0;  i-- )
             {

-                if ( w + m_colWidths[i] > cw ) break;
+                int colWidth = GetColWidth(i);
+                if ( w + colWidth > cw )
+                    break;

 
 

-                w += m_colWidths[i];
-                xpos -= m_colWidths[i];
+                w += colWidth;
+                xpos -= colWidth;

             }
 
             // see comment for ypos above
             }
 
             // see comment for ypos above


@@ -4865,17 +6211,28 @@ void wxGrid::MakeCellVisible( int row, int col )
 // ------ Grid cursor movement functions
 //
 
 // ------ Grid cursor movement functions
 //
 

-bool wxGrid::MoveCursorUp()
+bool wxGrid::MoveCursorUp( bool expandSelection )

 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() > 0 )
     {
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() > 0 )
     {

-        MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
-
-        SetCurrentCell( m_currentCellCoords.GetRow() - 1,
-                        m_currentCellCoords.GetCol() );
-
+        if ( 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 TRUE;
     }
 


@@ -4883,19 +6240,28 @@ bool wxGrid::MoveCursorUp()
 }
 
 
 }
 
 

-bool wxGrid::MoveCursorDown()
+bool wxGrid::MoveCursorDown( bool expandSelection )

 {
 {

-    // TODO: allow for scrolling
-    //

     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() < m_numRows-1 )
     {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() < m_numRows-1 )
     {

-        MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
-
-        SetCurrentCell( m_currentCellCoords.GetRow() + 1,
-                        m_currentCellCoords.GetCol() );
-
+        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 TRUE;
     }
 


@@ -4903,17 +6269,28 @@ bool wxGrid::MoveCursorDown()
 }
 
 
 }
 
 

-bool wxGrid::MoveCursorLeft()
+bool wxGrid::MoveCursorLeft( bool expandSelection )

 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() > 0 )
     {
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() > 0 )
     {

-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
-
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() - 1 );
-
+        if ( 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 TRUE;
     }
 


@@ -4921,17 +6298,28 @@ bool wxGrid::MoveCursorLeft()
 }
 
 
 }
 
 

-bool wxGrid::MoveCursorRight()
+bool wxGrid::MoveCursorRight( bool expandSelection )

 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() < m_numCols - 1 )
     {
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() < m_numCols - 1 )
     {

-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
-
-        SetCurrentCell( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
-
+        if ( 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 TRUE;
     }
 


@@ -4949,7 +6337,7 @@ bool wxGrid::MovePageUp()
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 

-        int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
+        int y = GetRowTop(row);

         int newRow = YToRow( y - ch + 1 );
         if ( newRow == -1 )
         {
         int newRow = YToRow( y - ch + 1 );
         if ( newRow == -1 )
         {


@@ -4979,7 +6367,7 @@ bool wxGrid::MovePageDown()
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 

-        int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
+        int y = GetRowTop(row);

         int newRow = YToRow( y + ch );
         if ( newRow == -1 )
         {
         int newRow = YToRow( y + ch );
         if ( newRow == -1 )
         {


@@ -4999,7 +6387,7 @@ bool wxGrid::MovePageDown()
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxGrid::MoveCursorUpBlock()
+bool wxGrid::MoveCursorUpBlock( bool expandSelection )

 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&


@@ -5046,15 +6434,23 @@ bool wxGrid::MoveCursorUpBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );

-        SetCurrentCell( row, col );
-
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+       {
+           ClearSelection();
+           SetCurrentCell( row, col );
+       }

         return TRUE;
     }
 
     return FALSE;
 }
 
         return TRUE;
     }
 
     return FALSE;
 }
 

-bool wxGrid::MoveCursorDownBlock()
+bool wxGrid::MoveCursorDownBlock( bool expandSelection )

 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&


@@ -5101,7 +6497,16 @@ bool wxGrid::MoveCursorDownBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );

-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+       {
+           ClearSelection();
+           SetCurrentCell( row, col );
+       }

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -5109,7 +6514,7 @@ bool wxGrid::MoveCursorDownBlock()
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxGrid::MoveCursorLeftBlock()
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )

 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&


@@ -5156,7 +6561,16 @@ bool wxGrid::MoveCursorLeftBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );

-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+       {
+           ClearSelection();
+           SetCurrentCell( row, col );
+       }

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -5164,7 +6578,7 @@ bool wxGrid::MoveCursorLeftBlock()
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxGrid::MoveCursorRightBlock()
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )

 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_table &&
          m_currentCellCoords != wxGridNoCellCoords  &&


@@ -5211,7 +6625,16 @@ bool wxGrid::MoveCursorRightBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );

-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+       {
+           ClearSelection();
+           SetCurrentCell( row, col );
+       }

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -5471,7 +6894,7 @@ int wxGrid::GetRowSize( int row )
 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 

-    return m_rowHeights[row];
+    return GetRowHeight(row);

 }
 
 int wxGrid::GetDefaultColSize()
 }
 
 int wxGrid::GetDefaultColSize()


@@ -5483,7 +6906,7 @@ int wxGrid::GetColSize( int col )
 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 
 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 

-    return m_colWidths[col];
+    return GetColWidth(col);

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -5498,6 +6921,9 @@ int wxGrid::GetColSize( int col )
 void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
 {
     m_defaultCellAttr->SetBackgroundColour(col);
 void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
 {
     m_defaultCellAttr->SetBackgroundColour(col);

+#ifdef __WXGTK__
+    m_gridWin->SetBackgroundColour(col);
+#endif

 }
 
 void wxGrid::SetDefaultCellTextColour( const wxColour& col )
 }
 
 void wxGrid::SetDefaultCellTextColour( const wxColour& col )


@@ -5551,12 +6977,12 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
 
 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {
 
 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {

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

 }
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {
 }
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {

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

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


@@ -5567,7 +6993,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col)
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();

-    attr->SafeDecRef();
+    attr->DecRef();

     return colour;
 }
 
     return colour;
 }
 


@@ -5575,7 +7001,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();

-    attr->SafeDecRef();
+    attr->DecRef();

     return colour;
 }
 
     return colour;
 }
 


@@ -5583,7 +7009,7 @@ wxFont wxGrid::GetCellFont( int row, int col )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();

-    attr->SafeDecRef();
+    attr->DecRef();

     return font;
 }
 
     return font;
 }
 


@@ -5591,22 +7017,24 @@ void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);

-    attr->SafeDecRef();
+    attr->DecRef();

 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);

-    wxGridCellRenderer* renderer = attr->GetRenderer();
+    wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);

     attr->DecRef();
     attr->DecRef();

+

     return renderer;
 }
 
 wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     return renderer;
 }
 
 wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);

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

     attr->DecRef();
     attr->DecRef();

+

     return editor;
 }
 
     return editor;
 }
 


@@ -5629,26 +7057,14 @@ bool wxGrid::CanHaveAttributes()
         return FALSE;
     }
 
         return FALSE;
     }
 

-    // RD:  Maybe m_table->CanHaveAttributes() would be better in case the
-    //      table is providing the attributes itself???  In which case
-    //      I don't think the grid should create a Provider object for the
-    //      table but the table should be smart enough to do that on its own.
-    if ( !m_table->GetAttrProvider() )
-    {
-        // use the default attr provider by default
-        // (another choice would be to just return FALSE thus forcing the user
-        // to it himself)
-        m_table->SetAttrProvider(new wxGridCellAttrProvider);
-    }
-
-    return TRUE;
+    return m_table->CanHaveAttributes();

 }
 
 void wxGrid::ClearAttrCache()
 {
     if ( m_attrCache.row != -1 )
     {
 }
 
 void wxGrid::ClearAttrCache()
 {
     if ( m_attrCache.row != -1 )
     {

-        m_attrCache.attr->SafeDecRef();
+        wxSafeDecRef(m_attrCache.attr);

         m_attrCache.row = -1;
     }
 }
         m_attrCache.row = -1;
     }
 }


@@ -5661,7 +7077,7 @@ void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
     self->m_attrCache.row = row;
     self->m_attrCache.col = col;
     self->m_attrCache.attr = attr;
     self->m_attrCache.row = row;
     self->m_attrCache.col = col;
     self->m_attrCache.attr = attr;

-    attr->SafeIncRef();
+    wxSafeIncRef(attr);

 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const


@@ -5669,7 +7085,7 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
     if ( row == m_attrCache.row && col == m_attrCache.col )
     {
         *attr = m_attrCache.attr;
     if ( row == m_attrCache.row && col == m_attrCache.col )
     {
         *attr = m_attrCache.attr;

-        (*attr)->SafeIncRef();
+        wxSafeIncRef(m_attrCache.attr);

 
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheHits++;
 
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheHits++;


@@ -5733,6 +7149,40 @@ wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
     return attr;
 }
 
     return attr;
 }
 

+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetColFormatBool(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_BOOL);
+}
+
+void wxGrid::SetColFormatNumber(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
+}
+
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
+{
+    wxString typeName = wxGRID_VALUE_FLOAT;
+    if ( (width != -1) || (precision != -1) )
+    {
+        typeName << _T(':') << width << _T(',') << precision;
+    }
+
+    SetColFormatCustom(col, typeName);
+}
+
+void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
+{
+    wxGridCellAttr *attr = new wxGridCellAttr;
+    wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
+    attr->SetRenderer(renderer);
+
+    SetColAttr(col, attr);
+}
+

 // ----------------------------------------------------------------------------
 // setting cell attributes: this is forwarded to the table
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // setting cell attributes: this is forwarded to the table
 // ----------------------------------------------------------------------------


@@ -5745,7 +7195,7 @@ void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
     }
     else
     {
     }
     else
     {

-        attr->SafeDecRef();
+        wxSafeDecRef(attr);

     }
 }
 
     }
 }
 


@@ -5757,7 +7207,7 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
     }
     else
     {
     }
     else
     {

-        attr->SafeDecRef();
+        wxSafeDecRef(attr);

     }
 }
 
     }
 }
 


@@ -5831,24 +7281,88 @@ void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// Data type registration
+// ----------------------------------------------------------------------------
+
+void wxGrid::RegisterDataType(const wxString& typeName,
+                              wxGridCellRenderer* renderer,
+                              wxGridCellEditor* editor)
+{
+    m_typeRegistry->RegisterDataType(typeName, renderer, editor);
+}
+
+
+wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
+{
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultEditorForType(typeName);
+}
+
+wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
+{
+    wxString typeName = m_table->GetTypeName(row, col);
+    return GetDefaultRendererForType(typeName);
+}
+
+wxGridCellEditor*
+wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+{
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
+
+        return NULL;
+    }
+
+    return m_typeRegistry->GetEditor(index);
+}
+
+wxGridCellRenderer*
+wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+{
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
+
+        return NULL;
+    }
+
+    return m_typeRegistry->GetRenderer(index);
+}
+
+

 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // row/col size
 // ----------------------------------------------------------------------------
 

+void wxGrid::EnableDragRowSize( bool enable )
+{
+    m_canDragRowSize = enable;
+}
+
+
+void wxGrid::EnableDragColSize( bool enable )
+{
+    m_canDragColSize = enable;
+}
+
+void wxGrid::EnableDragGridSize( bool enable )
+{
+    m_canDragGridSize = enable;
+}
+
+

 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
     m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
 
     if ( resizeExistingRows )
     {
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
     m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
 
     if ( resizeExistingRows )
     {

-        int row;
-        int bottom = 0;
-        for ( row = 0;  row < m_numRows;  row++ )
-        {
-            m_rowHeights[row] = m_defaultRowHeight;
-            bottom += m_defaultRowHeight;
-            m_rowBottoms[row] = bottom;
-        }
+        InitRowHeights();
+

         CalcDimensions();
     }
 }
         CalcDimensions();
     }
 }


@@ -5857,12 +7371,17 @@ void wxGrid::SetRowSize( int row, int height )
 {
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 
 {
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 

-    int i;
+    if ( m_rowHeights.IsEmpty() )
+    {
+        // need to really create the array
+        InitRowHeights();
+    }

 
     int h = wxMax( 0, height );
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;
 
     int h = wxMax( 0, height );
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;

+    int i;

     for ( i = row;  i < m_numRows;  i++ )
     {
         m_rowBottoms[i] += diff;
     for ( i = row;  i < m_numRows;  i++ )
     {
         m_rowBottoms[i] += diff;


@@ -5876,14 +7395,8 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 
     if ( resizeExistingCols )
     {
 
     if ( resizeExistingCols )
     {

-        int col;
-        int right = 0;
-        for ( col = 0;  col < m_numCols;  col++ )
-        {
-            m_colWidths[col] = m_defaultColWidth;
-            right += m_defaultColWidth;
-            m_colRights[col] = right;
-        }
+        InitColWidths();
+

         CalcDimensions();
     }
 }
         CalcDimensions();
     }
 }


@@ -5892,12 +7405,19 @@ void wxGrid::SetColSize( int col, int width )
 {
     wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 
 {
     wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 

-    int i;
+    // should we check that it's bigger than GetColMinimalWidth(col) here?
+
+    if ( m_colWidths.IsEmpty() )
+    {
+        // need to really create the array
+        InitColWidths();
+    }

 
     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 
 
     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 

+    int i;

     for ( i = col;  i < m_numCols;  i++ )
     {
         m_colRights[i] += diff;
     for ( i = col;  i < m_numCols;  i++ )
     {
         m_colRights[i] += diff;


@@ -5906,193 +7426,214 @@ void wxGrid::SetColSize( int col, int width )
 }
 
 
 }
 
 

-//
-// ------ cell value accessor functions
-//
-
-void wxGrid::SetCellValue( int row, int col, const wxString& s )
+void wxGrid::SetColMinimalWidth( int col, int width )

 {
 {

-    if ( m_table )
-    {
-        m_table->SetValue( row, col, s.c_str() );
-        if ( !GetBatchCount() )
-        {
-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            DrawCell( dc, wxGridCellCoords(row, col) );
-        }
-
-#if 0  // TODO: edit in place
+    m_colMinWidths.Put(col, width);
+}

 
 

-        if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col )
-        {
-            SetEditControlValue( s );
-        }
-#endif
+void wxGrid::SetRowMinimalHeight( int row, int width )
+{
+    m_rowMinHeights.Put(row, width);
+}

 
 

-    }
+int wxGrid::GetColMinimalWidth(int col) const
+{
+    long value = m_colMinWidths.Get(col);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;

 }
 
 }
 

+int wxGrid::GetRowMinimalHeight(int row) const
+{
+    long value = m_rowMinHeights.Get(row);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
+}

 
 

-//
-// ------ Block, row and col selection
-//
+// ----------------------------------------------------------------------------
+// auto sizing
+// ----------------------------------------------------------------------------

 
 

-void wxGrid::SelectRow( int row, bool addToSelected )
+void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )

 {
 {

-    wxRect r;
+    wxClientDC dc(m_gridWin);

 
 

-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+    // 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;

 
 

-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    wxCoord extent, extentMax = 0;
+    int max = column ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
+    {
+        if ( column )
+            row = rowOrCol;
+        else
+            col = rowOrCol;

 
 

-        if ( oldTop > row )
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        if ( renderer )

         {
         {

-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+            if ( extent > extentMax )
+            {
+                extentMax = extent;
+            }
+
+            renderer->DecRef();

         }
 
         }
 

-        if ( oldLeft > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
+        attr->DecRef();
+    }

 
 

-            m_selectedTopLeft.SetCol( 0 );
-        }
+    // 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 );

 
 

-        if ( oldBottom < row )
+    extent = column ? w : h;
+    if ( extent > extentMax )
+    {
+        extentMax = extent;
+    }
+
+    if ( !extentMax )
+    {
+        // empty column - give default extent (notice that if extentMax is less
+        // than default extent but != 0, it's ok)
+        extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
+    }
+    else
+    {
+        if ( column )

         {
         {

-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( row );
+            // leave some space around text
+            extentMax += 10;

         }
         }

+    }
+
+    if ( column )
+        SetColSize(col, extentMax);
+    else
+        SetRowSize(row, extentMax);
+
+    if ( setAsMin )
+    {
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);
+    }
+}

 
 

-        if ( oldRight < m_numCols - 1 )
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
+{
+    int width = m_rowLabelWidth;
+
+    for ( int col = 0; col < m_numCols; col++ )
+    {
+        if ( !calcOnly )

         {
         {

-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
-                                                            oldRight + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetCol( m_numCols - 1 );
+            AutoSizeColumn(col, setAsMin);

         }
 
         }
 

-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+        width += GetColWidth(col);

     }
     }

-    else
+
+    return width;
+}
+
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
+{
+    int height = m_colLabelHeight;
+
+    for ( int row = 0; row < m_numRows; row++ )

     {
     {

-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+        if ( !calcOnly )
+        {
+            AutoSizeRow(row, setAsMin);
+        }

 
 

-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
+        height += GetRowHeight(row);

     }
 
     }
 

-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
-
-    GetEventHandler()->ProcessEvent(gridEvt);
+    return height;

 }
 
 }
 

+void wxGrid::AutoSize()
+{
+    // set the size too
+    SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+}

 
 

-void wxGrid::SelectCol( int col, bool addToSelected )
+wxSize wxGrid::DoGetBestSize() const

 {
 {

-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
-        int     i;
+    // don't set sizes, only calculate them
+    wxGrid *self = (wxGrid *)this;  // const_cast

 
 

-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    return wxSize(self->SetOrCalcColumnSizes(TRUE),
+                  self->SetOrCalcRowSizes(TRUE));
+}

 
 

-        if ( oldLeft > col )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldLeft - 1 ) );
-            m_selectedTopLeft.SetCol( col );
-        }
+void wxGrid::Fit()
+{
+    AutoSize();
+}

 
 

-        if ( oldTop  > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            oldRight ) );
-            m_selectedTopLeft.SetRow( 0 );
-        }
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------

 
 

-        if ( oldRight < col )
+void wxGrid::SetCellValue( int row, int col, const wxString& s )
+{
+    if ( m_table )
+    {
+        m_table->SetValue( row, col, s.c_str() );
+        if ( !GetBatchCount() )

         {
         {

-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            col            ) );
-            m_selectedBottomRight.SetCol( col );
+            wxClientDC dc( m_gridWin );
+            PrepareDC( dc );
+            DrawCell( dc, wxGridCellCoords(row, col) );

         }
 
         }
 

-        if ( oldBottom < m_numRows - 1 )
+        if ( m_currentCellCoords.GetRow() == row &&
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlEnabled())

         {
         {

-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldRight ) );
-            m_selectedBottomRight.SetRow( m_numRows - 1 );
+            HideCellEditControl();
+            ShowCellEditControl(); // will reread data from table

         }
         }

-
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );

     }
     }

-    else
-    {
-        wxRect r;
+}

 
 

-        r = SelectionToDeviceRect();
+
+//
+// ------ Block, row and col selection
+//
+
+void wxGrid::SelectRow( int row, bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )

         ClearSelection();
         ClearSelection();

-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );

 
 

-        m_selectedTopLeft.Set( 0, col );
-        m_selectedBottomRight.Set( m_numRows-1, col );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
-    }
+    m_selection->SelectRow( row );
+}

 
 

-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );

 
 

-    GetEventHandler()->ProcessEvent(gridEvt);
+void wxGrid::SelectCol( int col, bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();
+
+    m_selection->SelectCol( col );

 }
 
 
 }
 
 


@@ -6118,21 +7659,25 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
     updateTopLeft = wxGridCellCoords( topRow, leftCol );
     updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
 
     updateTopLeft = wxGridCellCoords( topRow, leftCol );
     updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
 

-    if ( m_selectedTopLeft != updateTopLeft ||
-         m_selectedBottomRight != updateBottomRight )
+    if ( m_selectingTopLeft != updateTopLeft ||
+         m_selectingBottomRight != updateBottomRight )

     {
         // Compute two optimal update rectangles:
         // Either one rectangle is a real subset of the
         // other, or they are (almost) disjoint!
         wxRect  rect[4];
     {
         // Compute two optimal update rectangles:
         // Either one rectangle is a real subset of the
         // other, or they are (almost) disjoint!
         wxRect  rect[4];

-        bool    need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+        bool    need_refresh[4];
+        need_refresh[0] =
+        need_refresh[1] =
+        need_refresh[2] =
+        need_refresh[3] = FALSE;

         int     i;
 
         // Store intermediate values
         int     i;
 
         // Store intermediate values

-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+        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)
 
         // Determine the outer/inner coordinates.
         if (oldLeft > leftCol)


@@ -6202,8 +7747,8 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
 
 
         // Change Selection
 
 
         // Change Selection

-        m_selectedTopLeft = updateTopLeft;
-        m_selectedBottomRight = updateBottomRight;
+        m_selectingTopLeft = updateTopLeft;
+        m_selectingBottomRight = updateBottomRight;

 
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
 
         // various Refresh() calls
         for (i = 0; i < 4; i++ )


@@ -6211,34 +7756,36 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
                 m_gridWin->Refresh( FALSE, &(rect[i]) );
     }
 
                 m_gridWin->Refresh( FALSE, &(rect[i]) );
     }
 

-    // only generate an event if the block is not being selected by
-    // dragging the mouse (in which case the event will be generated in
-    // the mouse event handler)
-    if ( !m_isDragging )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        wxEVT_GRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
-
-        GetEventHandler()->ProcessEvent(gridEvt);
-    }
+    // never generate an event as it will be generated from
+    // wxGridSelection::SelectBlock!

 }
 
 void wxGrid::SelectAll()
 {
 }
 
 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 );
+}

 
 

-    m_gridWin->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()
 {
 
 void wxGrid::ClearSelection()
 {

-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;
+    m_selection->ClearSelection();

 }
 
 
 }
 
 


@@ -6297,7 +7844,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
 
 wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
 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 )
 {
                           bool control, bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {


@@ -6305,6 +7852,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
     m_col = col;
     m_x = x;
     m_y = y;
     m_col = col;
     m_x = x;
     m_y = y;

+    m_selecting = sel;

     m_control = control;
     m_shift = shift;
     m_alt = alt;
     m_control = control;
     m_shift = shift;
     m_alt = alt;


@@ -6338,11 +7886,13 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                const wxGridCellCoords& topLeft,
                                                const wxGridCellCoords& bottomRight,
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                const wxGridCellCoords& topLeft,
                                                const wxGridCellCoords& bottomRight,

-                                               bool control, bool shift, bool alt, bool meta )
+                                               bool sel, bool control,
+                                               bool shift, bool alt, bool meta )

         : wxNotifyEvent( type, id )
 {
     m_topLeft     = topLeft;
     m_bottomRight = bottomRight;
         : wxNotifyEvent( type, id )
 {
     m_topLeft     = topLeft;
     m_bottomRight = bottomRight;

+    m_selecting   = sel;

     m_control     = control;
     m_shift       = shift;
     m_alt         = alt;
     m_control     = control;
     m_shift       = shift;
     m_alt         = alt;


@@ -6353,4 +7903,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 
 
 #endif // ifndef wxUSE_NEW_GRID
 
 
 #endif // ifndef wxUSE_NEW_GRID

-