]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/grid.cpp
-fix for a bug in parsing tag's properties with common suffixes
[wxWidgets.git] / src / generic / grid.cpp
index e67268205c801769a1066beaca21f0af122f9462..4957e2a4618a59bb2085da3e1561ab59e636b12d 100644 (file)
@@ -21,7 +21,7 @@
     #pragma implementation "grid.h"
 #endif
 
     #pragma implementation "grid.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
+// For compilers that support precompilatixon, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
     #include "wx/checkbox.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
     #include "wx/checkbox.h"
+    #include "wx/combobox.h"
+    #include "wx/valtext.h"
 #endif
 
 #endif
 
-// this include needs to be outside precomp for BCC
 #include "wx/textfile.h"
 #include "wx/textfile.h"
+#include "wx/spinctrl.h"
+#include "wx/tokenzr.h"
 
 #include "wx/grid.h"
 
 #include "wx/grid.h"
+#include "wx/generic/gridsel.h"
+
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
+#else
+    #define WXUNUSED_MOTIF(identifier)  identifier
+#endif
+
+#if defined(__WXGTK__)
+    #define WXUNUSED_GTK(identifier)    WXUNUSED(identifier)
+#else
+    #define WXUNUSED_GTK(identifier)    identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
 
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
 
 struct wxGridCellWithAttr
 {
 
 struct wxGridCellWithAttr
 {
@@ -70,13 +89,33 @@ struct wxGridCellWithAttr
     wxGridCellAttr  *attr;
 };
 
     wxGridCellAttr  *attr;
 };
 
-WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
 
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
 
 #include "wx/arrimpl.cpp"
 
 WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
 WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -93,7 +132,9 @@ private:
 
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
@@ -112,7 +153,9 @@ private:
 
     void OnPaint( wxPaintEvent &event );
     void OnMouseEvent( wxMouseEvent& event );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
@@ -130,7 +173,9 @@ private:
     wxGrid *m_owner;
 
     void OnMouseEvent( wxMouseEvent& event );
     wxGrid *m_owner;
 
     void OnMouseEvent( wxMouseEvent& event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& event );
     void OnKeyDown( wxKeyEvent& event );
+    void OnKeyUp( wxKeyEvent& );
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
@@ -161,8 +206,10 @@ private:
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );
+    void OnMouseWheel( wxMouseEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );
     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );
+    void OnKeyUp( wxKeyEvent& );
     void OnEraseBackground( wxEraseEvent& );
 
 
     void OnEraseBackground( wxEraseEvent& );
 
 
@@ -253,14 +300,19 @@ public:
 // data structures used for the data type registry
 // ----------------------------------------------------------------------------
 
 // data structures used for the data type registry
 // ----------------------------------------------------------------------------
 
-struct wxGridDataTypeInfo {
+struct wxGridDataTypeInfo
+{
     wxGridDataTypeInfo(const wxString& typeName,
                        wxGridCellRenderer* renderer,
                        wxGridCellEditor* editor)
         : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
         { }
 
     wxGridDataTypeInfo(const wxString& typeName,
                        wxGridCellRenderer* renderer,
                        wxGridCellEditor* editor)
         : m_typeName(typeName), m_renderer(renderer), m_editor(editor)
         { }
 
-    ~wxGridDataTypeInfo() { delete m_renderer; delete m_editor; }
+    ~wxGridDataTypeInfo()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
 
     wxString            m_typeName;
     wxGridCellRenderer* m_renderer;
 
     wxString            m_typeName;
     wxGridCellRenderer* m_renderer;
@@ -268,16 +320,31 @@ struct wxGridDataTypeInfo {
 };
 
 
 };
 
 
-WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
 
 
 
 
-class WXDLLEXPORT wxGridTypeRegistry {
+class WXDLLEXPORT wxGridTypeRegistry
+{
 public:
 public:
+  wxGridTypeRegistry() {}
     ~wxGridTypeRegistry();
     ~wxGridTypeRegistry();
+
     void RegisterDataType(const wxString& typeName,
                      wxGridCellRenderer* renderer,
                      wxGridCellEditor* editor);
     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);
 
@@ -285,9 +352,6 @@ private:
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
-
-
-
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
@@ -314,8 +378,15 @@ wxGridCellCoords wxGridNoCellCoords( -1, -1 );
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size
 wxRect           wxGridNoCellRect( -1, -1, -1, -1 );
 
 // scroll line size
-// TODO: fixed so far - make configurable later (and also different for x/y)
-static const size_t GRID_SCROLL_LINE = 10;
+// TODO: this doesn't work at all, grid cells have different sizes and approx
+//       calculations don't work as because of the size mismatch scrollbars
+//       sometimes fail to be shown when they should be or vice versa
+//
+//       The scroll bars may be a little flakey once in a while, but that is
+//       surely much less horrible than having scroll lines of only 1!!!
+//       -- Robin
+static const size_t GRID_SCROLL_LINE = 15;  // 1;
+
 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)
 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)
@@ -365,6 +436,8 @@ void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {
 {
     if (m_control)
     {
+        m_control->PopEventHandler(TRUE /* delete it*/);
+
         m_control->Destroy();
         m_control = NULL;
     }
         m_control->Destroy();
         m_control = NULL;
     }
@@ -421,7 +494,7 @@ void wxGridCellEditor::SetSize(const wxRect& rect)
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 {
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
-    m_control->SetSize(rect);
+    m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 }
 
 void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
@@ -429,6 +502,11 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 
+bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    // accept the simple key presses, not anything with Ctrl/Alt/Meta
+    return !(event.ControlDown() || event.AltDown());
+}
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 {
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 {
@@ -445,6 +523,7 @@ void wxGridCellEditor::StartingClick()
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
+    m_maxChars = 0;
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
@@ -454,10 +533,13 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
-                               , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
+                               , wxTE_PROCESS_TAB | wxTE_MULTILINE |
+                                 wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
 #endif
                               );
 
 #endif
                               );
 
+    // TODO: use m_maxChars
+
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
@@ -479,16 +561,32 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
     // unix
     //
 #if defined(__WXGTK__)
     // unix
     //
 #if defined(__WXGTK__)
-    rect.Inflate(rect.x ? 1 : 0, rect.y ? 1 : 0);
+    if (rect.x != 0)
+    {
+        rect.x += 1;
+        rect.y += 1;
+        rect.width -= 1;
+        rect.height -= 1;
+    }
 #else // !GTK
 #else // !GTK
-    int extra = row && col ? 2 : 1;
+    int extra_x = ( rect.x > 2 )? 2 : 1;
+
+// MB: treat MSW separately here otherwise the caret doesn't show
+// when the editor is in the first row.
+#if defined(__WXMSW__)
+    int extra_y = 2;
+#else
+    int extra_y = ( rect.y > 2 )? 2 : 1;
+#endif // MSW
+
 #if defined(__WXMOTIF__)
 #if defined(__WXMOTIF__)
-    extra *= 2;
+    extra_x *= 2;
+    extra_y *= 2;
 #endif
 #endif
-    rect.SetLeft( wxMax(0, rect.x - extra) );
-    rect.SetTop( wxMax(0, rect.y - extra) );
-    rect.SetRight( rect.GetRight() + 2*extra );
-    rect.SetBottom( rect.GetBottom() + 2*extra );
+    rect.SetLeft( wxMax(0, rect.x - extra_x) );
+    rect.SetTop( wxMax(0, rect.y - extra_y) );
+    rect.SetRight( rect.GetRight() + 2*extra_x );
+    rect.SetBottom( rect.GetBottom() + 2*extra_y );
 #endif // GTK/!GTK
 
     wxGridCellEditor::SetSize(rect);
 #endif // GTK/!GTK
 
     wxGridCellEditor::SetSize(rect);
@@ -500,13 +598,18 @@ void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
                  wxT("The wxGridCellEditor must be Created first!"));
 
     m_startValue = grid->GetTable()->GetValue(row, col);
-    Text()->SetValue(m_startValue);
+
+    DoBeginEdit(m_startValue);
+}
+
+void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
     Text()->SetFocus();
 }
 
     Text()->SetInsertionPointEnd();
     Text()->SetFocus();
 }
 
-
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellTextEditor::EndEdit(int row, int col,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
                                    wxGrid* grid)
 {
     wxASSERT_MSG(m_control,
@@ -532,39 +635,134 @@ void wxGridCellTextEditor::Reset()
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
-    Text()->SetValue(m_startValue);
+    DoReset(m_startValue);
+}
+
+void wxGridCellTextEditor::DoReset(const wxString& startValue)
+{
+    Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
 }
 
     Text()->SetInsertionPointEnd();
 }
 
+bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    {
+        int keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_NUMPAD0:
+            case WXK_NUMPAD1:
+            case WXK_NUMPAD2:
+            case WXK_NUMPAD3:
+            case WXK_NUMPAD4:
+            case WXK_NUMPAD5:
+            case WXK_NUMPAD6:
+            case WXK_NUMPAD7:
+            case WXK_NUMPAD8:
+            case WXK_NUMPAD9:
+            case WXK_MULTIPLY:
+            case WXK_NUMPAD_MULTIPLY:
+            case WXK_ADD:
+            case WXK_NUMPAD_ADD:
+            case WXK_SUBTRACT:
+            case WXK_NUMPAD_SUBTRACT:
+            case WXK_DECIMAL:
+            case WXK_NUMPAD_DECIMAL:
+            case WXK_DIVIDE:
+            case WXK_NUMPAD_DIVIDE:
+                return TRUE;
+
+            default:
+                // accept 8 bit chars too if isprint() agrees
+                if ( (keycode < 255) && (isprint(keycode)) )
+                    return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 {
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 {
-    if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
-    {
-        // insert the key in the control
-        long keycode = event.KeyCode();
-        if ( isprint(keycode) )
-        {
-            // FIXME this is not going to work for non letters...
-            if ( !event.ShiftDown() )
-            {
-                keycode = tolower(keycode);
-            }
+    // we don't check for !HasModifiers() because IsAcceptedKey() did it
+
+    // insert the key in the control
+    wxChar ch;
+    int keycode = event.GetKeyCode();
+    switch ( keycode )
+    {
+        case WXK_NUMPAD0:
+        case WXK_NUMPAD1:
+        case WXK_NUMPAD2:
+        case WXK_NUMPAD3:
+        case WXK_NUMPAD4:
+        case WXK_NUMPAD5:
+        case WXK_NUMPAD6:
+        case WXK_NUMPAD7:
+        case WXK_NUMPAD8:
+        case WXK_NUMPAD9:
+            ch = _T('0') + keycode - WXK_NUMPAD0;
+            break;
 
 
-            Text()->AppendText((wxChar)keycode);
+        case WXK_MULTIPLY:
+        case WXK_NUMPAD_MULTIPLY:
+            ch = _T('*');
+            break;
 
 
-            return;
-        }
+        case WXK_ADD:
+        case WXK_NUMPAD_ADD:
+            ch = _T('+');
+            break;
 
 
+        case WXK_SUBTRACT:
+        case WXK_NUMPAD_SUBTRACT:
+            ch = _T('-');
+            break;
+
+        case WXK_DECIMAL:
+        case WXK_NUMPAD_DECIMAL:
+            ch = _T('.');
+            break;
+
+        case WXK_DIVIDE:
+        case WXK_NUMPAD_DIVIDE:
+            ch = _T('/');
+            break;
+
+        default:
+            if ( keycode < 256 && keycode >= 0 && isprint(keycode) )
+            {
+                // FIXME this is not going to work for non letters...
+                if ( !event.ShiftDown() )
+                {
+                    keycode = tolower(keycode);
+                }
+
+                ch = (wxChar)keycode;
+            }
+            else
+            {
+                ch = _T('\0');
+            }
     }
 
     }
 
-    event.Skip();
+    if ( ch )
+    {
+        Text()->AppendText(ch);
+    }
+    else
+    {
+        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);
@@ -576,174 +774,824 @@ 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;
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// wxGridCellBoolEditor
+// wxGridCellNumberEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGridCellBoolEditor::Create(wxWindow* parent,
-                                  wxWindowID id,
-                                  wxEvtHandler* evtHandler)
+wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max)
 {
 {
-    m_control = new wxCheckBox(parent, id, wxEmptyString,
-                               wxDefaultPosition, wxDefaultSize,
-                               wxNO_BORDER);
-
-    wxGridCellEditor::Create(parent, id, evtHandler);
+    m_min = min;
+    m_max = max;
 }
 
 }
 
-void wxGridCellBoolEditor::SetSize(const wxRect& r)
+void wxGridCellNumberEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
 {
 {
-    // position it in the centre of the rectangle (TODO: support alignment?)
-    wxCoord w, h;
-    m_control->GetSize(&w, &h);
+    if ( HasRange() )
+    {
+        // create a spin ctrl
+        m_control = new wxSpinCtrl(parent, -1, wxEmptyString,
+                                   wxDefaultPosition, wxDefaultSize,
+                                   wxSP_ARROW_KEYS,
+                                   m_min, m_max);
 
 
-    // the checkbox without label still has some space to the right in wxGTK,
-    // so shift it to the right
-#ifdef __WXGTK__
-    w -= 8;
-#endif // GTK
+        wxGridCellEditor::Create(parent, id, evtHandler);
+    }
+    else
+    {
+        // just a text control
+        wxGridCellTextEditor::Create(parent, id, evtHandler);
 
 
-    m_control->Move(r.x + r.width/2 - w/2, r.y + r.height/2 - h/2);
+#if wxUSE_VALIDATORS
+        Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+    }
 }
 
 }
 
-void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
+void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
 {
-    m_control->Show(show);
-
-    if ( show )
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {
     {
-        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
-        CBox()->SetBackgroundColour(colBg);
+        m_valueOld = table->GetValueAsLong(row, col);
+    }
+    else
+    {
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToLong(&m_valueOld))
+        {
+            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+            return;
+        }
     }
     }
-}
-
-void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
 
 
-    if (grid->GetTable()->CanGetValueAs(row, col, wxT("bool")))
-        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+    if ( HasRange() )
+    {
+        Spin()->SetValue((int)m_valueOld);
+        Spin()->SetFocus();
+    }
     else
     else
-        m_startValue = !!grid->GetTable()->GetValue(row, col);
-    CBox()->SetValue(m_startValue);
-    CBox()->SetFocus();
+    {
+        DoBeginEdit(GetString());
+    }
 }
 
 }
 
-bool wxGridCellBoolEditor::EndEdit(int row, int col,
-                                   bool saveValue,
-                                   wxGrid* grid)
+bool wxGridCellNumberEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
 {
 {
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
+    bool changed;
+    long value;
 
 
-    bool changed = FALSE;
-    bool value = CBox()->GetValue();
-    if ( value != m_startValue )
-        changed = TRUE;
+    if ( HasRange() )
+    {
+        value = Spin()->GetValue();
+        changed = value != m_valueOld;
+    }
+    else
+    {
+        changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld);
+    }
 
     if ( changed )
     {
 
     if ( changed )
     {
-        if (grid->GetTable()->CanGetValueAs(row, col, wxT("bool")))
-            grid->GetTable()->SetValueAsBool(row, col, value);
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
+            grid->GetTable()->SetValueAsLong(row, col, value);
         else
         else
-            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+            grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%ld"), value));
     }
 
     return changed;
 }
 
     }
 
     return changed;
 }
 
-void wxGridCellBoolEditor::Reset()
-{
-    wxASSERT_MSG(m_control,
-                 wxT("The wxGridCellEditor must be Created first!"));
-
-    CBox()->SetValue(m_startValue);
-}
-
-void wxGridCellBoolEditor::StartingClick()
+void wxGridCellNumberEditor::Reset()
 {
 {
-    CBox()->SetValue(!CBox()->GetValue());
+    if ( HasRange() )
+    {
+        Spin()->SetValue((int)m_valueOld);
+    }
+    else
+    {
+        DoReset(GetString());
+    }
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellEditorEvtHandler
-// ----------------------------------------------------------------------------
-
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event)
 {
 {
-    switch ( event.KeyCode() )
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
     {
     {
-        case WXK_ESCAPE:
-            m_editor->Reset();
-            m_grid->DisableCellEditControl();
-            break;
+        int keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_NUMPAD0:
+            case WXK_NUMPAD1:
+            case WXK_NUMPAD2:
+            case WXK_NUMPAD3:
+            case WXK_NUMPAD4:
+            case WXK_NUMPAD5:
+            case WXK_NUMPAD6:
+            case WXK_NUMPAD7:
+            case WXK_NUMPAD8:
+            case WXK_NUMPAD9:
+            case WXK_ADD:
+            case WXK_NUMPAD_ADD:
+            case WXK_SUBTRACT:
+            case WXK_NUMPAD_SUBTRACT:
+            case WXK_UP:
+            case WXK_DOWN:
+                return TRUE;
 
 
-        case WXK_TAB:
-            event.Skip( m_grid->ProcessEvent( event ) );
-            break;
+            default:
+                if ( (keycode < 128) && isdigit(keycode) )
+                    return TRUE;
+        }
+    }
 
 
-        case WXK_RETURN:
-            if (!m_grid->ProcessEvent(event))
-                m_editor->HandleReturn(event);
-            break;
+    return FALSE;
+}
 
 
+void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
+{
+    if ( !HasRange() )
+    {
+        int keycode = (int) event.KeyCode();
+        if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
+        {
+            wxGridCellTextEditor::StartingKey(event);
 
 
-        default:
-            event.Skip();
+            // skip Skip() below
+            return;
+        }
     }
     }
+
+    event.Skip();
 }
 
 }
 
-void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+void wxGridCellNumberEditor::SetParameters(const wxString& params)
 {
 {
-    switch ( event.KeyCode() )
+    if ( !params )
     {
     {
-        case WXK_ESCAPE:
-        case WXK_TAB:
-        case WXK_RETURN:
-            break;
+        // reset to default
+        m_min =
+        m_max = -1;
+    }
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_min = (int)tmp;
 
 
-        default:
-            event.Skip();
+            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());
     }
 }
 
     }
 }
 
-// ============================================================================
-// renderer classes
-// ============================================================================
-
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// wxGridCellRenderer
+// wxGridCellFloatEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int row, int col,
-                              bool isSelected)
+wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
 {
 {
-    dc.SetBackgroundMode( wxSOLID );
+    m_width = width;
+    m_precision = precision;
+}
 
 
-    if ( isSelected )
+void wxGridCellFloatEditor::Create(wxWindow* parent,
+                                   wxWindowID id,
+                                   wxEvtHandler* evtHandler)
+{
+    wxGridCellTextEditor::Create(parent, id, evtHandler);
+
+#if wxUSE_VALIDATORS
+    Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+#endif // wxUSE_VALIDATORS
+}
+
+void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    // first get the value
+    wxGridTableBase *table = grid->GetTable();
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
     {
-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+        m_valueOld = table->GetValueAsDouble(row, col);
     }
     else
     {
     }
     else
     {
-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToDouble(&m_valueOld))
+        {
+            wxFAIL_MSG( _T("this cell doesn't have float value") );
+            return;
+        }
     }
 
     }
 
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle(rect);
+    DoBeginEdit(GetString());
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxGridCellStringRenderer
-// ----------------------------------------------------------------------------
+bool wxGridCellFloatEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    double value;
+    if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) )
+    {
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
+            grid->GetTable()->SetValueAsDouble(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%f"), value));
 
 
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
-                                    wxGridCellAttr& attr,
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+void wxGridCellFloatEditor::Reset()
+{
+    DoReset(GetString());
+}
+
+void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
+{
+    int keycode = (int)event.KeyCode();
+    if ( isdigit(keycode) ||
+         keycode == '+' || keycode == '-' || keycode == '.' )
+    {
+        wxGridCellTextEditor::StartingKey(event);
+
+        // skip Skip() below
+        return;
+    }
+
+    event.Skip();
+}
+
+void wxGridCellFloatEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // reset to default
+        m_width =
+        m_precision = -1;
+    }
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_width = (int)tmp;
+
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_precision = (int)tmp;
+
+                // skip the error message below
+                return;
+            }
+        }
+
+        wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
+    }
+}
+
+wxString wxGridCellFloatEditor::GetString() const
+{
+    wxString fmt;
+    if ( m_width == -1 )
+    {
+        // default width/precision
+        fmt = _T("%g");
+    }
+    else if ( m_precision == -1 )
+    {
+        // default precision
+        fmt.Printf(_T("%%%d.g"), m_width);
+    }
+    else
+    {
+        fmt.Printf(_T("%%%d.%dg"), m_width, m_precision);
+    }
+
+    return wxString::Format(fmt, m_valueOld);
+}
+
+bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    {
+        int keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_NUMPAD0:
+            case WXK_NUMPAD1:
+            case WXK_NUMPAD2:
+            case WXK_NUMPAD3:
+            case WXK_NUMPAD4:
+            case WXK_NUMPAD5:
+            case WXK_NUMPAD6:
+            case WXK_NUMPAD7:
+            case WXK_NUMPAD8:
+            case WXK_NUMPAD9:
+            case WXK_ADD:
+            case WXK_NUMPAD_ADD:
+            case WXK_SUBTRACT:
+            case WXK_NUMPAD_SUBTRACT:
+            case WXK_DECIMAL:
+            case WXK_NUMPAD_DECIMAL:
+                return TRUE;
+
+            default:
+                // additionally accept 'e' as in '1e+6'
+                if ( (keycode < 128) &&
+                     (isdigit(keycode) || tolower(keycode) == 'e') )
+                    return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellBoolEditor
+// ----------------------------------------------------------------------------
+
+void wxGridCellBoolEditor::Create(wxWindow* parent,
+                                  wxWindowID id,
+                                  wxEvtHandler* evtHandler)
+{
+    m_control = new wxCheckBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               wxNO_BORDER);
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
+
+void wxGridCellBoolEditor::SetSize(const wxRect& r)
+{
+    bool resize = FALSE;
+    wxSize size = m_control->GetSize();
+    wxCoord minSize = wxMin(r.width, r.height);
+
+    // check if the checkbox is not too big/small for this cell
+    wxSize sizeBest = m_control->GetBestSize();
+    if ( !(size == sizeBest) )
+    {
+        // reset to default size if it had been made smaller
+        size = sizeBest;
+
+        resize = TRUE;
+    }
+
+    if ( size.x >= minSize || size.y >= minSize )
+    {
+        // leave 1 pixel margin
+        size.x = size.y = minSize - 2;
+
+        resize = TRUE;
+    }
+
+    if ( resize )
+    {
+        m_control->SetSize(size);
+    }
+
+    // position it in the centre of the rectangle (TODO: support alignment?)
+
+#if defined(__WXGTK__) || defined (__WXMOTIF__)
+    // the checkbox without label still has some space to the right in wxGTK,
+    // so shift it to the right
+    size.x -= 8;
+#elif defined(__WXMSW__)
+    // here too, but in other way
+    size.x += 1;
+    size.y -= 2;
+#endif
+
+    m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);
+}
+
+void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
+{
+    m_control->Show(show);
+
+    if ( show )
+    {
+        wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY;
+        CBox()->SetBackgroundColour(colBg);
+    }
+}
+
+void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+        m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+    else
+    {
+        wxString cellval( grid->GetTable()->GetValue(row, col) );
+        m_startValue = !( !cellval || (cellval == "0") );
+    }
+    CBox()->SetValue(m_startValue);
+    CBox()->SetFocus();
+}
+
+bool wxGridCellBoolEditor::EndEdit(int row, int col,
+                                   wxGrid* grid)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    bool changed = FALSE;
+    bool value = CBox()->GetValue();
+    if ( value != m_startValue )
+        changed = TRUE;
+
+    if ( changed )
+    {
+        if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+            grid->GetTable()->SetValueAsBool(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+    }
+
+    return changed;
+}
+
+void wxGridCellBoolEditor::Reset()
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    CBox()->SetValue(m_startValue);
+}
+
+void wxGridCellBoolEditor::StartingClick()
+{
+    CBox()->SetValue(!CBox()->GetValue());
+}
+
+bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+    if ( wxGridCellEditor::IsAcceptedKey(event) )
+    {
+        int keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_MULTIPLY:
+            case WXK_NUMPAD_MULTIPLY:
+            case WXK_ADD:
+            case WXK_NUMPAD_ADD:
+            case WXK_SUBTRACT:
+            case WXK_NUMPAD_SUBTRACT:
+            case WXK_SPACE:
+            case '+':
+            case '-':
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+                                               const wxString choices[],
+                                               bool allowOthers)
+                      : m_allowOthers(allowOthers)
+{
+    if ( count )
+    {
+        m_choices.Alloc(count);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add(choices[n]);
+        }
+    }
+}
+
+wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
+{
+    wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
+    editor->m_allowOthers = m_allowOthers;
+    editor->m_choices = m_choices;
+
+    return editor;
+}
+
+void wxGridCellChoiceEditor::Create(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler)
+{
+    size_t count = m_choices.GetCount();
+    wxString *choices = new wxString[count];
+    for ( size_t n = 0; n < count; n++ )
+    {
+        choices[n] = m_choices[n];
+    }
+
+    m_control = new wxComboBox(parent, id, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               count, choices,
+                               m_allowOthers ? 0 : wxCB_READONLY);
+
+    delete [] choices;
+
+    wxGridCellEditor::Create(parent, id, evtHandler);
+}
+
+void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
+                                             wxGridCellAttr * attr)
+{
+    // as we fill the entire client area, don't do anything here to minimize
+    // flicker
+
+    // TODO: It doesn't actually fill the client area since the height of a
+    // combo always defaults to the standard...  Until someone has time to
+    // figure out the right rectangle to paint, just do it the normal way...
+    wxGridCellEditor::PaintBackground(rectCell, attr);
+}
+
+void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
+{
+    wxASSERT_MSG(m_control,
+                 wxT("The wxGridCellEditor must be Created first!"));
+
+    m_startValue = grid->GetTable()->GetValue(row, col);
+
+    Combo()->SetValue(m_startValue);
+    size_t count = m_choices.GetCount();
+    for (size_t i=0; i<count; i++)
+    {
+        if (m_startValue == m_choices[i])
+        {
+            Combo()->SetSelection(i);
+            break;
+        }
+    }
+    Combo()->SetInsertionPointEnd();
+    Combo()->SetFocus();
+}
+
+bool wxGridCellChoiceEditor::EndEdit(int row, int col,
+                                     wxGrid* grid)
+{
+    wxString value = Combo()->GetValue();
+    bool changed = value != m_startValue;
+
+    if ( changed )
+        grid->GetTable()->SetValue(row, col, value);
+
+    m_startValue = wxEmptyString;
+    Combo()->SetValue(m_startValue);
+
+    return changed;
+}
+
+void wxGridCellChoiceEditor::Reset()
+{
+    Combo()->SetValue(m_startValue);
+    Combo()->SetInsertionPointEnd();
+}
+
+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // what can we do?
+        return;
+    }
+
+    m_choices.Empty();
+
+    wxStringTokenizer tk(params, _T(','));
+    while ( tk.HasMoreTokens() )
+    {
+        m_choices.Add(tk.GetNextToken());
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditorEvtHandler
+// ----------------------------------------------------------------------------
+
+void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+{
+    switch ( event.KeyCode() )
+    {
+        case WXK_ESCAPE:
+            m_editor->Reset();
+            m_grid->DisableCellEditControl();
+            break;
+
+        case WXK_TAB:
+            m_grid->GetEventHandler()->ProcessEvent( event );
+            break;
+
+        case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
+            if (!m_grid->GetEventHandler()->ProcessEvent(event))
+                m_editor->HandleReturn(event);
+            break;
+
+
+        default:
+            event.Skip();
+    }
+}
+
+void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+{
+    switch ( event.KeyCode() )
+    {
+        case WXK_ESCAPE:
+        case WXK_TAB:
+        case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
+            break;
+
+        default:
+            event.Skip();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
+
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
+{
+    // nothing to do
+}
+
+wxGridCellWorker::~wxGridCellWorker()
+{
+}
+
+// ============================================================================
+// renderer classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellRenderer::Draw(wxGrid& grid,
+                              wxGridCellAttr& attr,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int WXUNUSED(row), int WXUNUSED(col),
+                              bool isSelected)
+{
+    dc.SetBackgroundMode( wxSOLID );
+
+    if ( isSelected )
+    {
+        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+    }
+    else
+    {
+        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+    }
+
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle(rect);
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellStringRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
+                                                     wxGridCellAttr& attr,
+                                                     wxDC& dc,
+                                                     bool isSelected)
+{
+    dc.SetBackgroundMode( wxTRANSPARENT );
+
+    // TODO some special colours for attr.IsReadOnly() case?
+
+    if ( isSelected )
+    {
+        dc.SetTextBackground( grid.GetSelectionBackground() );
+        dc.SetTextForeground( grid.GetSelectionForeground() );
+    }
+    else
+    {
+        dc.SetTextBackground( attr.GetBackgroundColour() );
+        dc.SetTextForeground( attr.GetTextColour() );
+    }
+
+    dc.SetFont( attr.GetFont() );
+}
+
+wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+                                               wxDC& dc,
+                                               const wxString& text)
+{
+    wxCoord x = 0, y = 0, max_x = 0;
+    dc.SetFont(attr.GetFont());
+    wxStringTokenizer tk(text, _T('\n'));
+    while ( tk.HasMoreTokens() )
+    {
+        dc.GetTextExtent(tk.GetNextToken(), &x, &y);
+        max_x = wxMax(max_x, x);
+    }
+
+    y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines.
+
+    return wxSize(max_x, y);
+}
+
+wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, grid.GetCellValue(row, col));
+}
+
+void wxGridCellStringRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
+                                    wxDC& dc,
+                                    const wxRect& rectCell,
+                                    int row, int col,
+                                    bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+
+    // now we only have to draw the text
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
+
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
+
+    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                           rect, hAlign, vAlign);
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellNumberRenderer
+// ----------------------------------------------------------------------------
+
+wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+    {
+        text.Printf(_T("%ld"), table->GetValueAsLong(row, col));
+    }
+    else
+    {
+        text = table->GetValue(row, col);
+    }
+
+    return text;
+}
+
+void wxGridCellNumberRenderer::Draw(wxGrid& grid,
+                                    wxGridCellAttr& attr,
                                     wxDC& dc,
                                     const wxRect& rectCell,
                                     int row, int col,
                                     wxDC& dc,
                                     const wxRect& rectCell,
                                     int row, int col,
@@ -751,98 +1599,339 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
 
-    // now we only have to draw the text
-    dc.SetBackgroundMode( wxTRANSPARENT );
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
 
 
-    // TODO some special colours for attr.IsReadOnly() case?
+    // draw the text right aligned by default
+    int hAlign, vAlign;
+    attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxALIGN_RIGHT;
 
 
-    if ( isSelected )
+    wxRect rect = rectCell;
+    rect.Inflate(-1);
+
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
+
+wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid,
+                                             wxGridCellAttr& attr,
+                                             wxDC& dc,
+                                             int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellFloatRenderer
+// ----------------------------------------------------------------------------
+
+wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
+{
+    SetWidth(width);
+    SetPrecision(precision);
+}
+
+wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
+{
+    wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer;
+    renderer->m_width = m_width;
+    renderer->m_precision = m_precision;
+    renderer->m_format = m_format;
+
+    return renderer;
+}
+
+wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+{
+    wxGridTableBase *table = grid.GetTable();
+
+    bool hasDouble;
+    double val;
+    wxString text;
+    if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
     {
-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
+        val = table->GetValueAsDouble(row, col);
+        hasDouble = TRUE;
     }
     else
     {
     }
     else
     {
-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
+        text = table->GetValue(row, col);
+        hasDouble = text.ToDouble(&val);
     }
     }
-    dc.SetFont( attr.GetFont() );
 
 
+    if ( hasDouble )
+    {
+        if ( !m_format )
+        {
+            if ( m_width == -1 )
+            {
+                if ( m_precision == -1 )
+                {
+                // default width/precision
+                m_format = _T("%f");
+            }
+                else
+                {
+                    m_format.Printf(_T("%%.%df"), m_precision);
+                }
+            }
+            else if ( m_precision == -1 )
+            {
+                // default precision
+                m_format.Printf(_T("%%%d.f"), m_width);
+            }
+            else
+            {
+                m_format.Printf(_T("%%%d.%df"), m_width, m_precision);
+            }
+        }
+
+        text.Printf(m_format, val);
+
+    }
+    //else: text already contains the string
+
+    return text;
+}
+
+void wxGridCellFloatRenderer::Draw(wxGrid& grid,
+                                   wxGridCellAttr& attr,
+                                   wxDC& dc,
+                                   const wxRect& rectCell,
+                                   int row, int col,
+                                   bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+
+    SetTextColoursAndFont(grid, attr, dc, isSelected);
+
+    // draw the text right aligned by default
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
+    hAlign = wxALIGN_RIGHT;
 
     wxRect rect = rectCell;
 
     wxRect rect = rectCell;
-    rect.x++;
-    rect.y++;
-    rect.width -= 2;
-    rect.height -= 2;
+    rect.Inflate(-1);
 
 
-    grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
-                           rect, hAlign, vAlign);
+    grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign);
+}
+
+wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
+                                            wxGridCellAttr& attr,
+                                            wxDC& dc,
+                                            int row, int col)
+{
+    return DoGetBestSize(attr, dc, GetString(grid, row, col));
+}
+
+void wxGridCellFloatRenderer::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // reset to defaults
+        SetWidth(-1);
+        SetPrecision(-1);
+    }
+    else
+    {
+        wxString tmp = params.BeforeFirst(_T(','));
+        if ( !!tmp )
+        {
+            long width;
+            if ( tmp.ToLong(&width) )
+            {
+                SetWidth((int)width);
+            }
+            else
+            {
+                wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
+            }
+
+        }
+                tmp = params.AfterFirst(_T(','));
+                if ( !!tmp )
+                {
+                    long precision;
+            if ( tmp.ToLong(&precision) )
+                    {
+                SetPrecision((int)precision);
+                    }
+                    else
+                    {
+                wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
+        }
+
+        }
+    }
 }
 
 }
 
+
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 
-void wxGridCellBoolRenderer::Draw(wxGrid& grid,
-                                  wxGridCellAttr& attr,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int row, int col,
-                                  bool isSelected)
-{
-    wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
+wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
 
 
-    // between checkmark and box
-    static const wxCoord margin = 4;
+// FIXME these checkbox size calculations are really ugly...
 
 
-    // get checkbox size
-    static wxCoord s_checkSize = 0;
-    if ( s_checkSize == 0 )
+// between checkmark and box
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
+
+wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
+                                           wxGridCellAttr& WXUNUSED(attr),
+                                           wxDC& WXUNUSED(dc),
+                                           int WXUNUSED(row),
+                                           int WXUNUSED(col))
+{
+    // compute it only once (no locks for MT safeness in GUI thread...)
+    if ( !ms_sizeCheckMark.x )
     {
     {
-        // compute it only once (no locks for MT safeness in GUI thread...)
+        // get checkbox size
+        wxCoord checkSize = 0;
         wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
         wxSize size = checkbox->GetBestSize();
         wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
         wxSize size = checkbox->GetBestSize();
-        s_checkSize = size.y + margin;
+        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
 
 
-        // FIXME wxGTK::wxCheckBox::GetBestSize() is really weird...
-#ifdef __WXGTK__
-        s_checkSize -= size.y / 2;
+        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+        checkSize -= size.y / 2;
 #endif
 
         delete checkbox;
 #endif
 
         delete checkbox;
+
+        ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
     }
 
     }
 
+    return ms_sizeCheckMark;
+}
+
+void wxGridCellBoolRenderer::Draw(wxGrid& grid,
+                                  wxGridCellAttr& attr,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int row, int col,
+                                  bool isSelected)
+{
+    wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
+
     // draw a check mark in the centre (ignoring alignment - TODO)
     // draw a check mark in the centre (ignoring alignment - TODO)
-    wxRect rectMark;
-    rectMark.x = rect.x + rect.width/2 - s_checkSize/2;
-    rectMark.y = rect.y + rect.height/2 - s_checkSize/2;
-    rectMark.width = rectMark.height = s_checkSize;
+    wxSize size = GetBestSize(grid, attr, dc, row, col);
 
 
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectMark);
+    // don't draw outside the cell
+    wxCoord minSize = wxMin(rect.width, rect.height);
+    if ( size.x >= minSize || size.y >= minSize )
+    {
+        // and even leave (at least) 1 pixel margin
+        size.x = size.y = minSize - 2;
+    }
 
 
-    rectMark.Inflate(-margin);
+    // draw a border around checkmark
+    wxRect rectBorder;
+    rectBorder.x = rect.x + rect.width/2 - size.x/2;
+    rectBorder.y = rect.y + rect.height/2 - size.y/2;
+    rectBorder.width = size.x;
+    rectBorder.height = size.y;
 
     bool value;
 
     bool value;
-    if (grid.GetTable()->CanGetValueAs(row, col, wxT("bool")))
+    if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
         value = grid.GetTable()->GetValueAsBool(row, col);
     else
         value = grid.GetTable()->GetValueAsBool(row, col);
     else
-        value = !!grid.GetTable()->GetValue(row, col);
+    {
+        wxString cellval( grid.GetTable()->GetValue(row, col) );
+        value = !( !cellval || (cellval == "0") );
+    }
 
     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);
 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellAttr
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxGridCellAttr
 // ----------------------------------------------------------------------------
 
+wxGridCellAttr *wxGridCellAttr::Clone() const
+{
+    wxGridCellAttr *attr = new wxGridCellAttr;
+    if ( HasTextColour() )
+        attr->SetTextColour(GetTextColour());
+    if ( HasBackgroundColour() )
+        attr->SetBackgroundColour(GetBackgroundColour());
+    if ( HasFont() )
+        attr->SetFont(GetFont());
+    if ( HasAlignment() )
+        attr->SetAlignment(m_hAlign, m_vAlign);
+
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
+    }
+    if ( m_editor )
+    {
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
+
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
+
+    attr->SetKind( m_attrkind );
+
+    attr->SetDefAttr(m_defGridAttr);
+
+    return attr;
+}
+
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
+{
+    if ( !HasTextColour() && mergefrom->HasTextColour() )
+        SetTextColour(mergefrom->GetTextColour());
+    if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() )
+        SetBackgroundColour(mergefrom->GetBackgroundColour());
+    if ( !HasFont() && mergefrom->HasFont() )
+        SetFont(mergefrom->GetFont());
+    if ( !!HasAlignment() && mergefrom->HasAlignment() ){
+        int hAlign, vAlign;
+        mergefrom->GetAlignment( &hAlign, &vAlign);
+        SetAlignment(hAlign, vAlign);
+    }
+
+    // Directly access member functions as GetRender/Editor don't just return
+    // m_renderer/m_editor
+    //
+    // Maybe add support for merge of Render and Editor?
+    if (!HasRenderer() && mergefrom->HasRenderer() )
+    {   
+        m_renderer = mergefrom->m_renderer;
+        m_renderer->IncRef();
+    }
+    if ( !HasEditor() && mergefrom->HasEditor() )
+    {
+        m_editor =  mergefrom->m_editor;
+        m_editor->IncRef();
+    }
+    if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
+        SetReadOnly(mergefrom->IsReadOnly());
+
+    SetDefAttr(mergefrom->m_defGridAttr);
+}
+
 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())
 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())
@@ -906,40 +1995,68 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 
 
 // GetRenderer and GetEditor use a slightly different decision path about
 
 
 // GetRenderer and GetEditor use a slightly different decision path about
-// which to use.  If a non-default attr object has one then it is used,
-// otherwise the default editor or renderer passed in is used.  It should be
-// the default for the data type of the cell.  If it is NULL (because the
-// table has a type that the grid does not have in its registry,) then the
-// grid's default editor or renderer is used.
-
-wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGridCellRenderer* def) const
-{
-    if ((m_defGridAttr != this || def == NULL) && HasRenderer())
-        return m_renderer;
-    else if (def)
-        return def;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetRenderer(NULL);
-    else
+// which attribute to use.  If a non-default attr object has one then it is
+// used, otherwise the default editor or renderer is fetched from the grid and
+// used.  It should be the default for the data type of the cell.  If it is
+// NULL (because the table has a type that the grid does not have in its
+// registry,) then the grid's default editor or renderer is used.
+
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
+{
+    wxGridCellRenderer* renderer = NULL;
+
+    if ( m_defGridAttr != this || grid == NULL )
+    {
+        renderer = m_renderer;      // use local attribute
+        if ( renderer )
+            renderer->IncRef();
+    }
+
+    if ( !renderer && grid )        // get renderer for the data type
+    {
+        // GetDefaultRendererForCell() will do IncRef() for us
+        renderer = grid->GetDefaultRendererForCell(row, col);
+    }
+
+    if ( !renderer )
+    {
+        // if we still don't have one then use the grid default
+        // (no need for IncRef() here neither)
+        renderer = m_defGridAttr->GetRenderer(NULL,0,0);
+    }
+
+    if ( !renderer)
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return NULL;
     }
     }
+
+    return renderer;
 }
 
 }
 
-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGridCellEditor* def) const
+wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
 {
 {
-    if ((m_defGridAttr != this || def == NULL) && HasEditor())
-        return m_editor;
-    else if (def)
-        return def;
-    else if (m_defGridAttr != this)
-        return m_defGridAttr->GetEditor(NULL);
-    else
+    wxGridCellEditor* editor = NULL;
+
+    if ( m_defGridAttr != this || grid == NULL )
+    {
+        editor = m_editor;      // use local attribute
+        if ( editor )
+            editor->IncRef();
+    }
+
+    if ( !editor && grid )                   // get renderer for the data type
+        editor = grid->GetDefaultEditorForCell(row, col);
+
+    if ( !editor )
+        // if we still don't have one then use the grid default
+        editor = m_defGridAttr->GetEditor(NULL,0,0);
+
+    if ( !editor )
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
     {
         wxFAIL_MSG(wxT("Missing default cell attribute"));
-        return NULL;
     }
     }
+
+    return editor;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -1093,8 +2210,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);
@@ -1102,17 +2219,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);
         }
     }
 }
         }
     }
 }
@@ -1165,28 +2284,77 @@ void wxGridCellAttrProvider::InitData()
     m_data = new wxGridCellAttrProviderData;
 }
 
     m_data = new wxGridCellAttrProviderData;
 }
 
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+                                                wxGridCellAttr::wxAttrKind  kind ) const
 {
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
     if ( m_data )
     {
 {
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
     if ( m_data )
     {
-        // first look for the attribute of this specific cell
-        attr = m_data->m_cellAttrs.GetAttr(row, col);
-
-        if ( !attr )
+        switch(kind)
         {
         {
-            // then look for the col attr (col attributes are more common than
-            // the row ones, hence they have priority)
-            attr = m_data->m_colAttrs.GetAttr(col);
-        }
-
-        if ( !attr )
+            case (wxGridCellAttr::Any):
+                //Get cached merge attributes.
+                // Currenlty not used as no cache implemented as not mutiable
+                // attr = m_data->m_mergeAttr.GetAttr(row, col);
+                if(!attr)
+                {
+                    //Basicaly implement old version.
+                    //Also check merge cache, so we don't have to re-merge every time..
+                    wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL,
+                                   *attrrow = (wxGridCellAttr *)NULL,
+                                   *attrcol = (wxGridCellAttr *)NULL; 
+                
+                    attrcell = m_data->m_cellAttrs.GetAttr(row, col);
+                    attrcol = m_data->m_colAttrs.GetAttr(col);
+                    attrrow = m_data->m_rowAttrs.GetAttr(row);
+
+                    if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){    
+                        // Two or move are non NULL
+                        attr = new wxGridCellAttr;
+                        attr->SetKind(wxGridCellAttr::Merged);
+
+                        //Order important.. 
+                        if(attrcell){
+                            attr->MergeWith(attrcell);
+                            attrcell->DecRef();
+                        }
+                        if(attrcol){
+                            attr->MergeWith(attrcol);
+                            attrcol->DecRef();
+                        }
+                        if(attrrow){
+                            attr->MergeWith(attrrow);
+                            attrrow->DecRef();
+                        }
+                        //store merge attr if cache implemented
+                        //attr->IncRef();
+                        //m_data->m_mergeAttr.SetAttr(attr, row, col);
+                    }
+                    else
         {
         {
-            // finally try the row attributes
+                        // one or none is non null return it or null.
+                        if(attrrow) attr = attrrow;
+                        if(attrcol) attr = attrcol;
+                        if(attrcell) attr = attrcell;                            
+                    }
+                }
+            break;
+            case (wxGridCellAttr::Cell):
+                attr = m_data->m_cellAttrs.GetAttr(row, col);
+            break;
+            case (wxGridCellAttr::Col):
+                 attr = m_data->m_colAttrs.GetAttr(col);
+            break;
+            case (wxGridCellAttr::Row):
             attr = m_data->m_rowAttrs.GetAttr(row);
             attr = m_data->m_rowAttrs.GetAttr(row);
+            break;
+            default:
+                // unused as yet...
+                // (wxGridCellAttr::Default):
+                // (wxGridCellAttr::Merged):
+            break;
         }
     }
         }
     }
-
     return attr;
 }
 
     return attr;
 }
 
@@ -1235,57 +2403,152 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
     }
 }
 
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxGridTypeRegistry
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
+
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+    size_t count = m_typeinfo.Count();
+    for ( size_t i = 0; i < count; i++ )
+        delete m_typeinfo[i];
+}
+
+
+void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
+                                          wxGridCellRenderer* renderer,
+                                          wxGridCellEditor* editor)
+{
+    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+
+    // is it already registered?
+    int loc = FindRegisteredDataType(typeName);
+    if ( loc != wxNOT_FOUND )
+    {
+        delete m_typeinfo[loc];
+        m_typeinfo[loc] = info;
+    }
+    else
+    {
+        m_typeinfo.Add(info);
+    }
+}
+
+int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)
+{
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( typeName == m_typeinfo[i]->m_typeName )
+        {
+            return i;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+{
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+        if ( typeName == wxGRID_VALUE_STRING )
+        {
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_BOOL )
+        {
+            RegisterDataType(wxGRID_VALUE_BOOL,
+                             new wxGridCellBoolRenderer,
+                             new wxGridCellBoolEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_NUMBER )
+        {
+            RegisterDataType(wxGRID_VALUE_NUMBER,
+                             new wxGridCellNumberRenderer,
+                             new wxGridCellNumberEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_FLOAT )
+        {
+            RegisterDataType(wxGRID_VALUE_FLOAT,
+                             new wxGridCellFloatRenderer,
+                             new wxGridCellFloatEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_CHOICE )
+        {
+            RegisterDataType(wxGRID_VALUE_CHOICE,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellChoiceEditor);
+        }
+        else
+        {
+            return wxNOT_FOUND;
+        }
+
+        // we get here only if just added the entry for this type, so return
+        // the last index
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
 
 
-wxGridTypeRegistry::~wxGridTypeRegistry()
+int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
 {
 {
-    for (size_t i=0; i<m_typeinfo.Count(); i++)
-        delete m_typeinfo[i];
-}
+    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();
 
 
-void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
-                                          wxGridCellRenderer* renderer,
-                                          wxGridCellEditor* editor)
-{
-    int loc;
-    wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+        wxGridCellEditor *editor = GetEditor(index);
+        wxGridCellEditor *editorOld = editor;
+        editor = editor->Clone();
+        editorOld->DecRef();
 
 
-    // is it already registered?
-    if ((loc = FindDataType(typeName)) != -1) {
-        delete m_typeinfo[loc];
-        m_typeinfo[loc] = info;
-    }
-    else {
-        m_typeinfo.Add(info);
-    }
-}
+        // do it even if there are no parameters to reset them to defaults
+        wxString params = typeName.AfterFirst(_T(':'));
+        renderer->SetParameters(params);
+        editor->SetParameters(params);
 
 
-int wxGridTypeRegistry::FindDataType(const wxString& typeName)
-{
-    int found = -1;
+        // register the new typename
+        RegisterDataType(typeName, renderer, editor);
 
 
-    for (size_t i=0; i<m_typeinfo.Count(); i++) {
-        if (typeName == m_typeinfo[i]->m_typeName) {
-            found = i;
-            break;
-        }
+        // we just registered it, it's the last one
+        index = m_typeinfo.GetCount() - 1;
     }
 
     }
 
-    return found;
+    return index;
 }
 
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
 }
 
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+    if (renderer)
+        renderer->IncRef();
     return renderer;
 }
 
     return renderer;
 }
 
-wxGridCellEditor*   wxGridTypeRegistry::GetEditor(int index)
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+    if (editor)
+        editor->IncRef();
     return editor;
 }
 
     return editor;
 }
 
@@ -1323,10 +2586,10 @@ bool wxGridTableBase::CanHaveAttributes()
     return TRUE;
 }
 
     return TRUE;
 }
 
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)
 {
     if ( m_attrProvider )
 {
     if ( m_attrProvider )
-        return m_attrProvider->GetAttr(row, col);
+        return m_attrProvider->GetAttr(row, col, kind);
     else
         return (wxGridCellAttr *)NULL;
 }
     else
         return (wxGridCellAttr *)NULL;
 }
@@ -1335,13 +2598,14 @@ void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
 {
     if ( m_attrProvider )
     {
 {
     if ( m_attrProvider )
     {
+        attr->SetKind(wxGridCellAttr::Cell);
         m_attrProvider->SetAttr(attr, row, col);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
         m_attrProvider->SetAttr(attr, row, col);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
@@ -1349,13 +2613,14 @@ void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row)
 {
     if ( m_attrProvider )
     {
 {
     if ( m_attrProvider )
     {
+        attr->SetKind(wxGridCellAttr::Row);
         m_attrProvider->SetRowAttr(attr, row);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
         m_attrProvider->SetRowAttr(attr, row);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
@@ -1363,76 +2628,59 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col)
 {
     if ( m_attrProvider )
     {
 {
     if ( m_attrProvider )
     {
+        attr->SetKind(wxGridCellAttr::Col);
         m_attrProvider->SetColAttr(attr, col);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
         m_attrProvider->SetColAttr(attr, col);
     }
     else
     {
         // as we take ownership of the pointer and don't store it, we must
         // free it now
-        attr->SafeDecRef();
-    }
-}
-
-void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
-{
-    if ( m_attrProvider )
-    {
-        m_attrProvider->UpdateAttrRows( pos, numRows );
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
-void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
 {
 {
-    if ( m_attrProvider )
-    {
-        m_attrProvider->UpdateAttrCols( pos, numCols );
-    }
-}
-
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
-{
-    wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
-                    "but your derived table class does not override this function") );
+    wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
 
     return FALSE;
 }
 
 
     return FALSE;
 }
 
-bool wxGridTableBase::AppendRows( size_t numRows )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
 
     return FALSE;
 }
 
 
     return FALSE;
 }
 
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numRows) )
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
 
     return FALSE;
 }
 
 
     return FALSE;
 }
 
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
-                  "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
 
     return FALSE;
 }
 
 
     return FALSE;
 }
 
-bool wxGridTableBase::AppendCols( size_t numCols )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
 {
 {
-    wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
-                   "but your derived table class does not override this function"));
+    wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
 
     return FALSE;
 }
 
 
     return FALSE;
 }
 
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+                                  size_t WXUNUSED(numCols) )
 {
 {
-    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
-                    "but your derived table class does not override this function"));
+    wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
 
     return FALSE;
 }
 
     return FALSE;
 }
@@ -1475,13 +2723,13 @@ wxString wxGridTableBase::GetColLabelValue( int col )
 
 wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
 {
 
 wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
 {
-    return wxT("string");
+    return wxGRID_VALUE_STRING;
 }
 
 bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
                                      const wxString& typeName )
 {
 }
 
 bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col),
                                      const wxString& typeName )
 {
-    return typeName == wxT("string");
+    return typeName == wxGRID_VALUE_STRING;
 }
 
 bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
 }
 
 bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName )
@@ -1532,7 +2780,6 @@ void  wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
 {
 }
 
 {
 }
 
-
 //////////////////////////////////////////////////////////////////////
 //
 // Message class for the grid table to send requests and notifications
 //////////////////////////////////////////////////////////////////////
 //
 // Message class for the grid table to send requests and notifications
@@ -1597,12 +2844,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();
@@ -1612,26 +2859,28 @@ long wxGridStringTable::GetNumberCols()
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {
-    // TODO: bounds checking
-    //
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
     return m_data[row][col];
 }
 
 void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 {
     return m_data[row][col];
 }
 
 void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 {
-    // TODO: bounds checking
-    //
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
     m_data[row][col] = value;
 }
 
 bool wxGridStringTable::IsEmptyCell( int row, int col )
 {
     m_data[row][col] = value;
 }
 
 bool wxGridStringTable::IsEmptyCell( int row, int col )
 {
-    // TODO: bounds checking
-    //
+    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                  _T("invalid row or column index in wxGridStringTable") );
+
     return (m_data[row][col] == wxEmptyString);
 }
 
     return (m_data[row][col] == wxEmptyString);
 }
 
-
 void wxGridStringTable::Clear()
 {
     int row, col;
 void wxGridStringTable::Clear()
 {
     int row, col;
@@ -1658,7 +2907,8 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     if ( pos >= curNumRows )
     {
 
     if ( pos >= curNumRows )
     {
@@ -1676,7 +2926,6 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
     {
         m_data.Insert( sa, row );
     }
     {
         m_data.Insert( sa, row );
     }
-    UpdateAttrRows( pos, numRows );
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -1695,7 +2944,8 @@ bool wxGridStringTable::AppendRows( size_t numRows )
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     wxArrayString sa;
     if ( curNumCols > 0 )
 
     wxArrayString sa;
     if ( curNumCols > 0 )
@@ -1733,10 +2983,9 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
     if ( pos >= curNumRows )
     {
         wxString errmsg;
     if ( pos >= curNumRows )
     {
         wxString errmsg;
-        errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
-                      "Pos value is invalid for present table with %d rows",
+        errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"),
                       pos, numRows, curNumRows );
                       pos, numRows, curNumRows );
-        wxFAIL_MSG( wxT(errmsg) );
+        wxFAIL_MSG( errmsg );
         return FALSE;
     }
 
         return FALSE;
     }
 
@@ -1756,7 +3005,6 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
             m_data.Remove( pos );
         }
     }
             m_data.Remove( pos );
         }
     }
-    UpdateAttrRows( pos, -((int)numRows) );
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -1775,7 +3023,8 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, col;
 
     size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     if ( pos >= curNumCols )
     {
 
     if ( pos >= curNumCols )
     {
@@ -1789,7 +3038,6 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
             m_data[row].Insert( wxEmptyString, col );
         }
     }
             m_data[row].Insert( wxEmptyString, col );
         }
     }
-    UpdateAttrCols( pos, numCols );
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -1808,14 +3056,15 @@ bool wxGridStringTable::AppendCols( size_t numCols )
     size_t row, n;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, n;
 
     size_t curNumRows = m_data.GetCount();
+#if 0
     if ( !curNumRows )
     {
         // TODO: something better than this ?
         //
     if ( !curNumRows )
     {
         // TODO: something better than this ?
         //
-        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
-                        "Call AppendRows() first") );
+        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
         return FALSE;
     }
         return FALSE;
     }
+#endif
 
     for ( row = 0;  row < curNumRows;  row++ )
     {
 
     for ( row = 0;  row < curNumRows;  row++ )
     {
@@ -1842,15 +3091,15 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
     size_t row, n;
 
     size_t curNumRows = m_data.GetCount();
     size_t row, n;
 
     size_t curNumRows = m_data.GetCount();
-    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+    size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+                          ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     if ( pos >= curNumCols )
     {
         wxString errmsg;
 
     if ( pos >= curNumCols )
     {
         wxString errmsg;
-        errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
-                        "Pos value is invalid for present table with %d cols",
+        errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"),
                         pos, numCols, curNumCols );
                         pos, numCols, curNumCols );
-        wxFAIL_MSG( wxT( errmsg ) );
+        wxFAIL_MSG( errmsg );
         return FALSE;
     }
 
         return FALSE;
     }
 
@@ -1873,7 +3122,6 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
             }
         }
     }
             }
         }
     }
-    UpdateAttrCols( pos, -((int)numCols) );
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,
@@ -1954,19 +3202,21 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
 
 BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
 END_EVENT_TABLE()
 
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 END_EVENT_TABLE()
 
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
 {
     m_owner = parent;
 }
 
 {
     m_owner = parent;
 }
 
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 
@@ -1991,12 +3241,23 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 }
 
 
 }
 
 
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
 }
 
 
@@ -2007,19 +3268,21 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
 
 BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel)
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
 END_EVENT_TABLE()
 
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 END_EVENT_TABLE()
 
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
 {
     m_owner = parent;
 }
 
 {
     m_owner = parent;
 }
 
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 
@@ -2043,13 +3306,23 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
     m_owner->ProcessColLabelMouseEvent( event );
 }
 
     m_owner->ProcessColLabelMouseEvent( event );
 }
 
+void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
 
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
 }
 
 
@@ -2059,15 +3332,17 @@ void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+    EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
     EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
     EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
 END_EVENT_TABLE()
 
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )
 END_EVENT_TABLE()
 
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )
-  : wxWindow( parent, id, pos, size )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }
@@ -2096,12 +3371,22 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 }
 
 
 }
 
 
+void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
 // This seems to be required for wxMotif otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
+void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
 }
 
 
@@ -2112,8 +3397,10 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
 
 BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
     EVT_PAINT( wxGridWindow::OnPaint )
 
 BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
     EVT_PAINT( wxGridWindow::OnPaint )
+    EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
+    EVT_KEY_UP( wxGridWindow::OnKeyUp )
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
@@ -2121,7 +3408,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )
-        : wxPanel( parent, id, pos, size, 0, "grid window" )
+        : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
@@ -2145,6 +3432,7 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
+    m_owner->DrawGridSpace( dc );
     m_owner->DrawHighlight( dc );
 }
 
     m_owner->DrawHighlight( dc );
 }
 
@@ -2162,49 +3450,26 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
     m_owner->ProcessGridCellMouseEvent( event );
 }
 
     m_owner->ProcessGridCellMouseEvent( event );
 }
 
+void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
+{
+    m_owner->GetEventHandler()->ProcessEvent(event);
+}
 
 
-// This seems to be required for wxMotif otherwise the mouse
+// This seems to be required for wxMotif/wxGTK otherwise the mouse
 // cursor must be in the cell edit control to get key events
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
 // cursor must be in the cell edit control to get key events
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 }
 
-// We are trapping erase background events to reduce flicker under MSW
-// and GTK but this can leave junk in the space beyond the last row and
-// col.  So here we paint these spaces if they are visible.
-//
-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
 {
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-
-    int right, bottom;
-    m_owner->CalcUnscrolledPosition( cw, ch, &right, &bottom );
-
-    wxRect rightRect;
-    rightRect = m_owner->CellToRect( 0, m_owner->GetNumberCols()-1 );
-
-    wxRect bottomRect;
-    bottomRect = m_owner->CellToRect( m_owner->GetNumberRows()-1, 0 );
-
-    if ( right > rightRect.GetRight()  ||  bottom > bottomRect.GetBottom() )
-    {
-        int left, top;
-        m_owner->CalcUnscrolledPosition( 0, 0, &left, &top );
-
-        wxClientDC dc( this );
-        m_owner->PrepareDC( dc );
-        dc.SetBrush( wxBrush(m_owner->GetDefaultCellBackgroundColour(), wxSOLID) );
-        dc.SetPen( *wxTRANSPARENT_PEN );
-
-        if ( right > rightRect.GetRight() )
-            dc.DrawRectangle( rightRect.GetRight()+1, top, right - rightRect.GetRight(), ch );
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
 
 
-        if ( bottom > bottomRect.GetBottom() )
-            dc.DrawRectangle( left, bottomRect.GetBottom()+1, cw, bottom - bottomRect.GetBottom() );
-    }
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
+{
 }
 
 
 }
 
 
@@ -2217,6 +3482,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )
     EVT_SIZE( wxGrid::OnSize )
     EVT_KEY_DOWN( wxGrid::OnKeyDown )
     EVT_PAINT( wxGrid::OnPaint )
     EVT_SIZE( wxGrid::OnSize )
     EVT_KEY_DOWN( wxGrid::OnKeyDown )
+    EVT_KEY_UP( wxGrid::OnKeyUp )
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
 END_EVENT_TABLE()
 
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
 END_EVENT_TABLE()
 
@@ -2226,8 +3492,9 @@ wxGrid::wxGrid( wxWindow *parent,
                  const wxSize& size,
                  long style,
                  const wxString& name )
                  const wxSize& size,
                  long style,
                  const wxString& name )
-  : wxScrolledWindow( parent, id, pos, size, style, name ),
-    m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE)
+  : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
+    m_colMinWidths(GRID_HASH_SIZE),
+    m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();
 }
 {
     Create();
 }
@@ -2236,7 +3503,7 @@ wxGrid::wxGrid( wxWindow *parent,
 wxGrid::~wxGrid()
 {
     ClearAttrCache();
 wxGrid::~wxGrid()
 {
     ClearAttrCache();
-    m_defaultCellAttr->SafeDecRef();
+    wxSafeDecRef(m_defaultCellAttr);
 
 #ifdef DEBUG_ATTR_CACHE
     size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
 
 #ifdef DEBUG_ATTR_CACHE
     size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
@@ -2250,6 +3517,7 @@ wxGrid::~wxGrid()
         delete m_table;
 
     delete m_typeRegistry;
         delete m_table;
 
     delete m_typeRegistry;
+    delete m_selection;
 }
 
 
 }
 
 
@@ -2260,7 +3528,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;
@@ -2271,8 +3538,9 @@ void wxGrid::Create()
     m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
 
     // Set default cell attributes
     m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
 
     // Set default cell attributes
+    m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
     m_defaultCellAttr->SetFont(GetFont());
     m_defaultCellAttr->SetFont(GetFont());
-    m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
+    m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
     m_defaultCellAttr->SetBackgroundColour(
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
     m_defaultCellAttr->SetBackgroundColour(
@@ -2288,14 +3556,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
+    // create the type registry
     m_typeRegistry = new wxGridTypeRegistry;
     m_typeRegistry = new wxGridTypeRegistry;
-    RegisterDataType(wxT("string"), new wxGridCellStringRenderer,
-                                    new wxGridCellTextEditor);
-    RegisterDataType(wxT("bool"), new wxGridCellBoolRenderer,
-                                  new wxGridCellBoolEditor);
-
-
+    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,
@@ -2323,29 +3586,38 @@ void wxGrid::Create()
 }
 
 
 }
 
 
-bool wxGrid::CreateGrid( int numRows, int numCols )
+bool wxGrid::CreateGrid( int numRows, int numCols,
+                         wxGrid::wxGridSelectionModes selmode )
 {
 {
-    if ( m_created )
-    {
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
-    }
-    else
-    {
-        m_numRows = numRows;
-        m_numCols = numCols;
+    wxCHECK_MSG( !m_created,
+                 FALSE,
+                 wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
 
 
-        m_table = new wxGridStringTable( m_numRows, m_numCols );
-        m_table->SetView( this );
-        m_ownTable = TRUE;
-        Init();
-        m_created = TRUE;
-    }
+    m_numRows = numRows;
+    m_numCols = numCols;
+
+    m_table = new wxGridStringTable( m_numRows, m_numCols );
+    m_table->SetView( this );
+    m_ownTable = TRUE;
+    m_selection = new wxGridSelection( this, selmode );
+    Init();
+    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 )
     {
@@ -2354,6 +3626,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;
     }
@@ -2366,6 +3639,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
         m_table->SetView( this );
         if (takeOwnership)
             m_ownTable = TRUE;
         m_table->SetView( this );
         if (takeOwnership)
             m_ownTable = TRUE;
+        m_selection = new wxGridSelection( this, selmode );
         Init();
         m_created = TRUE;
     }
         Init();
         m_created = TRUE;
     }
@@ -2376,12 +3650,6 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
 
 void wxGrid::Init()
 {
 
 void wxGrid::Init()
 {
-    if ( m_numRows <= 0 )
-        m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
-
-    if ( m_numCols <= 0 )
-        m_numCols = WXGRID_DEFAULT_NUMBER_COLS;
-
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
@@ -2404,11 +3672,11 @@ void wxGrid::Init()
     m_labelFont = this->GetFont();
     m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
 
     m_labelFont = this->GetFont();
     m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
 
-    m_rowLabelHorizAlign = wxLEFT;
-    m_rowLabelVertAlign  = wxCENTRE;
+    m_rowLabelHorizAlign = wxALIGN_LEFT;
+    m_rowLabelVertAlign  = wxALIGN_CENTRE;
 
 
-    m_colLabelHorizAlign = wxCENTRE;
-    m_colLabelVertAlign  = wxTOP;
+    m_colLabelHorizAlign = wxALIGN_CENTRE;
+    m_colLabelVertAlign  = wxALIGN_TOP;
 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();
 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();
@@ -2421,11 +3689,15 @@ void wxGrid::Init()
 
     m_gridLineColour = wxColour( 128, 128, 255 );
     m_gridLinesEnabled = TRUE;
 
     m_gridLineColour = wxColour( 128, 128, 255 );
     m_gridLinesEnabled = TRUE;
+    m_cellHighlightColour = m_gridLineColour;
+    m_cellHighlightPenWidth = 3;
+    m_cellHighlightROPenWidth = 1;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     m_canDragRowSize = TRUE;
     m_canDragColSize = TRUE;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     m_canDragRowSize = TRUE;
     m_canDragColSize = TRUE;
+    m_canDragGridSize = TRUE;
     m_dragLastPos  = -1;
     m_dragRowOrCol = -1;
     m_isDragging = FALSE;
     m_dragLastPos  = -1;
     m_dragRowOrCol = -1;
     m_isDragging = FALSE;
@@ -2438,8 +3710,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);
 
@@ -2447,6 +3719,11 @@ void wxGrid::Init()
 
     m_inOnKeyDown = FALSE;
     m_batchCount = 0;
 
     m_inOnKeyDown = FALSE;
     m_batchCount = 0;
+
+    m_extraWidth =
+    m_extraHeight = 50;
+
+    CalcDimensions();
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -2531,19 +3808,44 @@ void wxGrid::CalcDimensions()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 
-    if ( m_numRows > 0  &&  m_numCols > 0 )
-    {
-        int right = GetColRight( m_numCols-1 ) + 50;
-        int bottom = GetRowBottom( m_numRows-1 ) + 50;
+    if ( m_colLabelWin->IsShown() )
+        cw -= m_rowLabelWidth;
+    if ( m_rowLabelWin->IsShown() )
+        ch -= m_colLabelHeight;
 
 
-        // TODO: restore the scroll position that we had before sizing
-        //
-        int x, y;
-        GetViewStart( &x, &y );
-        SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
-                       right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
-                       x, y );
+    // grid total size
+    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+    // preserve (more or less) the previous position
+    int x, y;
+    GetViewStart( &x, &y );
+    // maybe we don't need scrollbars at all? and if we do, transform w and h
+    // from pixels into logical units
+    if ( w <= cw )
+    {
+        w = 0; x= 0;
+    }
+    else
+    {
+       w = (w + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+       if ( x >= w )
+           x = w - 1;
+    }
+    if ( h <= ch )
+    {
+       h = 0; y = 0;
+    }
+    else
+    {
+       h = (h + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+       if ( y >= h )
+           y = h - 1;
     }
     }
+
+    // do set scrollbar parameters
+    SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
+                  w, h, x, y, (GetBatchCount() != 0));
 }
 
 
 }
 
 
@@ -2572,7 +3874,9 @@ void wxGrid::CalcWindowSizes()
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;
+    bool result = FALSE;
 
 
+#if 0
     // if we were using the default widths/heights so far, we must change them
     // now
     if ( m_colWidths.IsEmpty() )
     // if we were using the default widths/heights so far, we must change them
     // now
     if ( m_colWidths.IsEmpty() )
@@ -2584,6 +3888,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
     {
         InitRowHeights();
     }
     {
         InitRowHeights();
     }
+#endif
 
     switch ( msg.GetId() )
     {
 
     switch ( msg.GetId() )
     {
@@ -2591,71 +3896,99 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
         {
             size_t pos = msg.GetCommandInt();
             int numRows = msg.GetCommandInt2();
         {
             size_t pos = msg.GetCommandInt();
             int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Insert( m_defaultRowHeight, pos );
-                m_rowBottoms.Insert( 0, pos );
-            }
+
             m_numRows += numRows;
 
             m_numRows += numRows;
 
-            int bottom = 0;
-            if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+            if ( !m_rowHeights.IsEmpty() )
+            {
+                for ( i = 0;  i < numRows;  i++ )
+                {
+                    m_rowHeights.Insert( m_defaultRowHeight, pos );
+                    m_rowBottoms.Insert( 0, pos );
+                }
+
+                int bottom = 0;
+                if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
 
 
-            for ( i = pos;  i < m_numRows;  i++ )
+                for ( i = pos;  i < m_numRows;  i++ )
+                {
+                    bottom += m_rowHeights[i];
+                    m_rowBottoms[i] = bottom;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
             {
             {
-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            m_selection->UpdateRows( pos, numRows );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrRows( pos, numRows );
+
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
             }
             }
-            CalcDimensions();
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
         {
             int numRows = msg.GetCommandInt();
 
         case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
         {
             int numRows = msg.GetCommandInt();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Add( m_defaultRowHeight );
-                m_rowBottoms.Add( 0 );
-            }
-
             int oldNumRows = m_numRows;
             m_numRows += numRows;
 
             int oldNumRows = m_numRows;
             m_numRows += numRows;
 
-            int bottom = 0;
-            if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+            if ( !m_rowHeights.IsEmpty() )
+            {
+                for ( i = 0;  i < numRows;  i++ )
+                {
+                    m_rowHeights.Add( m_defaultRowHeight );
+                    m_rowBottoms.Add( 0 );
+                }
+
+                int bottom = 0;
+                if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
 
 
-            for ( i = oldNumRows;  i < m_numRows;  i++ )
+                for ( i = oldNumRows;  i < m_numRows;  i++ )
+                {
+                    bottom += m_rowHeights[i];
+                    m_rowBottoms[i] = bottom;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            if ( !GetBatchCount() )
             {
             {
-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
             }
             }
-            CalcDimensions();
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
         {
             size_t pos = msg.GetCommandInt();
             int numRows = msg.GetCommandInt2();
 
         case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
         {
             size_t pos = msg.GetCommandInt();
             int numRows = msg.GetCommandInt2();
-            for ( i = 0;  i < numRows;  i++ )
-            {
-                m_rowHeights.Remove( pos );
-                m_rowBottoms.Remove( pos );
-            }
             m_numRows -= numRows;
 
             m_numRows -= numRows;
 
-            if ( !m_numRows )
-            {
-                m_numCols = 0;
-                m_colWidths.Clear();
-                m_colRights.Clear();
-                m_currentCellCoords = wxGridNoCellCoords;
-            }
-            else
+            if ( !m_rowHeights.IsEmpty() )
             {
             {
-                if ( m_currentCellCoords.GetRow() >= m_numRows )
-                    m_currentCellCoords.Set( 0, 0 );
+                for ( i = 0;  i < numRows;  i++ )
+                {
+                    m_rowHeights.Remove( pos );
+                    m_rowBottoms.Remove( pos );
+                }
 
                 int h = 0;
                 for ( i = 0;  i < m_numRows;  i++ )
 
                 int h = 0;
                 for ( i = 0;  i < m_numRows;  i++ )
@@ -2664,82 +3997,134 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     m_rowBottoms[i] = h;
                 }
             }
                     m_rowBottoms[i] = h;
                 }
             }
-
-            CalcDimensions();
+            if ( !m_numRows )
+            {
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetRow() >= m_numRows )
+                    m_currentCellCoords.Set( 0, 0 );
+            }
+            m_selection->UpdateRows( pos, -((int)numRows) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider) {
+                attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+                // No need to touch column attributes, unless we
+                // removed _all_ rows, in this case, we remove
+                // all column attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrRows.
+                if ( !GetNumberRows() )
+                    attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
+#endif
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
 
         case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
         {
             size_t pos = msg.GetCommandInt();
             int numCols = msg.GetCommandInt2();
 
         case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
         {
             size_t pos = msg.GetCommandInt();
             int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Insert( m_defaultColWidth, pos );
-                m_colRights.Insert( 0, pos );
-            }
             m_numCols += numCols;
 
             m_numCols += numCols;
 
-            int right = 0;
-            if ( pos > 0 ) right = m_colRights[pos-1];
+            if ( !m_colWidths.IsEmpty() )
+            {
+                for ( i = 0;  i < numCols;  i++ )
+                {
+                    m_colWidths.Insert( m_defaultColWidth, pos );
+                    m_colRights.Insert( 0, pos );
+                }
+
+                int right = 0;
+                if ( pos > 0 ) right = m_colRights[pos-1];
 
 
-            for ( i = pos;  i < m_numCols;  i++ )
+                for ( i = pos;  i < m_numCols;  i++ )
+                {
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            m_selection->UpdateCols( pos, numCols );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrCols( pos, numCols );
+            if ( !GetBatchCount() )
             {
             {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                CalcDimensions();
+                m_colLabelWin->Refresh();
             }
             }
-            CalcDimensions();
+
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
         {
             int numCols = msg.GetCommandInt();
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
         {
             int numCols = msg.GetCommandInt();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Add( m_defaultColWidth );
-                m_colRights.Add( 0 );
-            }
-
             int oldNumCols = m_numCols;
             m_numCols += numCols;
             int oldNumCols = m_numCols;
             m_numCols += numCols;
+            if ( !m_colWidths.IsEmpty() )
+            {
+                for ( i = 0;  i < numCols;  i++ )
+                {
+                    m_colWidths.Add( m_defaultColWidth );
+                    m_colRights.Add( 0 );
+                }
 
 
-            int right = 0;
-            if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+                int right = 0;
+                if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
 
 
-            for ( i = oldNumCols;  i < m_numCols;  i++ )
+                for ( i = oldNumCols;  i < m_numCols;  i++ )
+                {
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }
+            if ( !GetBatchCount() )
             {
             {
-                right += m_colWidths[i];
-                m_colRights[i] = right;
+                CalcDimensions();
+                m_colLabelWin->Refresh();
             }
             }
-            CalcDimensions();
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
 
         case wxGRIDTABLE_NOTIFY_COLS_DELETED:
         {
             size_t pos = msg.GetCommandInt();
             int numCols = msg.GetCommandInt2();
 
         case wxGRIDTABLE_NOTIFY_COLS_DELETED:
         {
             size_t pos = msg.GetCommandInt();
             int numCols = msg.GetCommandInt2();
-            for ( i = 0;  i < numCols;  i++ )
-            {
-                m_colWidths.Remove( pos );
-                m_colRights.Remove( pos );
-            }
             m_numCols -= numCols;
 
             m_numCols -= numCols;
 
-            if ( !m_numCols )
-            {
-#if 0  // leave the row alone here so that AppendCols will work subsequently
-                m_numRows = 0;
-                m_rowHeights.Clear();
-                m_rowBottoms.Clear();
-#endif
-                m_currentCellCoords = wxGridNoCellCoords;
-            }
-            else
+            if ( !m_colWidths.IsEmpty() )
             {
             {
-                if ( m_currentCellCoords.GetCol() >= m_numCols )
-                    m_currentCellCoords.Set( 0, 0 );
+                for ( i = 0;  i < numCols;  i++ )
+                {
+                    m_colWidths.Remove( pos );
+                    m_colRights.Remove( pos );
+                }
 
                 int w = 0;
                 for ( i = 0;  i < m_numCols;  i++ )
 
                 int w = 0;
                 for ( i = 0;  i < m_numCols;  i++ )
@@ -2748,16 +4133,47 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     m_colRights[i] = w;
                 }
             }
                     m_colRights[i] = w;
                 }
             }
-            CalcDimensions();
+            if ( !m_numCols )
+            {
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetCol() >= m_numCols )
+                  m_currentCellCoords.Set( 0, 0 );
+            }
+            m_selection->UpdateCols( pos, -((int)numCols) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider) {
+                attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+                // No need to touch row attributes, unless we
+                // removed _all_ columns, in this case, we remove
+                // all row attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrCols.
+                if ( !GetNumberCols() )
+                    attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colLabelWin->Refresh();
+            }
         }
         }
-        return TRUE;
+        result = TRUE;
+        break;
     }
 
     }
 
-    return FALSE;
+    if (result && !GetBatchCount() )
+        m_gridWin->Refresh();
+    return result;
 }
 
 
 }
 
 
-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+void wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -2806,7 +4222,7 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
 }
 
 
 }
 
 
-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+void wxGrid::CalcColLabelsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -2855,7 +4271,7 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
 }
 
 
 }
 
 
-void wxGrid::CalcCellsExposed( wxRegion& reg )
+void wxGrid::CalcCellsExposed( const wxRegion& reg )
 {
     wxRegionIterator iter( reg );
     wxRect r;
 {
     wxRegionIterator iter( reg );
     wxRect r;
@@ -2942,7 +4358,9 @@ void wxGrid::ProcessRowLabelMouseEvent( 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 )
                     {
@@ -2954,10 +4372,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
@@ -2994,7 +4415,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);
             }
         }
@@ -3121,10 +4558,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
@@ -3161,7 +4601,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);
             }
         }
@@ -3309,7 +4764,9 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                cursorModes[m_cursorMode], cursorModes[mode]);
 #endif // __WXDEBUG__
 
                cursorModes[m_cursorMode], cursorModes[mode]);
 #endif // __WXDEBUG__
 
-    if ( mode == m_cursorMode )
+    if ( mode == m_cursorMode &&
+         win == m_winCapture &&
+         captureMouse == (m_winCapture != NULL))
         return;
 
     if ( !win )
         return;
 
     if ( !win )
@@ -3382,8 +4839,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         {
             // Hide the edit control, so it
             // won't interfer with drag-shrinking.
         {
             // Hide the edit control, so it
             // won't interfer with drag-shrinking.
-            if ( IsCellEditControlEnabled() )
+            if ( IsCellEditControlShown() )
+            {
                 HideCellEditControl();
                 HideCellEditControl();
+                SaveEditControlValue();
+            }
 
             // Have we captured the mouse yet?
             if (! m_winCapture)
 
             // Have we captured the mouse yet?
             if (! m_winCapture)
@@ -3394,20 +4854,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;
+                    HighlightBlock ( m_selectingKeyboard, coords );
                 }
                 else
                 {
                 }
                 else
                 {
-                    SelectBlock( m_currentCellCoords, coords );
+                    if ( !IsSelection() )
+                    {
+                        HighlightBlock( coords, coords );
+                    }
+                    else
+                    {
+                        HighlightBlock( m_currentCellCoords, coords );
+                    }
                 }
 
                 if (! IsVisible(coords))
                 {
                     MakeCellVisible(coords);
                     // TODO: need to introduce a delay or something here.  The
                 }
 
                 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.
                 }
             }
         }
                 }
             }
         }
@@ -3419,7 +4888,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 )
             {
@@ -3453,201 +4923,244 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     m_isDragging = FALSE;
     m_startDragPos = wxDefaultPosition;
 
     m_isDragging = FALSE;
     m_startDragPos = wxDefaultPosition;
 
-
-    if ( coords != wxGridNoCellCoords )
-    {
-        // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
-        //     immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
-        //     wxGTK
+    // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
+    //     immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
+    //     wxGTK
 #if 0
 #if 0
-        if ( event.Entering() || event.Leaving() )
-        {
-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-            m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
-        }
-        else
+    if ( event.Entering() || event.Leaving() )
+    {
+        ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+        m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+    }
+    else
 #endif // 0
 
 #endif // 0
 
-        // ------------ Left button pressed
-        //
-        if ( event.LeftDown() )
+    // ------------ Left button pressed
+    //
+    if ( event.LeftDown() && coords != wxGridNoCellCoords )
+    {
+        if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+                       coords.GetRow(),
+                       coords.GetCol(),
+                       event ) )
         {
         {
-            DisableCellEditControl();
+            if ( !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 )
             {
-                if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
-                                 coords.GetRow(),
-                                 coords.GetCol(),
-                                 event ) )
+                DisableCellEditControl();
+                MakeCellVisible( coords );
+
+                // if this is the second click on this cell then start
+                // the edit control
+                if ( m_waitForSlowClick &&
+                     (coords == m_currentCellCoords) &&
+                     CanEnableCellControl())
                 {
                 {
-                    MakeCellVisible( coords );
-
-                    // if this is the second click on this cell then start
-                    // the edit control
-                    if ( m_waitForSlowClick &&
-                         (coords == m_currentCellCoords) &&
-                         CanEnableCellControl())
-                    {
-                        EnableCellEditControl();
+                    EnableCellEditControl();
 
 
-                        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                        attr->GetEditor(GetDefaultEditorForCell(coords.GetRow(), coords.GetCol()))->StartingClick();
-                        attr->DecRef();
+                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+                    wxGridCellEditor *editor = attr->GetEditor(this,
+                                                               coords.GetRow(),
+                                                               coords.GetCol());
+                    editor->StartingClick();
+                    editor->DecRef();
+                    attr->DecRef();
 
 
-                        m_waitForSlowClick = FALSE;
+                    m_waitForSlowClick = FALSE;
+                }
+                else
+                {
+                    if ( event.ControlDown() )
+                    {
+                        m_selection->ToggleCellSelection( coords.GetRow(),
+                                                          coords.GetCol(),
+                                                          event.ControlDown(),
+                                                          event.ShiftDown(),
+                                                          event.AltDown(),
+                                                          event.MetaDown() );
+                        m_selectingTopLeft = wxGridNoCellCoords;
+                        m_selectingBottomRight = wxGridNoCellCoords;
+                        m_selectingKeyboard = coords;
                     }
                     else
                     {
                         SetCurrentCell( coords );
                     }
                     else
                     {
                         SetCurrentCell( coords );
-                        m_waitForSlowClick = TRUE;
+                        if ( m_selection->GetSelectionMode()
+                             != wxGrid::wxGridSelectCells)
+                            HighlightBlock( coords, coords );
                     }
                     }
+                    m_waitForSlowClick = TRUE;
                 }
             }
         }
                 }
             }
         }
+    }
 
 
 
 
-        // ------------ Left double click
-        //
-        else if ( event.LeftDClick() )
+    // ------------ Left double click
+    //
+    else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+
+        if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
         {
         {
-            DisableCellEditControl();
-            if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
-            {
-                SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
-                           coords.GetRow(),
-                           coords.GetCol(),
-                           event );
-            }
+            SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+                       coords.GetRow(),
+                       coords.GetCol(),
+                       event );
         }
         }
+    }
 
 
 
 
-        // ------------ Left button released
-        //
-        else if ( event.LeftUp() )
+    // ------------ Left button released
+    //
+    else if ( event.LeftUp() )
+    {
+        if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
         {
-            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
             {
             {
-                if ( IsSelection() )
+                if (m_winCapture)
                 {
                 {
-                    if (m_winCapture)
-                    {
-                        m_winCapture->ReleaseMouse();
-                        m_winCapture = NULL;
-                    }
-                    SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event );
+                    m_winCapture->ReleaseMouse();
+                    m_winCapture = NULL;
                 }
                 }
-
-                // Show the edit control, if it has been hidden for
-                // drag-shrinking.
-                ShowCellEditControl();
+                m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                          m_selectingTopLeft.GetCol(),
+                                          m_selectingBottomRight.GetRow(),
+                                          m_selectingBottomRight.GetCol(),
+                                          event.ControlDown(),
+                                          event.ShiftDown(),
+                                          event.AltDown(),
+                                          event.MetaDown() );
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
             }
             }
-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                DoEndDragResizeRow();
 
 
-                // Note: we are ending the event *after* doing
-                // default processing in this case
-                //
-                SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
-            }
-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                DoEndDragResizeCol();
+            // Show the edit control, if it has been hidden for
+            // drag-shrinking.
+            ShowCellEditControl();
+        }
+        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            DoEndDragResizeRow();
 
 
-                // Note: we are ending the event *after* doing
-                // default processing in this case
-                //
-                SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
-            }
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+        }
+        else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            DoEndDragResizeCol();
 
 
-            m_dragLastPos = -1;
+            // Note: we are ending the event *after* doing
+            // default processing in this case
+            //
+            SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
         }
 
         }
 
+        m_dragLastPos = -1;
+    }
 
 
-        // ------------ Right button down
-        //
-        else if ( event.RightDown() )
+
+    // ------------ Right button down
+    //
+    else if ( event.RightDown() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
+                         coords.GetRow(),
+                         coords.GetCol(),
+                         event ) )
         {
         {
-            DisableCellEditControl();
-            if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
-            {
-                // no default action at the moment
-            }
+            // no default action at the moment
         }
         }
+    }
 
 
 
 
-        // ------------ Right double click
-        //
-        else if ( event.RightDClick() )
+    // ------------ Right double click
+    //
+    else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+    {
+        DisableCellEditControl();
+        if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
+                         coords.GetRow(),
+                         coords.GetCol(),
+                         event ) )
         {
         {
-            DisableCellEditControl();
-            if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
-                             coords.GetRow(),
-                             coords.GetCol(),
-                             event ) )
-            {
-                // no default action at the moment
-            }
+            // no default action at the moment
         }
         }
+    }
+
+    // ------------ Moving and no button action
+    //
+    else if ( event.Moving() && !event.IsButton() )
+    {
+        int dragRow = YToEdgeOfRow( y );
+        int dragCol = XToEdgeOfCol( x );
 
 
-        // ------------ Moving and no button action
+        // Dragging on the corner of a cell to resize in both
+        // directions is not implemented yet...
         //
         //
-        else if ( event.Moving() && !event.IsButton() )
+        if ( dragRow >= 0  &&  dragCol >= 0 )
         {
         {
-            int dragRow = YToEdgeOfRow( y );
-            int dragCol = XToEdgeOfCol( x );
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+            return;
+        }
 
 
-            // Dragging on the corner of a cell to resize in both
-            // directions is not implemented yet...
-            //
-            if ( dragRow >= 0  &&  dragCol >= 0 )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                return;
-            }
+        if ( dragRow >= 0 )
+        {
+            m_dragRowOrCol = dragRow;
 
 
-            if ( dragRow >= 0 )
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
             {
-                m_dragRowOrCol = dragRow;
-
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    if ( CanDragRowSize() )
-                        ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
-                }
-
-                return;
+                if ( CanDragRowSize() && CanDragGridSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
             }
 
             if ( dragCol >= 0 )
             {
                 m_dragRowOrCol = dragCol;
             }
 
             if ( dragCol >= 0 )
             {
                 m_dragRowOrCol = dragCol;
+            }
 
 
-                if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    if ( CanDragColSize() )
-                        ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
-                }
+            return;
+        }
 
 
-                return;
-            }
+        if ( dragCol >= 0 )
+        {
+            m_dragRowOrCol = dragCol;
 
 
-            // Neither on a row or col edge
-            //
-            if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
             {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+                if ( CanDragColSize() && CanDragGridSize() )
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
             }
             }
+
+            return;
+        }
+
+        // Neither on a row or col edge
+        //
+        if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+        {
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
         }
     }
 }
         }
     }
 }
@@ -3668,6 +5181,7 @@ void wxGrid::DoEndDragResizeRow()
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
         HideCellEditControl();
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
         HideCellEditControl();
+        SaveEditControlValue();
 
         int rowTop = GetRowTop(m_dragRowOrCol);
         SetRowSize( m_dragRowOrCol,
 
         int rowTop = GetRowTop(m_dragRowOrCol);
         SetRowSize( m_dragRowOrCol,
@@ -3706,6 +5220,7 @@ void wxGrid::DoEndDragResizeCol()
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
         HideCellEditControl();
         dc.SetLogicalFunction( wxINVERT );
         dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
         HideCellEditControl();
+        SaveEditControlValue();
 
         int colLeft = GetColLeft(m_dragRowOrCol);
         SetColSize( m_dragRowOrCol,
 
         int colLeft = GetColLeft(m_dragRowOrCol);
         SetColSize( m_dragRowOrCol,
@@ -3768,8 +5283,10 @@ void wxGrid::ClearGrid()
 {
     if ( m_table )
     {
 {
     if ( m_table )
     {
+        if (IsCellEditControlEnabled())
+            DisableCellEditControl();
+
         m_table->Clear();
         m_table->Clear();
-        SetEditControlValue();
         if ( !GetBatchCount() ) m_gridWin->Refresh();
     }
 }
         if ( !GetBatchCount() ) m_gridWin->Refresh();
     }
 }
@@ -3790,41 +5307,12 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
-        bool ok = m_table->InsertRows( pos, numRows );
+        return m_table->InsertRows( pos, numRows );
 
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
 
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
-        //
-        if ( ok )
-        {
-            if ( m_numCols == 0 )
-            {
-                m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
-                //
-                // TODO: perhaps instead of appending the default number of cols
-                // we should remember what the last non-zero number of cols was ?
-                //
-            }
-
-            if ( m_currentCellCoords == wxGridNoCellCoords )
-            {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
-            }
-
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-        }
-
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
     }
     }
+    return FALSE;
 }
 
 
 }
 
 
@@ -3838,27 +5326,9 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
         return FALSE;
     }
 
         return FALSE;
     }
 
-    if ( m_table && m_table->AppendRows( numRows ) )
-    {
-        if ( m_currentCellCoords == wxGridNoCellCoords )
-        {
-            // if we have just inserted cols into an empty grid the current
-            // cell will be undefined...
-            //
-            SetCurrentCell( 0, 0 );
-        }
-
-        // the table will have sent the results of the append row
-        // operation to this view object as a grid table message
-        //
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    return ( m_table && m_table->AppendRows( numRows ) );
+    // the table will have sent the results of the append row
+    // operation to this view object as a grid table message
 }
 
 
 }
 
 
@@ -3877,16 +5347,9 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
-        if (m_table->DeleteRows( pos, numRows ))
-        {
-
-            // the table will have sent the results of the delete row
-            // operation to this view object as a grid table message
-            //
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-            return TRUE;
-        }
+        return (m_table->DeleteRows( pos, numRows ));
+        // the table will have sent the results of the delete row
+        // operation to this view object as a grid table message
     }
     return FALSE;
 }
     }
     return FALSE;
 }
@@ -3907,32 +5370,11 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
-        bool ok = m_table->InsertCols( pos, numCols );
-
+        return m_table->InsertCols( pos, numCols );
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
-        //
-        if ( ok )
-        {
-            if ( m_currentCellCoords == wxGridNoCellCoords )
-            {
-                // if we have just inserted cols into an empty grid the current
-                // cell will be undefined...
-                //
-                SetCurrentCell( 0, 0 );
-            }
-
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-        }
-
-        SetEditControlValue();
-        return ok;
-    }
-    else
-    {
-        return FALSE;
     }
     }
+    return FALSE;
 }
 
 
 }
 
 
@@ -3946,27 +5388,9 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
         return FALSE;
     }
 
         return FALSE;
     }
 
-    if ( m_table && m_table->AppendCols( numCols ) )
-    {
-        // the table will have sent the results of the append col
-        // operation to this view object as a grid table message
-        //
-        if ( m_currentCellCoords == wxGridNoCellCoords )
-        {
-            // if we have just inserted cols into an empty grid the current
-            // cell will be undefined...
-            //
-            SetCurrentCell( 0, 0 );
-        }
-
-        ClearSelection();
-        if ( !GetBatchCount() ) Refresh();
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    return ( m_table && m_table->AppendCols( numCols ) );
+    // the table will have sent the results of the append col
+    // operation to this view object as a grid table message
 }
 
 
 }
 
 
@@ -3985,15 +5409,9 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
-        if ( m_table->DeleteCols( pos, numCols ) )
-        {
-            // the table will have sent the results of the delete col
-            // operation to this view object as a grid table message
-            //
-            ClearSelection();
-            if ( !GetBatchCount() ) Refresh();
-            return TRUE;
-        }
+        return ( m_table->DeleteCols( pos, numCols ) );
+        // the table will have sent the results of the delete col
+        // operation to this view object as a grid table message
     }
     return FALSE;
 }
     }
     return FALSE;
 }
@@ -4019,21 +5437,23 @@ bool wxGrid::SendEvent( const wxEventType type,
                                  type,
                                  this,
                                  rowOrCol,
                                  type,
                                  this,
                                  rowOrCol,
-                                 mouseEv.GetX(), mouseEv.GetY(),
+                                 mouseEv.GetX() + GetRowLabelSize(),
+                                 mouseEv.GetY() + GetColLabelSize(),
                                  mouseEv.ControlDown(),
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );
                                  mouseEv.ControlDown(),
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );
-
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
     else if ( type == wxEVT_GRID_RANGE_SELECT )
     {
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
     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(),
@@ -4047,12 +5467,13 @@ bool wxGrid::SendEvent( const wxEventType type,
                              type,
                              this,
                              row, col,
                              type,
                              this,
                              row, col,
-                             mouseEv.GetX(), mouseEv.GetY(),
+                             mouseEv.GetX() + GetRowLabelSize(),
+                             mouseEv.GetY() + GetColLabelSize(),
+                             FALSE,
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );
-
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
 }
         return GetEventHandler()->ProcessEvent(gridEvt);
     }
 }
@@ -4089,17 +5510,7 @@ bool wxGrid::SendEvent( const wxEventType type,
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
-    wxPaintDC dc( this );
-
-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
-         m_numRows && m_numCols )
-    {
-        m_currentCellCoords.Set(0, 0);
-        SetEditControlValue();
-        ShowCellEditControl();
-    }
-
-    m_displayed = TRUE;
+    wxPaintDC dc(this);  // needed to prevent zillions of paint events on MSW
 }
 
 
 }
 
 
@@ -4107,7 +5518,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();
@@ -4134,11 +5545,6 @@ 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
         //
         switch ( event.KeyCode() )
         // try local handlers
         //
         switch ( event.KeyCode() )
@@ -4146,65 +5552,101 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
             case WXK_UP:
                 if ( event.ControlDown() )
                 {
             case WXK_UP:
                 if ( event.ControlDown() )
                 {
-                    MoveCursorUpBlock();
+                    MoveCursorUpBlock( event.ShiftDown() );
                 }
                 else
                 {
                 }
                 else
                 {
-                    MoveCursorUp();
+                    MoveCursorUp( event.ShiftDown() );
                 }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_DOWN:
                 if ( event.ControlDown() )
                 {
-                    MoveCursorDownBlock();
+                    MoveCursorDownBlock( event.ShiftDown() );
                 }
                 else
                 {
                 }
                 else
                 {
-                    MoveCursorDown();
+                    MoveCursorDown( event.ShiftDown() );
                 }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_LEFT:
                 if ( event.ControlDown() )
                 {
-                    MoveCursorLeftBlock();
+                    MoveCursorLeftBlock( event.ShiftDown() );
                 }
                 else
                 {
                 }
                 else
                 {
-                    MoveCursorLeft();
+                    MoveCursorLeft( event.ShiftDown() );
                 }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
                 {
                 }
                 break;
 
             case WXK_RIGHT:
                 if ( event.ControlDown() )
                 {
-                    MoveCursorRightBlock();
+                    MoveCursorRightBlock( event.ShiftDown() );
+                }
+                else
+                {
+                    MoveCursorRight( event.ShiftDown() );
+                }
+                break;
+
+            case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
+                if ( event.ControlDown() )
+                {
+                    event.Skip();  // to let the edit control have the return
                 }
                 else
                 {
                 }
                 else
                 {
-                    MoveCursorRight();
+                    if ( GetGridCursorRow() < GetNumberRows()-1 )
+                    {
+                        MoveCursorDown( event.ShiftDown() );
+                    }
+                    else
+                    {
+                        // at the bottom of a column
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
                 }
                 break;
 
                 }
                 break;
 
-            case WXK_RETURN:
-                if ( event.ControlDown() )
+            case WXK_ESCAPE:
+                ClearSelection();
+                break;
+
+            case WXK_TAB:
+                if (event.ShiftDown())
                 {
                 {
-                    event.Skip();  // to let the edit control have the return
+                    if ( GetGridCursorCol() > 0 )
+                    {
+                        MoveCursorLeft( FALSE );
+                    }
+                    else
+                    {
+                        // at left of grid
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
                 }
                 else
                 {
                 }
                 else
                 {
-                    MoveCursorDown();
+                    if ( GetGridCursorCol() < GetNumberCols()-1 )
+                    {
+                        MoveCursorRight( FALSE );
+                    }
+                    else
+                    {
+                        // at right of grid
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
                 }
                 break;
 
                 }
                 break;
 
-            case WXK_TAB:
-                if (event.ShiftDown())
-                    MoveCursorLeft();
-                else
-                    MoveCursorRight();
-                break;
-
             case WXK_HOME:
                 if ( event.ControlDown() )
                 {
             case WXK_HOME:
                 if ( event.ControlDown() )
                 {
@@ -4237,37 +5679,54 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 MovePageDown();
                 break;
 
                 MovePageDown();
                 break;
 
-            // We don't want these keys to trigger the edit control, any others?
-            case WXK_SHIFT:
-            case WXK_ALT:
-            case WXK_CONTROL:
-            case WXK_CAPITAL:
-                event.Skip();
-                break;
-
             case WXK_SPACE:
             case WXK_SPACE:
+                if ( event.ControlDown() )
+                {
+                    m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+                                                      m_currentCellCoords.GetCol(),
+                                                      event.ControlDown(),
+                                                      event.ShiftDown(),
+                                                      event.AltDown(),
+                                                      event.MetaDown() );
+                    break;
+                }
                 if ( !IsEditable() )
                 {
                 if ( !IsEditable() )
                 {
-                    MoveCursorRight();
+                    MoveCursorRight( FALSE );
                     break;
                 }
                 // Otherwise fall through to default
 
             default:
                     break;
                 }
                 // Otherwise fall through to default
 
             default:
-                // now try the cell edit control
-                //
+                // is it possible to edit the current cell at all?
                 if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
                 {
                 if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
                 {
-                    EnableCellEditControl();
+                    // yes, now check whether the cells editor accepts the key
                     int row = m_currentCellCoords.GetRow();
                     int col = m_currentCellCoords.GetCol();
                     wxGridCellAttr* attr = GetCellAttr(row, col);
                     int row = m_currentCellCoords.GetRow();
                     int col = m_currentCellCoords.GetCol();
                     wxGridCellAttr* attr = GetCellAttr(row, col);
-                    attr->GetEditor(GetDefaultEditorForCell(row, col))->StartingKey(event);
+                    wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+
+                    // <F2> is special and will always start editing, for
+                    // other keys - ask the editor itself
+                    if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
+                         || editor->IsAcceptedKey(event) )
+                    {
+                        EnableCellEditControl();
+                        editor->StartingKey(event);
+                    }
+                    else
+                    {
+                        event.Skip();
+                    }
+
+                    editor->DecRef();
                     attr->DecRef();
                 }
                 else
                 {
                     attr->DecRef();
                 }
                 else
                 {
-                    // let others process char events for readonly cells
+                    // let others process char events with modifiers or all
+                    // char events for readonly cells
                     event.Skip();
                 }
                 break;
                     event.Skip();
                 }
                 break;
@@ -4277,6 +5736,27 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
     m_inOnKeyDown = FALSE;
 }
 
     m_inOnKeyDown = FALSE;
 }
 
+void wxGrid::OnKeyUp( wxKeyEvent& event )
+{
+    // try local handlers
+    //
+    if ( event.KeyCode() == WXK_SHIFT )
+    {
+        if ( m_selectingTopLeft != wxGridNoCellCoords &&
+             m_selectingBottomRight != wxGridNoCellCoords )
+            m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                      m_selectingTopLeft.GetCol(),
+                                      m_selectingBottomRight.GetRow(),
+                                      m_selectingBottomRight.GetCol(),
+                                      event.ControlDown(),
+                                      TRUE,
+                                      event.AltDown(),
+                                      event.MetaDown() );
+        m_selectingTopLeft = wxGridNoCellCoords;
+        m_selectingBottomRight = wxGridNoCellCoords;
+        m_selectingKeyboard = wxGridNoCellCoords;
+    }
+}
 
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
@@ -4290,44 +5770,177 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
         return;
     }
 
-    if ( m_displayed  &&
-         m_currentCellCoords != wxGridNoCellCoords )
+    wxClientDC dc(m_gridWin);
+    PrepareDC(dc);
+
+    if ( m_currentCellCoords != wxGridNoCellCoords )
     {
         HideCellEditControl();
     {
         HideCellEditControl();
-        SaveEditControlValue();
         DisableCellEditControl();
 
         DisableCellEditControl();
 
-        // Clear the old current cell highlight
-        wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+        if ( IsVisible( m_currentCellCoords, FALSE ) )
+        {
+            wxRect r;
+            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            if ( !m_gridLinesEnabled )
+            {
+                r.x--;
+                r.y--;
+                r.width++;
+                r.height++;
+            }
+
+            CalcCellsExposed( r );
 
 
-        // Otherwise refresh redraws the highlight!
-        m_currentCellCoords = coords;
+            // Otherwise refresh redraws the highlight!
+            m_currentCellCoords = coords;
 
 
-        m_gridWin->Refresh( FALSE, &r );
+            DrawGridCellArea(dc);
+            DrawAllGridLines( dc, r );
+        }
     }
 
     m_currentCellCoords = coords;
 
     }
 
     m_currentCellCoords = coords;
 
-    SetEditControlValue();
+    wxGridCellAttr* attr = GetCellAttr(coords);
+    DrawCellHighlight(dc, attr);
+    attr->DecRef();
+}
+
+
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+{
+    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;
+        topRow = bottomRow;
+        bottomRow = temp;
+    }
+
+    if ( leftCol > rightCol )
+    {
+        temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;
+    }
+
+    updateTopLeft = wxGridCellCoords( topRow, leftCol );
+    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
 
 
-    if ( m_displayed )
+    if ( m_selectingTopLeft != updateTopLeft ||
+         m_selectingBottomRight != updateBottomRight )
     {
     {
-        wxClientDC dc(m_gridWin);
-        PrepareDC(dc);
+        // Compute two optimal update rectangles:
+        // Either one rectangle is a real subset of the
+        // other, or they are (almost) disjoint!
+        wxRect  rect[4];
+        bool    need_refresh[4];
+        need_refresh[0] =
+        need_refresh[1] =
+        need_refresh[2] =
+        need_refresh[3] = FALSE;
+        int     i;
 
 
-        wxGridCellAttr* attr = GetCellAttr(coords);
-        DrawCellHighlight(dc, attr);
-        attr->DecRef();
+        // Store intermediate values
+        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
+        wxCoord oldTop    = m_selectingTopLeft.GetRow();
+        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldBottom = m_selectingBottomRight.GetRow();
 
 
-        if ( IsSelection() )
+        // Determine the outer/inner coordinates.
+        if (oldLeft > leftCol)
         {
         {
-            wxRect r( SelectionToDeviceRect() );
-            ClearSelection();
-            if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+            temp = oldLeft;
+            oldLeft = leftCol;
+            leftCol = temp;
+        }
+        if (oldTop > topRow )
+        {
+            temp = oldTop;
+            oldTop = topRow;
+            topRow = temp;
+        }
+        if (oldRight < rightCol )
+        {
+            temp = oldRight;
+            oldRight = rightCol;
+            rightCol = temp;
+        }
+        if (oldBottom < bottomRow)
+        {
+            temp = oldBottom;
+            oldBottom = bottomRow;
+            bottomRow = temp;
+        }
+
+        // Now, either the stuff marked old is the outer
+        // rectangle or we don't have a situation where one
+        // is contained in the other.
+
+        if ( oldLeft < leftCol )
+        {
+            need_refresh[0] = TRUE;
+            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            oldLeft ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            leftCol - 1 ) );
+        }
+
+        if ( oldTop  < topRow )
+        {
+            need_refresh[1] = TRUE;
+            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            leftCol ),
+                                         wxGridCellCoords ( topRow - 1,
+                                                            rightCol ) );
+        }
+
+        if ( oldRight > rightCol )
+        {
+            need_refresh[2] = TRUE;
+            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            rightCol + 1 ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            oldRight ) );
         }
         }
+
+        if ( oldBottom > bottomRow )
+        {
+            need_refresh[3] = TRUE;
+            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+                                                            leftCol ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            rightCol ) );
+        }
+
+
+        // Change Selection
+        m_selectingTopLeft = updateTopLeft;
+        m_selectingBottomRight = updateBottomRight;
+
+        // various Refresh() calls
+        for (i = 0; i < 4; i++ )
+            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+                m_gridWin->Refresh( FALSE, &(rect[i]) );
     }
     }
-}
 
 
+    // never generate an event as it will be generated from
+    // wxGridSelection::SelectBlock!
+    // (old comment from when this was the body of SelectBlock)
+}
 
 //
 // ------ functions to get/send data (see also public functions)
 
 //
 // ------ functions to get/send data (see also public functions)
@@ -4387,6 +6000,38 @@ void wxGrid::DrawGridCellArea( wxDC& dc )
 }
 
 
 }
 
 
+void wxGrid::DrawGridSpace( wxDC& dc )
+{
+  int cw, ch;
+  m_gridWin->GetClientSize( &cw, &ch );
+
+  int right, bottom;
+  CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+  int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
+  int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
+
+  if ( right > rightCol || bottom > bottomRow )
+  {
+      int left, top;
+      CalcUnscrolledPosition( 0, 0, &left, &top );
+
+      dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+      dc.SetPen( *wxTRANSPARENT_PEN );
+
+      if ( right > rightCol )
+      {
+          dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+      }
+
+      if ( bottom > bottomRow )
+      {
+          dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+      }
+  }
+}
+
+
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
 void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 {
     int row = coords.GetRow();
@@ -4405,25 +6050,23 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 
     bool isCurrent = coords == m_currentCellCoords;
 
 
     bool isCurrent = coords == m_currentCellCoords;
 
-    wxRect rect;
-    rect.x = GetColLeft(col);
-    rect.y = GetRowTop(row);
-    rect.width = GetColWidth(col) - 1;
-    rect.height = GetRowHeight(row) - 1;
+    wxRect rect = CellToRect( row, col );
 
     // if the editor is shown, we should use it and not the renderer
 
     // if the editor is shown, we should use it and not the renderer
-    if ( isCurrent && IsCellEditControlEnabled() )
+    // Note: However, only if it is really _shown_, i.e. not hidden!
+    if ( isCurrent && IsCellEditControlShown() )
     {
     {
-        attr->GetEditor(GetDefaultEditorForCell(row, col))->
-            PaintBackground(rect, attr);
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->PaintBackground(rect, attr);
+        editor->DecRef();
     }
     else
     {
         // but all the rest is drawn by the cell renderer and hence may be
         // customized
     }
     else
     {
         // but all the rest is drawn by the cell renderer and hence may be
         // customized
-        attr->GetRenderer(GetDefaultRendererForCell(row,col))->
-            Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
-
+        wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
+        renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
+        renderer->DecRef();
     }
 
     attr->DecRef();
     }
 
     attr->DecRef();
@@ -4437,19 +6080,32 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
     if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
 
     if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
         return;
 
-    wxRect rect;
-    rect.x = GetColLeft(col);
-    rect.y = GetRowTop(row);
-    rect.width = GetColWidth(col) - 1;
-    rect.height = GetRowHeight(row) - 1;
+    wxRect rect = CellToRect(row, col);
 
     // hmmm... what could we do here to show that the cell is disabled?
     // for now, I just draw a thinner border than for the other ones, but
     // it doesn't look really good
 
     // hmmm... what could we do here to show that the cell is disabled?
     // for now, I just draw a thinner border than for the other ones, but
     // it doesn't look really good
-    dc.SetPen(wxPen(m_gridLineColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
 
-    dc.DrawRectangle(rect);
+    int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth;
+
+    if (penWidth > 0) {
+
+        // The center of th drawn line is where the position/width/height of
+        // the rectangle is actually at, (on wxMSW atr least,) so we will
+        // reduce the size of the rectangle to compensate for the thickness of
+        // the line.  If this is too strange on non wxMSW platforms then
+        // please #ifdef this appropriately.
+        rect.x += penWidth/2;
+        rect.y += penWidth/2;
+        rect.width -= penWidth-1;
+        rect.height -= penWidth-1;
+
+
+        // Now draw the rectangle
+        dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID));
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(rect);
+    }
 
 #if 0
         // VZ: my experiments with 3d borders...
 
 #if 0
         // VZ: my experiments with 3d borders...
@@ -4496,7 +6152,16 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 
 void wxGrid::DrawHighlight(wxDC& dc)
 {
 
 void wxGrid::DrawHighlight(wxDC& dc)
 {
-    if ( IsCellEditControlEnabled() )
+    // 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 ( IsCellEditControlShown() )
     {
         // don't show highlight when the edit control is shown
         return;
     {
         // don't show highlight when the edit control is shown
         return;
@@ -4522,7 +6187,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(reg) )
 {
     if ( !m_gridLinesEnabled ||
          !m_numRows ||
 {
     if ( !m_gridLinesEnabled ||
          !m_numRows ||
@@ -4530,6 +6195,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
 
     int top, bottom, left, right;
 
 
     int top, bottom, left, right;
 
+#if 0  //#ifndef __WXGTK__
     if (reg.IsEmpty())
     {
       int cw, ch;
     if (reg.IsEmpty())
     {
       int cw, ch;
@@ -4547,6 +6213,12 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
       CalcUnscrolledPosition( x, y, &left, &top );
       CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
     }
       CalcUnscrolledPosition( x, y, &left, &top );
       CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
     }
+#else
+      int cw, ch;
+      m_gridWin->GetClientSize(&cw, &ch);
+      CalcUnscrolledPosition( 0, 0, &left, &top );
+      CalcUnscrolledPosition( cw, ch, &right, &bottom );
+#endif
 
     // avoid drawing grid lines past the last row and col
     //
 
     // avoid drawing grid lines past the last row and col
     //
@@ -4594,7 +6266,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
 
 void wxGrid::DrawRowLabels( wxDC& dc )
 {
 
 void wxGrid::DrawRowLabels( wxDC& dc )
 {
-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numRows ) return;
 
     size_t i;
     size_t numLabels = m_rowLabelsExposed.GetCount();
 
     size_t i;
     size_t numLabels = m_rowLabelsExposed.GetCount();
@@ -4642,7 +6314,7 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 
 void wxGrid::DrawColLabels( wxDC& dc )
 {
 
 void wxGrid::DrawColLabels( wxDC& dc )
 {
-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numCols ) return;
 
     size_t i;
     size_t numLabels = m_colLabelsExposed.GetCount();
 
     size_t i;
     size_t numLabels = m_colLabelsExposed.GetCount();
@@ -4713,15 +6385,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
         float x, y;
         switch ( horizAlign )
         {
         float x, y;
         switch ( horizAlign )
         {
-            case wxRIGHT:
+            case wxALIGN_RIGHT:
                 x = rect.x + (rect.width - textWidth - 1);
                 break;
 
                 x = rect.x + (rect.width - textWidth - 1);
                 break;
 
-            case wxCENTRE:
+            case wxALIGN_CENTRE:
                 x = rect.x + ((rect.width - textWidth)/2);
                 break;
 
                 x = rect.x + ((rect.width - textWidth)/2);
                 break;
 
-            case wxLEFT:
+            case wxALIGN_LEFT:
             default:
                 x = rect.x + 1;
                 break;
             default:
                 x = rect.x + 1;
                 break;
@@ -4729,15 +6401,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
         switch ( vertAlign )
         {
 
         switch ( vertAlign )
         {
-            case wxBOTTOM:
+            case wxALIGN_BOTTOM:
                 y = rect.y + (rect.height - textHeight - 1);
                 break;
 
                 y = rect.y + (rect.height - textHeight - 1);
                 break;
 
-            case wxCENTRE:
+            case wxALIGN_CENTRE:
                 y = rect.y + ((rect.height - textHeight)/2);
                 break;
 
                 y = rect.y + ((rect.height - textHeight)/2);
                 break;
 
-            case wxTOP:
+            case wxALIGN_TOP:
             default:
                 y = rect.y + 1;
                 break;
             default:
                 y = rect.y + 1;
                 break;
@@ -4745,7 +6417,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;
         }
     }
@@ -4808,6 +6480,35 @@ void wxGrid::GetTextBoxSize( wxDC& dc,
     *height = h;
 }
 
     *height = h;
 }
 
+//
+// ------ Batch processing.
+//
+void wxGrid::EndBatch()
+{
+    if ( m_batchCount > 0 )
+    {
+        m_batchCount--;
+        if ( !m_batchCount )
+        {
+            CalcDimensions();
+            m_rowLabelWin->Refresh();
+            m_colLabelWin->Refresh();
+            m_cornerLabelWin->Refresh();
+            m_gridWin->Refresh();
+        }
+    }
+}
+
+// Use this, rather than wxWindow::Refresh(), to force an immediate
+// repainting of the grid. Has no effect if you are already inside a
+// BeginBatch / EndBatch block.
+//
+void wxGrid::ForceRefresh()
+{
+    BeginBatch();
+    EndBatch();
+}
+
 
 //
 // ------ Edit control functions
 
 //
 // ------ Edit control functions
@@ -4820,12 +6521,8 @@ void wxGrid::EnableEditing( bool edit )
     //
     if ( edit != m_editable )
     {
     //
     if ( edit != m_editable )
     {
+        if(!edit) EnableCellEditControl(edit);
         m_editable = edit;
         m_editable = edit;
-
-        // FIXME IMHO this won't disable the edit control if edit == FALSE
-        //       because of the check in the beginning of
-        //       EnableCellEditControl() just below (VZ)
-        EnableCellEditControl(m_editable);
     }
 }
 
     }
 }
 
@@ -4852,7 +6549,6 @@ void wxGrid::EnableCellEditControl( bool enable )
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
 
             // do it before ShowCellEditControl()
             m_cellEditCtrlEnabled = enable;
 
-            SetEditControlValue();
             ShowCellEditControl();
         }
         else
             ShowCellEditControl();
         }
         else
@@ -4888,12 +6584,39 @@ bool wxGrid::IsCellEditControlEnabled() const
     return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
 }
 
     return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
 }
 
+bool wxGrid::IsCellEditControlShown() const
+{
+    bool isShown = FALSE;
+
+    if ( m_cellEditCtrlEnabled )
+    {
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col);
+        attr->DecRef();
+
+        if ( editor )
+        {
+            if ( editor->IsCreated() )
+            {
+                isShown = editor->GetControl()->IsShown();
+            }
+
+            editor->DecRef();
+        }
+    }
+
+    return isShown;
+}
+
 void wxGrid::ShowCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
 void wxGrid::ShowCellEditControl()
 {
     if ( IsCellEditControlEnabled() )
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
+            m_cellEditCtrlEnabled = FALSE;
             return;
         }
         else
             return;
         }
         else
@@ -4922,17 +6645,20 @@ void wxGrid::ShowCellEditControl()
             rect.y--;
 
             wxGridCellAttr* attr = GetCellAttr(row, col);
             rect.y--;
 
             wxGridCellAttr* attr = GetCellAttr(row, col);
-            wxGridCellEditor* editor = attr->GetEditor(GetDefaultEditorForCell(row, col));
+            wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));
             }
 
             if ( !editor->IsCreated() )
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));
             }
 
+            editor->Show( TRUE, attr );
+
             editor->SetSize( rect );
 
             editor->SetSize( rect );
 
-            editor->Show( TRUE, attr );
             editor->BeginEdit(row, col, this);
             editor->BeginEdit(row, col, this);
+
+            editor->DecRef();
             attr->DecRef();
          }
     }
             attr->DecRef();
          }
     }
@@ -4947,20 +6673,17 @@ void wxGrid::HideCellEditControl()
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
-        attr->GetEditor(GetDefaultEditorForCell(row, col))->Show( FALSE );
+        wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+        editor->Show( FALSE );
+        editor->DecRef();
         attr->DecRef();
         m_gridWin->SetFocus();
         attr->DecRef();
         m_gridWin->SetFocus();
+        wxRect rect( CellToRect( row, col ) );
+        m_gridWin->Refresh( FALSE, &rect );
     }
 }
 
 
     }
 }
 
 
-void wxGrid::SetEditControlValue( const wxString& value )
-{
-    // RD: The new Editors get the value from the table themselves now.  This
-    // method can probably be removed...
-}
-
-
 void wxGrid::SaveEditControlValue()
 {
     if ( IsCellEditControlEnabled() )
 void wxGrid::SaveEditControlValue()
 {
     if ( IsCellEditControlEnabled() )
@@ -4969,9 +6692,10 @@ void wxGrid::SaveEditControlValue()
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         int col = m_currentCellCoords.GetCol();
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
-        wxGridCellEditor* editor = attr->GetEditor(GetDefaultEditorForCell(row, col));
-        bool changed = editor->EndEdit(row, col, TRUE, this);
+        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+        bool changed = editor->EndEdit(row, col, this);
 
 
+        editor->DecRef();
         attr->DecRef();
 
         if (changed)
         attr->DecRef();
 
         if (changed)
@@ -5017,7 +6741,7 @@ int wxGrid::YToRow( int y )
             return i;
     }
 
             return i;
     }
 
-    return m_numRows; //-1;
+    return -1;
 }
 
 
 }
 
 
@@ -5031,7 +6755,7 @@ int wxGrid::XToCol( int x )
             return i;
     }
 
             return i;
     }
 
-    return m_numCols; //-1;
+    return -1;
 }
 
 
 }
 
 
@@ -5090,6 +6814,11 @@ wxRect wxGrid::CellToRect( int row, int col )
         rect.height = GetRowHeight(row);
     }
 
         rect.height = GetRowHeight(row);
     }
 
+    // if grid lines are enabled, then the area of the cell is a bit smaller
+    if (m_gridLinesEnabled) {
+        rect.width -= 1;
+        rect.height -= 1;
+    }
     return rect;
 }
 
     return rect;
 }
 
@@ -5213,17 +6942,33 @@ 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  &&
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() > 0 )
+         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;
+            if ( m_selectingKeyboard.GetRow() > 0 )
+            {
+                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                                 m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetRow() > 0 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() - 1,
+                            m_currentCellCoords.GetCol() );
+        }
+        else
+            return FALSE;
         return TRUE;
     }
 
         return TRUE;
     }
 
@@ -5231,19 +6976,33 @@ bool wxGrid::MoveCursorUp()
 }
 
 
 }
 
 
-bool wxGrid::MoveCursorDown()
+bool wxGrid::MoveCursorDown( bool expandSelection )
 {
 {
-    // TODO: allow for scrolling
-    //
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetRow() < m_numRows-1 )
+         m_currentCellCoords.GetRow() < m_numRows )
     {
     {
-        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;
+            if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
+            {
+                m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+                             m_currentCellCoords.GetCol() );
+            SetCurrentCell( m_currentCellCoords.GetRow() + 1,
+                            m_currentCellCoords.GetCol() );
+        }
+        else
+            return FALSE;
         return TRUE;
     }
 
         return TRUE;
     }
 
@@ -5251,17 +7010,33 @@ bool wxGrid::MoveCursorDown()
 }
 
 
 }
 
 
-bool wxGrid::MoveCursorLeft()
+bool wxGrid::MoveCursorLeft( bool expandSelection )
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() > 0 )
+         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;
+            if ( m_selectingKeyboard.GetCol() > 0 )
+            {
+                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetCol() > 0 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() - 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() - 1 );
+        }
+        else
+            return FALSE;
         return TRUE;
     }
 
         return TRUE;
     }
 
@@ -5269,17 +7044,33 @@ bool wxGrid::MoveCursorLeft()
 }
 
 
 }
 
 
-bool wxGrid::MoveCursorRight()
+bool wxGrid::MoveCursorRight( bool expandSelection )
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
 {
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
-         m_currentCellCoords.GetCol() < m_numCols - 1 )
+         m_currentCellCoords.GetCol() < m_numCols )
     {
     {
-        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;
+            if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
+            {
+                m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+                MakeCellVisible( m_selectingKeyboard.GetRow(),
+                        m_selectingKeyboard.GetCol() );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+            }
+        }
+        else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+        {
+            ClearSelection();
+            MakeCellVisible( m_currentCellCoords.GetRow(),
+                             m_currentCellCoords.GetCol() + 1 );
+            SetCurrentCell( m_currentCellCoords.GetRow(),
+                            m_currentCellCoords.GetCol() + 1 );
+        }
+        else
+            return FALSE;
         return TRUE;
     }
 
         return TRUE;
     }
 
@@ -5347,7 +7138,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  &&
@@ -5394,15 +7185,23 @@ bool wxGrid::MoveCursorUpBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
-
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( 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  &&
@@ -5449,7 +7248,16 @@ bool wxGrid::MoveCursorDownBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
 
         return TRUE;
     }
@@ -5457,7 +7265,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  &&
@@ -5504,7 +7312,16 @@ bool wxGrid::MoveCursorLeftBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
 
         return TRUE;
     }
@@ -5512,7 +7329,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  &&
@@ -5559,7 +7376,16 @@ bool wxGrid::MoveCursorRightBlock()
         }
 
         MakeCellVisible( row, col );
         }
 
         MakeCellVisible( row, col );
-        SetCurrentCell( row, col );
+        if ( expandSelection )
+        {
+            m_selectingKeyboard = wxGridCellCoords( row, col );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+        }
+        else
+        {
+            ClearSelection();
+            SetCurrentCell( row, col );
+        }
 
         return TRUE;
     }
 
         return TRUE;
     }
@@ -5703,12 +7529,27 @@ void wxGrid::SetLabelFont( const wxFont& font )
 
 void wxGrid::SetRowLabelAlignment( int horiz, int vert )
 {
 
 void wxGrid::SetRowLabelAlignment( int horiz, int vert )
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    // allow old (incorrect) defs to be used
+    switch ( horiz )
+    {
+        case wxLEFT:   horiz = wxALIGN_LEFT; break;
+        case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
+        case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+    }
+
+    switch ( vert )
+    {
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
+
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_rowLabelHorizAlign = horiz;
     }
 
     {
         m_rowLabelHorizAlign = horiz;
     }
 
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
     {
         m_rowLabelVertAlign = vert;
     }
     {
         m_rowLabelVertAlign = vert;
     }
@@ -5721,12 +7562,27 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert )
 
 void wxGrid::SetColLabelAlignment( int horiz, int vert )
 {
 
 void wxGrid::SetColLabelAlignment( int horiz, int vert )
 {
-    if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+    // allow old (incorrect) defs to be used
+    switch ( horiz )
+    {
+        case wxLEFT:   horiz = wxALIGN_LEFT; break;
+        case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
+        case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+    }
+
+    switch ( vert )
+    {
+        case wxTOP:    vert = wxALIGN_TOP;    break;
+        case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+        case wxCENTRE: vert = wxALIGN_CENTRE; break;
+    }
+
+    if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_colLabelHorizAlign = horiz;
     }
 
     {
         m_colLabelHorizAlign = horiz;
     }
 
-    if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+    if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
     {
         m_colLabelVertAlign = vert;
     }
     {
         m_colLabelVertAlign = vert;
     }
@@ -5748,7 +7604,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
-                rect.x = m_left;
+                rect.x = 0;
                 rect.width = m_rowLabelWidth;
                 m_rowLabelWin->Refresh( TRUE, &rect );
             }
                 rect.width = m_rowLabelWidth;
                 m_rowLabelWin->Refresh( TRUE, &rect );
             }
@@ -5767,7 +7623,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
             if ( rect.width > 0 )
             {
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
             if ( rect.width > 0 )
             {
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
-                rect.y = m_top;
+                rect.y = 0;
                 rect.height = m_colLabelHeight;
                 m_colLabelWin->Refresh( TRUE, &rect );
             }
                 rect.height = m_colLabelHeight;
                 m_colLabelWin->Refresh( TRUE, &rect );
             }
@@ -5787,6 +7643,53 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
     }
 }
 
     }
 }
 
+
+void wxGrid::SetCellHighlightColour( const wxColour& colour )
+{
+    if ( m_cellHighlightColour != colour )
+    {
+        m_cellHighlightColour = colour;
+
+        wxClientDC dc( m_gridWin );
+        PrepareDC( dc );
+        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+        DrawCellHighlight(dc, attr);
+        attr->DecRef();
+    }
+}
+
+void wxGrid::SetCellHighlightPenWidth(int width)
+{
+    if (m_cellHighlightPenWidth != width) {
+        m_cellHighlightPenWidth = width;
+
+        // Just redrawing the cell highlight is not enough since that won't
+        // make any visible change if the the thickness is getting smaller.
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+        wxRect rect = CellToRect(row, col);
+        m_gridWin->Refresh(TRUE, &rect);
+    }
+}
+
+void wxGrid::SetCellHighlightROPenWidth(int width)
+{
+    if (m_cellHighlightROPenWidth != width) {
+        m_cellHighlightROPenWidth = width;
+
+        // Just redrawing the cell highlight is not enough since that won't
+        // make any visible change if the the thickness is getting smaller.
+        int row = m_currentCellCoords.GetRow();
+        int col = m_currentCellCoords.GetCol();
+        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+            return;
+        wxRect rect = CellToRect(row, col);
+        m_gridWin->Refresh(TRUE, &rect);
+    }
+}
+
 void wxGrid::EnableGridLines( bool enable )
 {
     if ( enable != m_gridLinesEnabled )
 void wxGrid::EnableGridLines( bool enable )
 {
     if ( enable != m_gridLinesEnabled )
@@ -5902,12 +7805,12 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
 
 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {
 
 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {
-    return m_defaultCellAttr->GetRenderer(NULL);
+    return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
 }
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {
 }
 
 wxGridCellEditor *wxGrid::GetDefaultEditor() const
 {
-    return m_defaultCellAttr->GetEditor(NULL);
+    return m_defaultCellAttr->GetEditor(NULL,0,0);
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -5918,7 +7821,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col)
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
-    attr->SafeDecRef();
+    attr->DecRef();
     return colour;
 }
 
     return colour;
 }
 
@@ -5926,7 +7829,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
-    attr->SafeDecRef();
+    attr->DecRef();
     return colour;
 }
 
     return colour;
 }
 
@@ -5934,7 +7837,7 @@ wxFont wxGrid::GetCellFont( int row, int col )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
-    attr->SafeDecRef();
+    attr->DecRef();
     return font;
 }
 
     return font;
 }
 
@@ -5942,22 +7845,24 @@ void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
-    attr->SafeDecRef();
+    attr->DecRef();
 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
-    wxGridCellRenderer* renderer = attr->GetRenderer(GetDefaultRendererForCell(row,col));
+    wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
     attr->DecRef();
     attr->DecRef();
+
     return renderer;
 }
 
 wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
     return renderer;
 }
 
 wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
 {
     wxGridCellAttr* attr = GetCellAttr(row, col);
-    wxGridCellEditor* editor = attr->GetEditor(GetDefaultEditorForCell(row, col));
+    wxGridCellEditor* editor = attr->GetEditor(this, row, col);
     attr->DecRef();
     attr->DecRef();
+
     return editor;
 }
 
     return editor;
 }
 
@@ -5987,7 +7892,8 @@ void wxGrid::ClearAttrCache()
 {
     if ( m_attrCache.row != -1 )
     {
 {
     if ( m_attrCache.row != -1 )
     {
-        m_attrCache.attr->SafeDecRef();
+        wxSafeDecRef(m_attrCache.attr);
+        m_attrCache.attr = NULL;
         m_attrCache.row = -1;
     }
 }
         m_attrCache.row = -1;
     }
 }
@@ -6000,7 +7906,7 @@ void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
     self->m_attrCache.row = row;
     self->m_attrCache.col = col;
     self->m_attrCache.attr = attr;
     self->m_attrCache.row = row;
     self->m_attrCache.col = col;
     self->m_attrCache.attr = attr;
-    attr->SafeIncRef();
+    wxSafeIncRef(attr);
 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
@@ -6008,7 +7914,7 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
     if ( row == m_attrCache.row && col == m_attrCache.col )
     {
         *attr = m_attrCache.attr;
     if ( row == m_attrCache.row && col == m_attrCache.col )
     {
         *attr = m_attrCache.attr;
-        (*attr)->SafeIncRef();
+        wxSafeIncRef(m_attrCache.attr);
 
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheHits++;
 
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheHits++;
@@ -6030,7 +7936,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
     wxGridCellAttr *attr;
     if ( !LookupAttr(row, col, &attr) )
     {
     wxGridCellAttr *attr;
     if ( !LookupAttr(row, col, &attr) )
     {
-        attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
+        attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) : (wxGridCellAttr *)NULL;
         CacheAttr(row, col, attr);
     }
     if (attr)
         CacheAttr(row, col, attr);
     }
     if (attr)
@@ -6048,30 +7954,62 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 
 wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
 
 wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) || !attr )
-    {
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
         wxASSERT_MSG( m_table,
         wxASSERT_MSG( m_table,
-                      _T("we may only be called if CanHaveAttributes() "
-                         "returned TRUE and then m_table should be !NULL") );
+                      _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
 
 
-        attr = m_table->GetAttr(row, col);
+    attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell );
         if ( !attr )
         {
             attr = new wxGridCellAttr;
 
             // artificially inc the ref count to match DecRef() in caller
             attr->IncRef();
         if ( !attr )
         {
             attr = new wxGridCellAttr;
 
             // artificially inc the ref count to match DecRef() in caller
             attr->IncRef();
-
             m_table->SetAttr(attr, row, col);
         }
             m_table->SetAttr(attr, row, col);
         }
-
-        CacheAttr(row, col, attr);
-    }
     attr->SetDefAttr(m_defaultCellAttr);
     return attr;
 }
 
     attr->SetDefAttr(m_defaultCellAttr);
     return attr;
 }
 
+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetColFormatBool(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_BOOL);
+}
+
+void wxGrid::SetColFormatNumber(int col)
+{
+    SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
+}
+
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
+{
+    wxString typeName = wxGRID_VALUE_FLOAT;
+    if ( (width != -1) || (precision != -1) )
+    {
+        typeName << _T(':') << width << _T(',') << precision;
+    }
+
+    SetColFormatCustom(col, typeName);
+}
+
+void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
+{
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+
+    attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
+    if(!attr)
+        attr = new wxGridCellAttr;
+    wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
+    attr->SetRenderer(renderer);
+
+    SetColAttr(col, attr);
+
+}
+
 // ----------------------------------------------------------------------------
 // setting cell attributes: this is forwarded to the table
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // setting cell attributes: this is forwarded to the table
 // ----------------------------------------------------------------------------
@@ -6081,10 +8019,11 @@ void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
     if ( CanHaveAttributes() )
     {
         m_table->SetRowAttr(attr, row);
     if ( CanHaveAttributes() )
     {
         m_table->SetRowAttr(attr, row);
+        ClearAttrCache();
     }
     else
     {
     }
     else
     {
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
@@ -6093,10 +8032,11 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr)
     if ( CanHaveAttributes() )
     {
         m_table->SetColAttr(attr, col);
     if ( CanHaveAttributes() )
     {
         m_table->SetColAttr(attr, col);
+        ClearAttrCache();
     }
     else
     {
     }
     else
     {
-        attr->SafeDecRef();
+        wxSafeDecRef(attr);
     }
 }
 
     }
 }
 
@@ -6197,24 +8137,28 @@ 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);
-    if (index == -1) {
-        // Should we force the failure here or let it fallback to string handling???
-        // wxFAIL_MSG(wxT("Unknown data type name"));
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
+
         return NULL;
     }
         return NULL;
     }
+
     return m_typeRegistry->GetEditor(index);
 }
 
 wxGridCellRenderer*
 wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
     return m_typeRegistry->GetEditor(index);
 }
 
 wxGridCellRenderer*
 wxGrid::GetDefaultRendererForType(const wxString& typeName) const
 {
-    int index = m_typeRegistry->FindDataType(typeName);
-    if (index == -1) {
-        // Should we force the failure here or let it fallback to string handling???
-        // wxFAIL_MSG(wxT("Unknown data type name"));
+    int index = m_typeRegistry->FindOrCloneDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        wxFAIL_MSG(wxT("Unknown data type name"));
+
         return NULL;
     }
         return NULL;
     }
+
     return m_typeRegistry->GetRenderer(index);
 }
 
     return m_typeRegistry->GetRenderer(index);
 }
 
@@ -6234,6 +8178,11 @@ void wxGrid::EnableDragColSize( bool enable )
     m_canDragColSize = enable;
 }
 
     m_canDragColSize = enable;
 }
 
+void wxGrid::EnableDragGridSize( bool enable )
+{
+    m_canDragGridSize = enable;
+}
+
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
@@ -6242,8 +8191,8 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
     if ( resizeExistingRows )
     {
         InitRowHeights();
     if ( resizeExistingRows )
     {
         InitRowHeights();
-
-        CalcDimensions();
+       if ( !GetBatchCount() )
+           CalcDimensions();
     }
 }
 
     }
 }
 
@@ -6256,76 +8205,268 @@ void wxGrid::SetRowSize( int row, int height )
         // need to really create the array
         InitRowHeights();
     }
         // need to really create the array
         InitRowHeights();
     }
-
-    int h = wxMax( 0, height );
-    int diff = h - m_rowHeights[row];
-
-    m_rowHeights[row] = h;
-    int i;
-    for ( i = row;  i < m_numRows;  i++ )
+
+    int h = wxMax( 0, height );
+    int diff = h - m_rowHeights[row];
+
+    m_rowHeights[row] = h;
+    int i;
+    for ( i = row;  i < m_numRows;  i++ )
+    {
+        m_rowBottoms[i] += diff;
+    }
+    if ( !GetBatchCount() )
+        CalcDimensions();
+}
+
+void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
+{
+    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+
+    if ( resizeExistingCols )
+    {
+        InitColWidths();
+       if ( !GetBatchCount() )
+           CalcDimensions();
+    }
+}
+
+void wxGrid::SetColSize( int col, int width )
+{
+    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
+
+    // should we check that it's bigger than GetColMinimalWidth(col) here?
+
+    if ( m_colWidths.IsEmpty() )
+    {
+        // need to really create the array
+        InitColWidths();
+    }
+
+    int w = wxMax( 0, width );
+    int diff = w - m_colWidths[col];
+    m_colWidths[col] = w;
+
+    int i;
+    for ( i = col;  i < m_numCols;  i++ )
+    {
+        m_colRights[i] += diff;
+    }
+    if ( !GetBatchCount() )
+        CalcDimensions();
+}
+
+
+void wxGrid::SetColMinimalWidth( int col, int width )
+{
+    m_colMinWidths.Put(col, width);
+}
+
+void wxGrid::SetRowMinimalHeight( int row, int width )
+{
+    m_rowMinHeights.Put(row, width);
+}
+
+int wxGrid::GetColMinimalWidth(int col) const
+{
+    long value = m_colMinWidths.Get(col);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
+}
+
+int wxGrid::GetRowMinimalHeight(int row) const
+{
+    long value = m_rowMinHeights.Get(row);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
+}
+
+// ----------------------------------------------------------------------------
+// auto sizing
+// ----------------------------------------------------------------------------
+
+void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
+{
+    wxClientDC dc(m_gridWin);
+
+    // init both of them to avoid compiler warnings, even if weo nly need one
+    int row = -1,
+        col = -1;
+    if ( column )
+        col = colOrRow;
+    else
+        row = colOrRow;
+
+    wxCoord extent, extentMax = 0;
+    int max = column ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
+    {
+        if ( column )
+            row = rowOrCol;
+        else
+            col = rowOrCol;
+
+        wxGridCellAttr* attr = GetCellAttr(row, col);
+        wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+        if ( renderer )
+        {
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+            if ( extent > extentMax )
+            {
+                extentMax = extent;
+            }
+
+            renderer->DecRef();
+        }
+
+        attr->DecRef();
+    }
+
+    // now also compare with the column label extent
+    wxCoord w, h;
+    dc.SetFont( GetLabelFont() );
+
+    if ( column )
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    else
+        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+
+    extent = column ? w : h;
+    if ( extent > extentMax )
+    {
+        extentMax = extent;
+    }
+
+    if ( !extentMax )
+    {
+        // empty column - give default extent (notice that if extentMax is less
+        // than default extent but != 0, it's ok)
+        extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
+    }
+    else
+    {
+        if ( column )
+        {
+            // leave some space around text
+            extentMax += 10;
+        }
+        else
+        {
+            extentMax += 6;
+        }
+    }
+
+    if ( column ){
+        SetColSize(col, extentMax);
+        if ( !GetBatchCount() )
+        {
+           int cw, ch, dummy;
+           m_gridWin->GetClientSize( &cw, &ch );
+           wxRect rect ( CellToRect( 0, col ) );
+           rect.y = 0;
+           CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+           rect.width = cw - rect.x;
+           rect.height = m_colLabelHeight;
+           m_colLabelWin->Refresh( TRUE, &rect );
+       }
+    }
+    else{
+        SetRowSize(row, extentMax);
+        if ( !GetBatchCount() )
+        {
+           int cw, ch, dummy;
+           m_gridWin->GetClientSize( &cw, &ch );
+           wxRect rect ( CellToRect( row, 0 ) );
+           rect.x = 0;
+           CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+           rect.width = m_rowLabelWidth;
+            rect.height = ch - rect.y;
+           m_rowLabelWin->Refresh( TRUE, &rect );
+       }
+    }
+    if ( setAsMin )
     {
     {
-        m_rowBottoms[i] += diff;
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);
     }
     }
-    CalcDimensions();
 }
 
 }
 
-void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
 {
-    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+    int width = m_rowLabelWidth;
 
 
-    if ( resizeExistingCols )
+    if ( !calcOnly )
+        BeginBatch();
+    for ( int col = 0; col < m_numCols; col++ )
     {
     {
-        InitColWidths();
+        if ( !calcOnly )
+        {
+            AutoSizeColumn(col, setAsMin);
+        }
 
 
-        CalcDimensions();
+        width += GetColWidth(col);
     }
     }
+    if ( !calcOnly )
+        EndBatch();
+    return width;
 }
 
 }
 
-void wxGrid::SetColSize( int col, int width )
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
 {
-    wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
+    int height = m_colLabelHeight;
 
 
-    // should we check that it's bigger than GetColMinimalWidth(col) here?
-
-    if ( m_colWidths.IsEmpty() )
+    if ( !calcOnly )
+        BeginBatch();
+    for ( int row = 0; row < m_numRows; row++ )
     {
     {
-        // need to really create the array
-        InitColWidths();
-    }
-
-    int w = wxMax( 0, width );
-    int diff = w - m_colWidths[col];
-    m_colWidths[col] = w;
+        if ( !calcOnly )
+        {
+            AutoSizeRow(row, setAsMin);
+        }
 
 
-    int i;
-    for ( i = col;  i < m_numCols;  i++ )
-    {
-        m_colRights[i] += diff;
+        height += GetRowHeight(row);
     }
     }
-    CalcDimensions();
+    if ( !calcOnly )
+        EndBatch();
+    return height;
 }
 
 }
 
+void wxGrid::AutoSize()
+{
+    // set the size too
+    SetClientSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+}
 
 
-void wxGrid::SetColMinimalWidth( int col, int width )
+wxSize wxGrid::DoGetBestSize() const
 {
 {
-    m_colMinWidths.Put(col, (wxObject *)width);
+    // don't set sizes, only calculate them
+    wxGrid *self = (wxGrid *)this;  // const_cast
+
+    return wxSize(self->SetOrCalcColumnSizes(TRUE),
+                  self->SetOrCalcRowSizes(TRUE));
 }
 
 }
 
-int wxGrid::GetColMinimalWidth(int col) const
+void wxGrid::Fit()
 {
 {
-    wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol);
-    return obj ? (int)obj : WXGRID_MIN_COL_WIDTH;
+    AutoSize();
 }
 
 }
 
-//
-// ------ cell value accessor functions
-//
+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
     if ( m_table )
     {
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
     if ( m_table )
     {
-        m_table->SetValue( row, col, s.c_str() );
+        m_table->SetValue( row, col, s );
         if ( !GetBatchCount() )
         {
             wxClientDC dc( m_gridWin );
         if ( !GetBatchCount() )
         {
             wxClientDC dc( m_gridWin );
@@ -6333,15 +8474,16 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
             DrawCell( dc, wxGridCellCoords(row, col) );
         }
 
             DrawCell( dc, wxGridCellCoords(row, col) );
         }
 
-#if 0  // TODO: edit in place
-
         if ( m_currentCellCoords.GetRow() == row &&
         if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col )
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlShown())
+             // Note: If we are using IsCellEditControlEnabled,
+             // this interacts badly with calling SetCellValue from
+             // an EVT_GRID_CELL_CHANGE handler.
         {
         {
-            SetEditControlValue( s );
+            HideCellEditControl();
+            ShowCellEditControl(); // will reread data from table
         }
         }
-#endif
-
     }
 }
 
     }
 }
 
@@ -6352,317 +8494,106 @@ 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 ( IsSelection() && !addToSelected )
+        ClearSelection();
 
 
-        if ( oldTop > row )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
-        }
+    m_selection->SelectRow( row, FALSE, addToSelected );
+}
 
 
-        if ( oldLeft > 0 )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
 
 
-            m_selectedTopLeft.SetCol( 0 );
-        }
+void wxGrid::SelectCol( int col, bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();
 
 
-        if ( oldBottom < row )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( row );
-        }
+    m_selection->SelectCol( col, FALSE, addToSelected );
+}
 
 
-        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();
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+                          bool addToSelected )
+{
+    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 );
-    }
+    m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+                              FALSE, addToSelected );
+}
 
 
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
 
 
-    GetEventHandler()->ProcessEvent(gridEvt);
+void wxGrid::SelectAll()
+{
+    if ( m_numRows > 0 && m_numCols > 0 )
+        m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
 }
 
 }
 
+//
+// ------ Cell, row and col deselection
+//
 
 
-void wxGrid::SelectCol( int col, bool addToSelected )
+void wxGrid::DeselectRow( int row )
 {
 {
-    if ( IsSelection() && addToSelected )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
     {
     {
-        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]) );
+        if ( m_selection->IsInSelection(row, 0 ) )
+            m_selection->ToggleCellSelection( row, 0);
     }
     else
     {
     }
     else
     {
-        wxRect r;
-
-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
-
-        m_selectedTopLeft.Set( 0, col );
-        m_selectedBottomRight.Set( m_numRows-1, col );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );
+        int nCols = GetNumberCols();
+        for ( int i = 0; i < nCols ; i++ )
+        {
+            if ( m_selection->IsInSelection(row, i ) )
+                m_selection->ToggleCellSelection( row, i);
+        }
     }
     }
-
-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
-
-    GetEventHandler()->ProcessEvent(gridEvt);
 }
 
 }
 
-
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::DeselectCol( int col )
 {
 {
-    int temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
-
-    if ( topRow > bottomRow )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
     {
     {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
-    }
-
-    if ( leftCol > rightCol )
-    {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
+        if ( m_selection->IsInSelection(0, col ) )
+            m_selection->ToggleCellSelection( 0, col);
     }
     }
-
-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
-    if ( m_selectedTopLeft != updateTopLeft ||
-         m_selectedBottomRight != updateBottomRight )
+    else
     {
     {
-        // Compute two optimal update rectangles:
-        // Either one rectangle is a real subset of the
-        // other, or they are (almost) disjoint!
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
-        int     i;
-
-        // Store intermediate values
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
-        // Determine the outer/inner coordinates.
-        if (oldLeft > leftCol)
-        {
-            temp = oldLeft;
-            oldLeft = leftCol;
-            leftCol = temp;
-        }
-        if (oldTop > topRow )
-        {
-            temp = oldTop;
-            oldTop = topRow;
-            topRow = temp;
-        }
-        if (oldRight < rightCol )
-        {
-            temp = oldRight;
-            oldRight = rightCol;
-            rightCol = temp;
-        }
-        if (oldBottom < bottomRow)
+        int nRows = GetNumberRows();
+        for ( int i = 0; i < nRows ; i++ )
         {
         {
-            temp = oldBottom;
-            oldBottom = bottomRow;
-            bottomRow = temp;
-        }
-
-        // Now, either the stuff marked old is the outer
-        // rectangle or we don't have a situation where one
-        // is contained in the other.
-
-        if ( oldLeft < leftCol )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
-        }
-
-        if ( oldTop  < topRow )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
-        }
-
-        if ( oldRight > rightCol )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
-        }
-
-        if ( oldBottom > bottomRow )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
+            if ( m_selection->IsInSelection(i, col ) )
+                m_selection->ToggleCellSelection(i, col);
         }
         }
-
-
-        // Change Selection
-        m_selectedTopLeft = updateTopLeft;
-        m_selectedBottomRight = updateBottomRight;
-
-        // various Refresh() calls
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-
-    // only generate an event if the block is not being selected by
-    // dragging the mouse (in which case the event will be generated in
-    // the mouse event handler)
-    if ( !m_isDragging )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        wxEVT_GRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
-
-        GetEventHandler()->ProcessEvent(gridEvt);
     }
 }
 
     }
 }
 
-void wxGrid::SelectAll()
+void wxGrid::DeselectCell( int row, int col )
 {
 {
-    m_selectedTopLeft.Set( 0, 0 );
-    m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+    if ( m_selection->IsInSelection(row, col) )
+        m_selection->ToggleCellSelection(row, col);
+}
 
 
-    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();
 }
 
 
 }
 
 
@@ -6704,6 +8635,9 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
+    if (right < 0 || bottom < 0 || left > cw || top > ch)
+        return wxRect( 0, 0, 0, 0);
+
     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );
     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );
@@ -6721,7 +8655,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 )
 {
@@ -6729,6 +8663,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;
@@ -6762,11 +8697,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;
@@ -6777,4 +8714,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 
 
 #endif // ifndef wxUSE_NEW_GRID
 
 
 #endif // ifndef wxUSE_NEW_GRID
-