Committing in .

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

index 1674f1e50277ed0fa56e386cf45dd3a8cda4b4db..2a8075f2267de94d2cb8172ba436324531483d47 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -47,8 +47,25 @@
  
  #include "wx/textfile.h"
  #include "wx/spinctrl.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"
+
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
+#else
+    #define WXUNUSED_MOTIF(identifier)  identifier
+#endif
+
+#if defined(__WXGTK__)
+    #define WXUNUSED_GTK(identifier)    WXUNUSED(identifier)
+#else
+    #define WXUNUSED_GTK(identifier)    identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
  
  // ----------------------------------------------------------------------------
  // array classes
  
  // ----------------------------------------------------------------------------
  // array classes
@@ -281,12 +298,25 @@ WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
  class WXDLLEXPORT wxGridTypeRegistry
  {
  public:
  class WXDLLEXPORT wxGridTypeRegistry
  {
  public:
+  wxGridTypeRegistry() {}
      ~wxGridTypeRegistry();
  
      void RegisterDataType(const wxString& typeName,
                       wxGridCellRenderer* renderer,
                       wxGridCellEditor* editor);
      ~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);
      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);
  
      wxGridCellRenderer* GetRenderer(int index);
      wxGridCellEditor*   GetEditor(int index);
  
@@ -338,8 +368,6 @@ static const int GRID_HASH_SIZE = 100;
  wxGridCellEditor::wxGridCellEditor()
  {
      m_control = NULL;
  wxGridCellEditor::wxGridCellEditor()
  {
      m_control = NULL;
-
-    m_nRef = 1;
  }
  
  
  }
  
  
@@ -455,6 +483,7 @@ void wxGridCellEditor::StartingClick()
  
  wxGridCellTextEditor::wxGridCellTextEditor()
  {
  
  wxGridCellTextEditor::wxGridCellTextEditor()
  {
+    m_maxChars = 0;
  }
  
  void wxGridCellTextEditor::Create(wxWindow* parent,
  }
  
  void wxGridCellTextEditor::Create(wxWindow* parent,
@@ -468,6 +497,8 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
  #endif
                                );
  
  #endif
                                );
  
+    // TODO: use m_maxChars
+
      wxGridCellEditor::Create(parent, id, evtHandler);
  }
  
      wxGridCellEditor::Create(parent, id, evtHandler);
  }
  
@@ -569,7 +600,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
      if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
      {
          // insert the key in the control
      if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
      {
          // insert the key in the control
-        long keycode = event.KeyCode();
+        int keycode = (int)event.KeyCode();
          if ( isprint(keycode) )
          {
              // FIXME this is not going to work for non letters...
          if ( isprint(keycode) )
          {
              // FIXME this is not going to work for non letters...
@@ -588,11 +619,12 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
      event.Skip();
  }
  
      event.Skip();
  }
  
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+                                         WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
  {
  #if defined(__WXMOTIF__) || defined(__WXGTK__)
      // wxMotif needs a little extra help...
  {
  #if defined(__WXMOTIF__) || defined(__WXGTK__)
      // wxMotif needs a little extra help...
-    int pos = Text()->GetInsertionPoint();
+    size_t pos = (size_t)( Text()->GetInsertionPoint() );
      wxString s( Text()->GetValue() );
      s = s.Left(pos) + "\n" + s.Mid(pos);
      Text()->SetValue(s);
      wxString s( Text()->GetValue() );
      s = s.Left(pos) + "\n" + s.Mid(pos);
      Text()->SetValue(s);
@@ -604,6 +636,28 @@ 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
  // ----------------------------------------------------------------------------
@@ -659,7 +713,7 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
  
      if ( HasRange() )
      {
  
      if ( HasRange() )
      {
-        Spin()->SetValue(m_valueOld);
+        Spin()->SetValue((int)m_valueOld);
      }
      else
      {
      }
      else
      {
@@ -698,7 +752,7 @@ void wxGridCellNumberEditor::Reset()
  {
      if ( HasRange() )
      {
  {
      if ( HasRange() )
      {
-        Spin()->SetValue(m_valueOld);
+        Spin()->SetValue((int)m_valueOld);
      }
      else
      {
      }
      else
      {
@@ -710,7 +764,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
  {
      if ( !HasRange() )
      {
  {
      if ( !HasRange() )
      {
-        long keycode = event.KeyCode();
+        int keycode = (int) event.KeyCode();
          if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
          {
              wxGridCellTextEditor::StartingKey(event);
          if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
          {
              wxGridCellTextEditor::StartingKey(event);
@@ -723,6 +777,35 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
      event.Skip();
  }
  
      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
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // wxGridCellFloatEditor
  // ----------------------------------------------------------------------------
@@ -785,7 +868,7 @@ void wxGridCellFloatEditor::Reset()
  
  void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
  {
  
  void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
  {
-    long keycode = event.KeyCode();
+    int keycode = (int)event.KeyCode();
      if ( isdigit(keycode) ||
           keycode == '+' || keycode == '-' || keycode == '.' )
      {
      if ( isdigit(keycode) ||
           keycode == '+' || keycode == '-' || keycode == '.' )
      {
@@ -849,8 +932,8 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
      // so shift it to the right
      size.x -= 8;
  #elif defined(__WXMSW__)
      // so shift it to the right
      size.x -= 8;
  #elif defined(__WXMSW__)
-    // here too...
-    size.x -= 6;
+    // here too, but in other way
+    size.x += 1;
      size.y -= 2;
  #endif
  
      size.y -= 2;
  #endif
  
@@ -925,13 +1008,25 @@ wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
                                                 bool allowOthers)
                        : m_allowOthers(allowOthers)
  {
                                                 bool allowOthers)
                        : m_allowOthers(allowOthers)
  {
-    m_choices.Alloc(count);
-    for ( size_t n = 0; n < count; n++ )
+    if ( count )
      {
      {
-        m_choices.Add(choices[n]);
+        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)
  void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                      wxWindowID id,
                                      wxEvtHandler* evtHandler)
@@ -1007,6 +1102,23 @@ void wxGridCellChoiceEditor::Reset()
      Combo()->SetInsertionPointEnd();
  }
  
      Combo()->SetInsertionPointEnd();
  }
  
+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // what can we do?
+        return;
+    }
+
+    m_choices.Empty();
+
+    wxStringTokenizer tk(params, _T(','));
+    while ( tk.HasMoreTokens() )
+    {
+        m_choices.Add(tk.GetNextToken());
+    }
+}
+
  // ----------------------------------------------------------------------------
  // wxGridCellEditorEvtHandler
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // wxGridCellEditorEvtHandler
  // ----------------------------------------------------------------------------
@@ -1049,6 +1161,20 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
      }
  }
  
      }
  }
  
+// ----------------------------------------------------------------------------
+// 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
  // ============================================================================
  // ============================================================================
  // renderer classes
  // ============================================================================
@@ -1061,7 +1187,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
                                const wxRect& rect,
                                wxGridCellAttr& attr,
                                wxDC& dc,
                                const wxRect& rect,
-                              int row, int col,
+                              int WXUNUSED(row), int WXUNUSED(col),
                                bool isSelected)
  {
      dc.SetBackgroundMode( wxSOLID );
                                bool isSelected)
  {
      dc.SetBackgroundMode( wxSOLID );
@@ -1079,15 +1205,6 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
      dc.DrawRectangle(rect);
  }
  
      dc.DrawRectangle(rect);
  }
  
-void wxGridCellRenderer::SetParameters(const wxString& WXUNUSED(params))
-{
-    // nothing to do
-}
-
-wxGridCellRenderer::~wxGridCellRenderer()
-{
-}
-
  // ----------------------------------------------------------------------------
  // wxGridCellStringRenderer
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // wxGridCellStringRenderer
  // ----------------------------------------------------------------------------
@@ -1216,6 +1333,16 @@ wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
      SetPrecision(precision);
  }
  
      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();
  wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
  {
      wxGridTableBase *table = grid.GetTable();
@@ -1348,11 +1475,7 @@ wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
  // FIXME these checkbox size calculations are really ugly...
  
  // between checkmark and box
  // FIXME these checkbox size calculations are really ugly...
  
  // between checkmark and box
-#ifdef __WXGTK__
-    static const wxCoord wxGRID_CHECKMARK_MARGIN = 4;
-#else
-    static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
-#endif
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
  
  wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
                                             wxGridCellAttr& WXUNUSED(attr),
  
  wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
                                             wxGridCellAttr& WXUNUSED(attr),
@@ -1367,7 +1490,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
          wxCoord checkSize = 0;
          wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
          wxSize size = checkbox->GetBestSize();
          wxCoord checkSize = 0;
          wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
          wxSize size = checkbox->GetBestSize();
-        checkSize = size.y + wxGRID_CHECKMARK_MARGIN;
+        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
  
          // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
  #if defined(__WXGTK__) || defined(__WXMOTIF__)
  
          // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
  #if defined(__WXGTK__) || defined(__WXMOTIF__)
@@ -1403,22 +1526,11 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
      }
  
      // draw a border around checkmark
      }
  
      // draw a border around checkmark
-    wxRect rectMark;
-    rectMark.x = rect.x + rect.width/2 - size.x/2;
-    rectMark.y = rect.y + rect.height/2 - size.y/2;
-    rectMark.width = size.x;
-    rectMark.height = size.y;
-
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectMark);
-
-    rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-
-#ifdef __WXMSW__
-    // looks nicer under MSW
-    rectMark.x++;
-#endif // MSW
+    wxRect rectBorder;
+    rectBorder.x = rect.x + rect.width/2 - size.x/2;
+    rectBorder.y = rect.y + rect.height/2 - size.y/2;
+    rectBorder.width = size.x;
+    rectBorder.height = size.y;
  
      bool value;
      if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
  
      bool value;
      if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
@@ -1428,9 +1540,23 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
  
      if ( value )
      {
  
      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);
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -1580,8 +1706,8 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons
              editor->IncRef();
      }
  
              editor->IncRef();
      }
  
-    if ( grid )                   // get renderer for the data type
-        editor =  grid->GetDefaultEditorForCell(row, col);
+    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
  
      if ( !editor )
          // if we still don't have one then use the grid default
@@ -1746,8 +1872,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);
@@ -1755,17 +1881,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);
          }
      }
  }
          }
      }
  }
@@ -1907,7 +2035,7 @@ void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
      wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
  
      // is it already registered?
      wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
  
      // is it already registered?
-    int loc = FindDataType(typeName);
+    int loc = FindRegisteredDataType(typeName);
      if ( loc != wxNOT_FOUND )
      {
          delete m_typeinfo[loc];
      if ( loc != wxNOT_FOUND )
      {
          delete m_typeinfo[loc];
@@ -1919,18 +2047,106 @@ void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
      }
  }
  
      }
  }
  
+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 wxGridTypeRegistry::FindDataType(const wxString& typeName)
  {
-    int found = -1;
+    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;
+        }
  
  
-    for (size_t i=0; i<m_typeinfo.Count(); i++) {
-        if (typeName == m_typeinfo[i]->m_typeName) {
-            found = i;
-            break;
+        // 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 found;
+    return index;
  }
  
  wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
  }
  
  wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
@@ -2047,7 +2263,8 @@ void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
      }
  }
  
      }
  }
  
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
  {
      wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
                      "but your derived table class does not override this function") );
  {
      wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
                      "but your derived table class does not override this function") );
@@ -2055,7 +2272,7 @@ bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
      return FALSE;
  }
  
      return FALSE;
  }
  
-bool wxGridTableBase::AppendRows( size_t numRows )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
  {
      wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
                      "but your derived table class does not override this function"));
  {
      wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
                      "but your derived table class does not override this function"));
@@ -2063,7 +2280,8 @@ bool wxGridTableBase::AppendRows( size_t numRows )
      return FALSE;
  }
  
      return FALSE;
  }
  
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
  {
      wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
                      "but your derived table class does not override this function"));
  {
      wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
                      "but your derived table class does not override this function"));
@@ -2071,7 +2289,8 @@ bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
      return FALSE;
  }
  
      return FALSE;
  }
  
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
  {
      wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
                    "but your derived table class does not override this function"));
  {
      wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
                    "but your derived table class does not override this function"));
@@ -2079,7 +2298,7 @@ bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
      return FALSE;
  }
  
      return FALSE;
  }
  
-bool wxGridTableBase::AppendCols( size_t numCols )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
  {
      wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
                     "but your derived table class does not override this function"));
  {
      wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
                     "but your derived table class does not override this function"));
@@ -2087,7 +2306,8 @@ bool wxGridTableBase::AppendCols( size_t numCols )
      return FALSE;
  }
  
      return FALSE;
  }
  
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
  {
      wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
                      "but your derived table class does not override this function"));
  {
      wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
                      "but your derived table class does not override this function"));
@@ -2254,12 +2474,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();
@@ -2269,7 +2489,7 @@ long wxGridStringTable::GetNumberCols()
  
  wxString wxGridStringTable::GetValue( int row, int col )
  {
  
  wxString wxGridStringTable::GetValue( int row, int col )
  {
-    wxASSERT_MSG( (row < GetNumberCols()) && (col < GetNumberCols()),
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
                    _T("invalid row or column index in wxGridStringTable") );
  
      return m_data[row][col];
                    _T("invalid row or column index in wxGridStringTable") );
  
      return m_data[row][col];
@@ -2277,7 +2497,7 @@ wxString wxGridStringTable::GetValue( int row, int col )
  
  void wxGridStringTable::SetValue( int row, int col, const wxString& value )
  {
  
  void wxGridStringTable::SetValue( int row, int col, const wxString& value )
  {
-    wxASSERT_MSG( (row < GetNumberCols()) && (col < GetNumberCols()),
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
                    _T("invalid row or column index in wxGridStringTable") );
  
      m_data[row][col] = value;
                    _T("invalid row or column index in wxGridStringTable") );
  
      m_data[row][col] = value;
@@ -2285,7 +2505,7 @@ void wxGridStringTable::SetValue( int row, int col, const wxString& value )
  
  bool wxGridStringTable::IsEmptyCell( int row, int col )
  {
  
  bool wxGridStringTable::IsEmptyCell( int row, int col )
  {
-    wxASSERT_MSG( (row < GetNumberCols()) && (col < GetNumberCols()),
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
                    _T("invalid row or column index in wxGridStringTable") );
  
      return (m_data[row][col] == wxEmptyString);
                    _T("invalid row or column index in wxGridStringTable") );
  
      return (m_data[row][col] == wxEmptyString);
@@ -2625,7 +2845,7 @@ wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
      m_owner = parent;
  }
  
      m_owner = parent;
  }
  
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
      wxPaintDC dc(this);
  
  {
      wxPaintDC dc(this);
  
@@ -2678,7 +2898,7 @@ wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
      m_owner = parent;
  }
  
      m_owner = parent;
  }
  
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
  {
      wxPaintDC dc(this);
  
  {
      wxPaintDC dc(this);
  
@@ -2832,7 +3052,7 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event )
  }
  
  
  }
  
  
-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
  {
  }
  
  {
  }
  
@@ -2880,6 +3100,7 @@ wxGrid::~wxGrid()
          delete m_table;
  
      delete m_typeRegistry;
          delete m_table;
  
      delete m_typeRegistry;
+    delete m_selection;
  }
  
  
  }
  
  
@@ -2890,7 +3111,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;
@@ -2918,22 +3138,9 @@ 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;
  
-    // data type registration: register all standard data types
-    // TODO: may be allow the app to selectively disable some of them?
+    // create the type registry
      m_typeRegistry = new wxGridTypeRegistry;
      m_typeRegistry = new wxGridTypeRegistry;
-    RegisterDataType(wxGRID_VALUE_STRING,
-                     new wxGridCellStringRenderer,
-                     new wxGridCellTextEditor);
-    RegisterDataType(wxGRID_VALUE_BOOL,
-                     new wxGridCellBoolRenderer,
-                     new wxGridCellBoolEditor);
-    RegisterDataType(wxGRID_VALUE_NUMBER,
-                     new wxGridCellNumberRenderer,
-                     new wxGridCellNumberEditor);
-    RegisterDataType(wxGRID_VALUE_FLOAT,
-                     new wxGridCellFloatRenderer,
-                     new wxGridCellFloatEditor);
-
+    m_selection = 0;
      // subwindow components that make up the wxGrid
      m_cornerLabelWin = new wxGridCornerLabelWindow( this,
                                                      -1,
      // subwindow components that make up the wxGrid
      m_cornerLabelWin = new wxGridCornerLabelWindow( this,
                                                      -1,
@@ -2961,7 +3168,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 )
      {
@@ -2977,13 +3185,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 )
      {
@@ -2992,6 +3211,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;
      }
@@ -3005,6 +3225,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;
      }
  
@@ -3077,8 +3298,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);
  
@@ -3600,10 +3821,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 ) )
+                    if ( (row = YToRow( y )) >= 0 )
                      {
                      {
-                        SelectRow( row, TRUE );
+                        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
@@ -3640,7 +3864,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);
              }
          }
@@ -3767,10 +4007,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 ) )
+                    if ( (col = XToCol( x )) >= 0 )
                      {
                      {
-                        SelectCol( col, TRUE );
+                        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
@@ -3807,7 +4050,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);
              }
          }
@@ -4043,20 +4301,29 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
  
              if ( coords != wxGridNoCellCoords )
              {
  
              if ( coords != wxGridNoCellCoords )
              {
-                if ( !IsSelection() )
+                if ( event.ControlDown() )
                  {
                  {
-                    SelectBlock( coords, coords );
+                    if ( m_selectingKeyboard == wxGridNoCellCoords)
+                        m_selectingKeyboard = coords;
+                    SelectBlock ( m_selectingKeyboard, coords );
                  }
                  else
                  {
                  }
                  else
                  {
-                    SelectBlock( m_currentCellCoords, coords );
+                    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.
                  }
              }
          }
                  }
              }
          }
@@ -4068,7 +4335,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
  
              wxClientDC dc( m_gridWin );
              PrepareDC( dc );
  
              wxClientDC dc( m_gridWin );
              PrepareDC( dc );
-            y = wxMax( y, GetRowTop(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 )
              {
@@ -4118,9 +4386,18 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
      //
      if ( event.LeftDown() && coords != wxGridNoCellCoords )
      {
      //
      if ( event.LeftDown() && coords != wxGridNoCellCoords )
      {
+        if ( !event.ShiftDown() && !event.ControlDown() )
+            ClearSelection();
          if ( event.ShiftDown() )
          {
          if ( event.ShiftDown() )
          {
-            SelectBlock( m_currentCellCoords, coords );
+            m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                      m_currentCellCoords.GetCol(),
+                                      coords.GetRow(),
+                                      coords.GetCol(),
+                                      event.ControlDown(),
+                                      event.ShiftDown(),
+                                      event.AltDown(),
+                                      event.MetaDown() );
          }
          else if ( XToEdgeOfCol(x) < 0  &&
                    YToEdgeOfRow(y) < 0 )
          }
          else if ( XToEdgeOfCol(x) < 0  &&
                    YToEdgeOfRow(y) < 0 )
@@ -4153,7 +4430,20 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                  }
                  else
                  {
                  }
                  else
                  {
-                    SetCurrentCell( coords );
+                    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;
                  }
              }
                      m_waitForSlowClick = TRUE;
                  }
              }
@@ -4183,14 +4473,24 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
      {
          if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
          {
      {
          if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
          {
-            if ( IsSelection() )
+            if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
              {
                  if (m_winCapture)
                  {
                      m_winCapture->ReleaseMouse();
                      m_winCapture = NULL;
                  }
              {
                  if (m_winCapture)
                  {
                      m_winCapture->ReleaseMouse();
                      m_winCapture = NULL;
                  }
-                SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event );
+                m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                          m_selectingTopLeft.GetCol(),
+                                          m_selectingBottomRight.GetRow(),
+                                          m_selectingBottomRight.GetCol(),
+                                          event.ControlDown(),
+                                          event.ShiftDown(),
+                                          event.AltDown(),
+                                          event.MetaDown() );
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
              }
  
              // Show the edit control, if it has been hidden for
              }
  
              // Show the edit control, if it has been hidden for
@@ -4473,7 +4773,7 @@ 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();
          }
  
@@ -4509,7 +4809,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;
      }
@@ -4541,7 +4840,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;
          }
@@ -4580,7 +4879,7 @@ 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();
          }
  
@@ -4616,7 +4915,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;
      }
@@ -4647,7 +4945,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;
          }
@@ -4686,11 +4984,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(),
@@ -4705,6 +5005,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(),
@@ -4747,15 +5048,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);
-        ShowCellEditControl();
-    }
-
-    m_displayed = TRUE;
  }
  
  
  }
  
  
@@ -4763,7 +5055,7 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
  // the grid view is resized... then the size event is skipped to allow
  // the box sizers to handle everything
  //
  // the grid view is resized... then the size event is skipped to allow
  // the box sizers to handle everything
  //
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) )
  {
      CalcWindowSizes();
      CalcDimensions();
  {
      CalcWindowSizes();
      CalcDimensions();
@@ -4790,56 +5082,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;
  
@@ -4850,15 +5155,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:
@@ -4894,9 +5203,19 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                  break;
  
              case WXK_SPACE:
                  break;
  
              case WXK_SPACE:
+                if ( event.ControlDown() )
+                {
+                    m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+                                                      m_currentCellCoords.GetCol(),
+                                                      event.ControlDown(),
+                                                      event.ShiftDown(),
+                                                      event.AltDown(),
+                                                      event.MetaDown() );
+                    break;
+                }
                  if ( !IsEditable() )
                  {
                  if ( !IsEditable() )
                  {
-                    MoveCursorRight();
+                    MoveCursorRight( FALSE );
                      break;
                  }
                  // Otherwise fall through to default
                      break;
                  }
                  // Otherwise fall through to default
@@ -4904,10 +5223,15 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
              default:
                  // alphanumeric keys or F2 (special key just for this) enable
                  // the cell edit control
              default:
                  // alphanumeric keys or F2 (special key just for this) enable
                  // the cell edit control
+                // On just Shift/Control I get values for event.KeyCode()
+                // that are outside the range where isalnum's behaviour is
+                // well defined, so do an additional sanity check.
                  if ( !(event.AltDown() ||
                         event.MetaDown() ||
                         event.ControlDown()) &&
                  if ( !(event.AltDown() ||
                         event.MetaDown() ||
                         event.ControlDown()) &&
-                     (isalnum(event.KeyCode()) || event.KeyCode() == WXK_F2) &&
+                     ((isalnum((int)event.KeyCode()) &&
+                       (event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
+                      event.KeyCode() == WXK_F2) &&
                       !IsCellEditControlEnabled() &&
                       CanEnableCellControl() )
                  {
                       !IsCellEditControlEnabled() &&
                       CanEnableCellControl() )
                  {
@@ -4933,21 +5257,13 @@ 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();
          DisableCellEditControl();
      {
          HideCellEditControl();
          DisableCellEditControl();
@@ -4963,22 +5279,23 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
  
      m_currentCellCoords = coords;
  
  
      m_currentCellCoords = coords;
  
-    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
  }
  
  
  }
  
  
@@ -5181,6 +5498,15 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
  
  void wxGrid::DrawHighlight(wxDC& dc)
  {
  
  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
      if ( IsCellEditControlEnabled() )
      {
          // don't show highlight when the edit control is shown
@@ -5207,7 +5533,7 @@ void wxGrid::DrawHighlight(wxDC& dc)
  // This is used to redraw all grid lines e.g. when the grid line colour
  // has been changed
  //
  // This is used to redraw all grid lines e.g. when the grid line colour
  // has been changed
  //
-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
  {
      if ( !m_gridLinesEnabled ||
           !m_numRows ||
  {
      if ( !m_gridLinesEnabled ||
           !m_numRows ||
@@ -5437,7 +5763,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
  
          for ( size_t i = 0;  i < lines.GetCount();  i++ )
          {
  
          for ( size_t i = 0;  i < lines.GetCount();  i++ )
          {
-            dc.DrawText( lines[i], (long)x, (long)y );
+            dc.DrawText( lines[i], (int)x, (int)y );
              y += lineHeight;
          }
      }
              y += lineHeight;
          }
      }
@@ -5903,17 +6229,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;
      }
  
@@ -5921,19 +6258,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;
      }
  
@@ -5941,17 +6287,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;
      }
  
@@ -5959,17 +6316,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;
      }
  
@@ -6037,7 +6405,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  &&
@@ -6084,15 +6452,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  &&
@@ -6139,7 +6515,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;
      }
@@ -6147,7 +6532,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  &&
@@ -6194,7 +6579,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;
      }
@@ -6202,7 +6596,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  &&
@@ -6249,7 +6643,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;
      }
@@ -6923,7 +7326,7 @@ wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
  wxGridCellEditor*
  wxGrid::GetDefaultEditorForType(const wxString& typeName) const
  {
  wxGridCellEditor*
  wxGrid::GetDefaultEditorForType(const wxString& typeName) const
  {
-    int index = m_typeRegistry->FindDataType(typeName);
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
      if ( index == wxNOT_FOUND )
      {
          wxFAIL_MSG(wxT("Unknown data type name"));
      if ( index == wxNOT_FOUND )
      {
          wxFAIL_MSG(wxT("Unknown data type name"));
@@ -6937,11 +7340,7 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const
  wxGridCellRenderer*
  wxGrid::GetDefaultRendererForType(const wxString& typeName) const
  {
  wxGridCellRenderer*
  wxGrid::GetDefaultRendererForType(const wxString& typeName) const
  {
-    // the first part of the typename is the "real" type, anything after ':'
-    // are the parameters for the renderer
-    wxString type = typeName.BeforeFirst(_T(':'));
-
-    int index = m_typeRegistry->FindDataType(type);
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
      if ( index == wxNOT_FOUND )
      {
          wxFAIL_MSG(wxT("Unknown data type name"));
      if ( index == wxNOT_FOUND )
      {
          wxFAIL_MSG(wxT("Unknown data type name"));
@@ -6949,12 +7348,7 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const
          return NULL;
      }
  
          return NULL;
      }
  
-    wxGridCellRenderer *renderer = m_typeRegistry->GetRenderer(index);
-
-    // do it even if there are no parameters to reset them to defaults
-    renderer->SetParameters(typeName.AfterFirst(_T(':')));
-
-    return renderer;
+    return m_typeRegistry->GetRenderer(index);
  }
  
  
  }
  
  
@@ -7080,7 +7474,9 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
  {
      wxClientDC dc(m_gridWin);
  
  {
      wxClientDC dc(m_gridWin);
  
-    int row, col;
+    // init both of them to avoid compiler warnings, even if weo nly need one
+    int row = -1,
+        col = -1;
      if ( column )
          col = colOrRow;
      else
      if ( column )
          col = colOrRow;
      else
@@ -7115,8 +7511,12 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
      // now also compare with the column label extent
      wxCoord w, h;
      dc.SetFont( GetLabelFont() );
      // now also compare with the column label extent
      wxCoord w, h;
      dc.SetFont( GetLabelFont() );
-    dc.GetTextExtent( column ? GetColLabelValue(col)
-                             : GetRowLabelValue(row), &w, &h );
+
+    if ( column )
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    else
+        dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
+
      extent = column ? w : h;
      if ( extent > extentMax )
      {
      extent = column ? w : h;
      if ( extent > extentMax )
      {
@@ -7131,8 +7531,11 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
      }
      else
      {
      }
      else
      {
-        // leave some space around text
-        extentMax += 10;
+        if ( column )
+        {
+            // leave some space around text
+            extentMax += 10;
+        }
      }
  
      if ( column )
      }
  
      if ( column )
@@ -7203,6 +7606,12 @@ void wxGrid::Fit()
      AutoSize();
  }
  
      AutoSize();
  }
  
+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+
  // ----------------------------------------------------------------------------
  // cell value accessor functions
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // cell value accessor functions
  // ----------------------------------------------------------------------------
@@ -7236,167 +7645,19 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
  
  void wxGrid::SelectRow( int row, bool addToSelected )
  {
  
  void wxGrid::SelectRow( int row, bool addToSelected )
  {
-    wxRect r;
-
-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
-
-        int     i;
-
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
-        if ( oldTop > row )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
-        }
-
-        if ( oldLeft > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
-
-            m_selectedTopLeft.SetCol( 0 );
-        }
-
-        if ( oldBottom < row )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( row );
-        }
-
-        if ( oldRight < m_numCols - 1 )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
-                                                            oldRight + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetCol( m_numCols - 1 );
-        }
-
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-    else
-    {
-        r = SelectionToDeviceRect();
+    if ( IsSelection() && !addToSelected )
          ClearSelection();
          ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
  
  
-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
-    }
-
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
-
-    GetEventHandler()->ProcessEvent(gridEvt);
+    m_selection->SelectRow( row );
  }
  
  
  void wxGrid::SelectCol( int col, bool addToSelected )
  {
  }
  
  
  void wxGrid::SelectCol( int col, bool addToSelected )
  {
-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
-        int     i;
-
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
-        if ( oldLeft > col )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldLeft - 1 ) );
-            m_selectedTopLeft.SetCol( col );
-        }
-
-        if ( oldTop  > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            oldRight ) );
-            m_selectedTopLeft.SetRow( 0 );
-        }
-
-        if ( oldRight < col )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            col            ) );
-            m_selectedBottomRight.SetCol( col );
-        }
-
-        if ( oldBottom < m_numRows - 1 )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            oldRight ) );
-            m_selectedBottomRight.SetRow( m_numRows - 1 );
-        }
-
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-    else
-    {
-        wxRect r;
-
-        r = SelectionToDeviceRect();
+    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 );
-    }
-
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
  
  
-    GetEventHandler()->ProcessEvent(gridEvt);
+    m_selection->SelectCol( col );
  }
  
  
  }
  
  
@@ -7404,7 +7665,17 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
  {
      int temp;
      wxGridCellCoords updateTopLeft, updateBottomRight;
  {
      int temp;
      wxGridCellCoords updateTopLeft, updateBottomRight;
-
+    
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+    {
+        leftCol = 0;
+        rightCol = GetNumberCols() - 1;
+    }
+    else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+    {
+        topRow = 0;
+        bottomRow = GetNumberRows() - 1;
+    }
      if ( topRow > bottomRow )
      {
          temp = topRow;
      if ( topRow > bottomRow )
      {
          temp = topRow;
@@ -7422,8 +7693,8 @@ 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
      {
          // Compute two optimal update rectangles:
          // Either one rectangle is a real subset of the
@@ -7437,10 +7708,10 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
          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)
@@ -7510,8 +7781,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++ )
@@ -7519,34 +7790,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();
  }
  
  
  }
  
  
@@ -7605,7 +7878,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 )
  {
@@ -7613,6 +7886,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;
@@ -7646,11 +7920,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;
@@ -7661,4 +7937,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
  
  
  #endif // ifndef wxUSE_NEW_GRID
  
  
  #endif // ifndef wxUSE_NEW_GRID
-