fixed wxALL_FILES definition in Unicode build

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6ee198034a54833cf5948f2365837fba114dd5da..2f12b4028e4fa2befab24167fec0a82e3aff4b55 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2,7 +2,7 @@
 // Name:        generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Name:        generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)

-// Modified by:
+// Modified by: Robin Dunn, Vadim Zeitlin

 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)


@@ -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"


@@ -30,9 +30,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_GRID
+

 #if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
 #if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)

-#include "gridg.cpp"
-#else
+    #include "gridg.cpp"
+#else // wxUSE_NEW_GRID

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -47,14 +49,31 @@
 
 #include "wx/textfile.h"
 #include "wx/spinctrl.h"
 
 #include "wx/textfile.h"
 #include "wx/spinctrl.h"

+#include "wx/tokenzr.h"

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

+#include "wx/generic/gridsel.h"
+
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
+#else
+    #define WXUNUSED_MOTIF(identifier)  identifier
+#endif
+
+#if defined(__WXGTK__)
+    #define WXUNUSED_GTK(identifier)    WXUNUSED(identifier)
+#else
+    #define WXUNUSED_GTK(identifier)    identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>

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

-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);

 
 struct wxGridCellWithAttr
 {
 
 struct wxGridCellWithAttr
 {


@@ -72,13 +91,34 @@ 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)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -95,7 +135,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()


@@ -114,7 +156,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()


@@ -132,14 +176,16 @@ 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)
     DECLARE_EVENT_TABLE()
 };
 
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLEXPORT wxGridWindow : public wxPanel
+class WXDLLEXPORT wxGridWindow : public wxWindow

 {
 public:
     wxGridWindow()
 {
 public:
     wxGridWindow()


@@ -157,14 +203,18 @@ public:
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 

+    wxGrid* GetOwner() { return m_owner; }
+

 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );
 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     void OnPaint( wxPaintEvent &event );

+    void OnMouseWheel( wxMouseEvent& event );

     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );
     void OnMouseEvent( wxMouseEvent& event );
     void OnKeyDown( wxKeyEvent& );

+    void OnKeyUp( wxKeyEvent& );

     void OnEraseBackground( wxEraseEvent& );
 
 
     void OnEraseBackground( wxEraseEvent& );
 
 


@@ -255,14 +305,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;


@@ -270,16 +325,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);
 


@@ -287,9 +357,6 @@ private:
     wxGridDataTypeInfoArray m_typeinfo;
 };
 
     wxGridDataTypeInfoArray m_typeinfo;
 };
 

-
-
-

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


@@ -316,13 +383,38 @@ 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
+//
+//       Well, it's still seriously broken so it might be better but needs
+//       fixing anyhow
+//       -- Vadim
+static const size_t GRID_SCROLL_LINE_X = 15;  // 1;
+static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;

 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)
 static const int GRID_HASH_SIZE = 100;
 
 
 // the size of hash tables used a bit everywhere (the max number of elements
 // in these hash tables is the number of rows/columns)
 static const int GRID_HASH_SIZE = 100;
 

+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static inline int GetScrollX(int x)
+{
+    return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X;
+}
+
+static inline int GetScrollY(int y)
+{
+    return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
+}
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -334,6 +426,7 @@ static const int GRID_HASH_SIZE = 100;
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;

+    m_attr = NULL;

 }
 
 
 }
 
 


@@ -355,6 +448,10 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
 {
     // erase the background because we might not fill the cell
     wxClientDC dc(m_control->GetParent());
 {
     // erase the background because we might not fill the cell
     wxClientDC dc(m_control->GetParent());

+    wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow);
+    if (gridWindow)
+        gridWindow->GetOwner()->PrepareDC(dc);
+    

     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
     dc.DrawRectangle(rectCell);
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
     dc.DrawRectangle(rectCell);


@@ -367,6 +464,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;
     }


@@ -431,6 +530,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)
 {


@@ -441,12 +545,15 @@ void wxGridCellEditor::StartingClick()
 {
 }
 
 {
 }
 

+#if wxUSE_TEXTCTRL
+

 // ----------------------------------------------------------------------------
 // wxGridCellTextEditor
 // ----------------------------------------------------------------------------
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {
 // ----------------------------------------------------------------------------
 // wxGridCellTextEditor
 // ----------------------------------------------------------------------------
 
 wxGridCellTextEditor::wxGridCellTextEditor()
 {

+    m_maxChars = 0;

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


@@ -456,10 +563,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);
 }
 


@@ -481,16 +591,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 = rect.x && rect.y ? 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);


@@ -510,6 +636,7 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();

+    Text()->SetSelection(-1,-1);

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


@@ -548,37 +675,61 @@ void wxGridCellTextEditor::DoReset(const wxString& startValue)
     Text()->SetInsertionPointEnd();
 }
 
     Text()->SetInsertionPointEnd();
 }
 

-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);
-            }
-
-            Text()->AppendText((wxChar)keycode);
+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;

 
 

-            return;
+            default:
+                // accept 8 bit chars too if isprint() agrees
+                if ( (keycode < 255) && (isprint(keycode)) )
+                    return TRUE;

         }
         }

-

     }
 
     }
 

-    event.Skip();
+    return FALSE;
+}
+
+void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
+{
+    if ( !Text()->EmulateKeyPress(event) )
+    {
+        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() );
     wxString s( Text()->GetValue() );

-    s = s.Left(pos) + "\n" + s.Mid(pos);
+    s = s.Left(pos) + wxT("\n") + s.Mid(pos);

     Text()->SetValue(s);
     Text()->SetInsertionPoint( pos );
 #else
     Text()->SetValue(s);
     Text()->SetInsertionPoint( pos );
 #else


@@ -588,6 +739,33 @@ 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;
+        }
+    }
+}
+
+// return the value in the text control
+wxString wxGridCellTextEditor::GetValue() const
+{
+  return Text()->GetValue();
+}
+

 // ----------------------------------------------------------------------------
 // wxGridCellNumberEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellNumberEditor
 // ----------------------------------------------------------------------------


@@ -633,14 +811,19 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("this cell doesn't have numeric value") );
-
-        return;
+        m_valueOld = 0;
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToLong(&m_valueOld) && ! sValue.IsEmpty())
+        {
+            wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+            return;
+        }

     }
 
     if ( HasRange() )
     {
     }
 
     if ( HasRange() )
     {

-        Spin()->SetValue(m_valueOld);
+        Spin()->SetValue((int)m_valueOld);
+        Spin()->SetFocus();

     }
     else
     {
     }
     else
     {


@@ -652,21 +835,28 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col,
                                      wxGrid* grid)
 {
     bool changed;
                                      wxGrid* grid)
 {
     bool changed;

-    long value;
+    long value = 0;
+    wxString text;

 
     if ( HasRange() )
     {
         value = Spin()->GetValue();
         changed = value != m_valueOld;
 
     if ( HasRange() )
     {
         value = Spin()->GetValue();
         changed = value != m_valueOld;

+        if (changed)
+            text = wxString::Format(wxT("%ld"), value);

     }
     else
     {
     }
     else
     {

-        changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld);
+        text = Text()->GetValue();
+        changed = (text.IsEmpty() || text.ToLong(&value)) && (value != m_valueOld);

     }
 
     if ( changed )
     {
     }
 
     if ( changed )
     {

-        grid->GetTable()->SetValueAsLong(row, col, value);
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
+            grid->GetTable()->SetValueAsLong(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, text);

     }
 
     return changed;
     }
 
     return changed;


@@ -676,7 +866,7 @@ void wxGridCellNumberEditor::Reset()
 {
     if ( HasRange() )
     {
 {
     if ( HasRange() )
     {

-        Spin()->SetValue(m_valueOld);
+        Spin()->SetValue((int)m_valueOld);

     }
     else
     {
     }
     else
     {


@@ -684,12 +874,60 @@ void wxGridCellNumberEditor::Reset()
     }
 }
 
     }
 }
 

+bool wxGridCellNumberEditor::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_UP:
+            case WXK_DOWN:
+                return TRUE;
+
+            default:
+                if ( (keycode < 128) && isdigit(keycode) )
+                    return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+

 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 {
     if ( !HasRange() )
     {
 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 {
     if ( !HasRange() )
     {

-        long keycode = event.KeyCode();
-        if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
+        int keycode = (int) event.KeyCode();
+        if ( isdigit(keycode) || keycode == '+' || keycode == '-'
+            || keycode ==  WXK_NUMPAD0
+            || keycode ==  WXK_NUMPAD1
+            || keycode ==  WXK_NUMPAD2
+            || keycode ==  WXK_NUMPAD3
+            || keycode ==  WXK_NUMPAD4
+            || keycode ==  WXK_NUMPAD5
+            || keycode ==  WXK_NUMPAD6
+            || keycode ==  WXK_NUMPAD7
+            || keycode ==  WXK_NUMPAD8
+            || keycode ==  WXK_NUMPAD9
+            || keycode ==  WXK_ADD
+            || keycode ==  WXK_NUMPAD_ADD
+            || keycode ==  WXK_SUBTRACT
+            || keycode ==  WXK_NUMPAD_SUBTRACT)

         {
             wxGridCellTextEditor::StartingKey(event);
 
         {
             wxGridCellTextEditor::StartingKey(event);
 


@@ -701,10 +939,61 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxGridCellNumberEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // reset to default
+        m_min =
+        m_max = -1;
+    }
+    else
+    {
+        long tmp;
+        if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+        {
+            m_min = (int)tmp;
+
+            if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+            {
+                m_max = (int)tmp;
+
+                // skip the error message below
+                return;
+            }
+        }
+
+        wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
+    }
+}
+
+// return the value in the spin control if it is there (the text control otherwise)
+wxString wxGridCellNumberEditor::GetValue() const
+{
+  wxString s;
+
+  if( HasRange() )
+  {
+    long value = Spin()->GetValue();
+    s.Printf(wxT("%ld"), value);
+  }
+  else
+  {
+    s = Text()->GetValue();
+  }
+  return s;
+}
+

 // ----------------------------------------------------------------------------
 // wxGridCellFloatEditor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxGridCellFloatEditor
 // ----------------------------------------------------------------------------
 

+wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
+{
+    m_width = width;
+    m_precision = precision;
+}
+

 void wxGridCellFloatEditor::Create(wxWindow* parent,
                                    wxWindowID id,
                                    wxEvtHandler* evtHandler)
 void wxGridCellFloatEditor::Create(wxWindow* parent,
                                    wxWindowID id,
                                    wxEvtHandler* evtHandler)


@@ -726,9 +1015,13 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("this cell doesn't have float value") );
-
-        return;
+        m_valueOld = 0.0;
+        wxString sValue = table->GetValue(row, col);
+        if (! sValue.ToDouble(&m_valueOld) && ! sValue.IsEmpty())
+        {
+            wxFAIL_MSG( _T("this cell doesn't have float value") );
+            return;
+        }

     }
 
     DoBeginEdit(GetString());
     }
 
     DoBeginEdit(GetString());


@@ -737,17 +1030,19 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
 bool wxGridCellFloatEditor::EndEdit(int row, int col,
                                      wxGrid* grid)
 {
 bool wxGridCellFloatEditor::EndEdit(int row, int col,
                                      wxGrid* grid)
 {

-    double value;
-    if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) )
+    double value = 0.0;
+    wxString text(Text()->GetValue());
+
+    if ( (text.IsEmpty() || text.ToDouble(&value)) && (value != m_valueOld) )

     {
     {

-        grid->GetTable()->SetValueAsDouble(row, col, value);
+        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
+            grid->GetTable()->SetValueAsDouble(row, col, value);
+        else
+            grid->GetTable()->SetValue(row, col, text);

 
         return TRUE;
     }
 
         return TRUE;
     }

-    else
-    {
-        return FALSE;
-    }
+    return FALSE;

 }
 
 void wxGridCellFloatEditor::Reset()
 }
 
 void wxGridCellFloatEditor::Reset()


@@ -757,9 +1052,22 @@ void wxGridCellFloatEditor::Reset()
 
 void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
 {
 
 void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
 {

-    long keycode = event.KeyCode();
-    if ( isdigit(keycode) ||
-         keycode == '+' || keycode == '-' || keycode == '.' )
+    int keycode = (int)event.KeyCode();
+        if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
+            || keycode ==  WXK_NUMPAD0
+            || keycode ==  WXK_NUMPAD1
+            || keycode ==  WXK_NUMPAD2
+            || keycode ==  WXK_NUMPAD3
+            || keycode ==  WXK_NUMPAD4
+            || keycode ==  WXK_NUMPAD5
+            || keycode ==  WXK_NUMPAD6
+            || keycode ==  WXK_NUMPAD7
+            || keycode ==  WXK_NUMPAD8
+            || keycode ==  WXK_NUMPAD9
+            || keycode ==  WXK_ADD
+            || keycode ==  WXK_NUMPAD_ADD
+            || keycode ==  WXK_SUBTRACT
+            || keycode ==  WXK_NUMPAD_SUBTRACT)

     {
         wxGridCellTextEditor::StartingKey(event);
 
     {
         wxGridCellTextEditor::StartingKey(event);
 


@@ -770,6 +1078,95 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
     event.Skip();
 }
 
     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("%f");
+    }
+    else if ( m_precision == -1 )
+    {
+        // default precision
+        fmt.Printf(_T("%%%d.f"), m_width);
+    }
+    else
+    {
+        fmt.Printf(_T("%%%d.%df"), 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;
+}
+
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+

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


@@ -787,17 +1184,71 @@ void wxGridCellBoolEditor::Create(wxWindow* parent,
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {
 
 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?)
     // position it in the centre of the rectangle (TODO: support alignment?)

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

 
 

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

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

-#ifdef __WXGTK__
-    w -= 8;
-#endif // GTK
+    size.x -= 8;
+#elif defined(__WXMSW__)
+    // here too, but in other way
+    size.x += 1;
+    size.y -= 2;
+#endif

 
 

-    m_control->Move(r.x + r.width/2 - w/2, r.y + r.height/2 - h/2);
+    int hAlign = wxALIGN_CENTRE;
+    int vAlign = wxALIGN_CENTRE;
+    if (GetCellAttr())
+        GetCellAttr()->GetAlignment(& hAlign, & vAlign);
+    
+    int x = 0, y = 0;
+    if (hAlign == wxALIGN_LEFT)
+    {
+        x = r.x + 2;
+#ifdef __WXMSW__
+        x += 2;
+#endif        
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_RIGHT)
+    {
+        x = r.x + r.width - size.x - 2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_CENTRE)
+    {
+        x = r.x + r.width/2 - size.x/2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+    
+    m_control->Move(x, y);

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


@@ -819,7 +1270,10 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
     else
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
     else

-        m_startValue = !!grid->GetTable()->GetValue(row, col);
+    {
+        wxString cellval( grid->GetTable()->GetValue(row, col) );
+        m_startValue = !( !cellval || (cellval == wxT("0")) );
+    }

     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }


@@ -859,22 +1313,68 @@ void wxGridCellBoolEditor::StartingClick()
     CBox()->SetValue(!CBox()->GetValue());
 }
 
     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;
+}
+
+// return the value as "1" for true and the empty string for false
+wxString wxGridCellBoolEditor::GetValue() const
+{
+  bool bSet = CBox()->GetValue();
+  return bSet ? _T("1") : wxEmptyString;
+}
+
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellChoiceEditor
 // ----------------------------------------------------------------------------
 
 wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
 // ----------------------------------------------------------------------------
 // wxGridCellChoiceEditor
 // ----------------------------------------------------------------------------
 
 wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,

-                                               const wxChar* choices[],
+                                               const wxString choices[],

                                                bool allowOthers)
                       : m_allowOthers(allowOthers)
 {
                                                bool allowOthers)
                       : m_allowOthers(allowOthers)
 {

-    m_choices.Alloc(count);
-    for ( size_t n = 0; n < count; n++ )
+    if ( count )

     {
     {

-        m_choices.Add(choices[n]);
+        m_choices.Alloc(count);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add(choices[n]);
+        }

     }
 }
 
     }
 }
 

+wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
+{
+    wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
+    editor->m_allowOthers = m_allowOthers;
+    editor->m_choices = m_choices;
+
+    return editor;
+}
+

 void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)


@@ -896,11 +1396,16 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 

-void wxGridCellChoiceEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
-                                             wxGridCellAttr * WXUNUSED(attr))
+void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
+                                             wxGridCellAttr * attr)

 {
     // as we fill the entire client area, don't do anything here to minimize
     // flicker
 {
     // 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)
 }
 
 void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)


@@ -910,15 +1415,15 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 
     m_startValue = grid->GetTable()->GetValue(row, col);
 
 
     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_allowOthers)
+        Combo()->SetValue(m_startValue);
+    else

     {
     {

-        if (m_startValue == m_choices[i])
-        {
-            Combo()->SetSelection(i);
-            break;
-        }
+        // find the right position, or default to the first if not found
+        int pos = Combo()->FindString(m_startValue);
+        if (pos == -1)
+            pos = 0;
+        Combo()->SetSelection(pos);

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


@@ -934,7 +1439,10 @@ bool wxGridCellChoiceEditor::EndEdit(int row, int col,
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;

-    Combo()->SetValue(m_startValue);
+    if (m_allowOthers)
+        Combo()->SetValue(m_startValue);
+    else
+        Combo()->SetSelection(0);

 
     return changed;
 }
 
     return changed;
 }


@@ -945,6 +1453,31 @@ void wxGridCellChoiceEditor::Reset()
     Combo()->SetInsertionPointEnd();
 }
 
     Combo()->SetInsertionPointEnd();
 }
 

+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+{
+    if ( !params )
+    {
+        // what can we do?
+        return;
+    }
+
+    m_choices.Empty();
+
+    wxStringTokenizer tk(params, _T(','));
+    while ( tk.HasMoreTokens() )
+    {
+        m_choices.Add(tk.GetNextToken());
+    }
+}
+
+// return the value in the text control
+wxString wxGridCellChoiceEditor::GetValue() const
+{
+  return Combo()->GetValue();
+}
+
+#endif // wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------


@@ -959,11 +1492,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_TAB:
             break;
 
         case WXK_TAB:

-            event.Skip( m_grid->ProcessEvent( event ) );
+            m_grid->GetEventHandler()->ProcessEvent( event );

             break;
 
         case WXK_RETURN:
             break;
 
         case WXK_RETURN:

-            if (!m_grid->ProcessEvent(event))
+        case WXK_NUMPAD_ENTER:
+            if (!m_grid->GetEventHandler()->ProcessEvent(event))

                 m_editor->HandleReturn(event);
             break;
 
                 m_editor->HandleReturn(event);
             break;
 


@@ -980,6 +1514,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
         case WXK_ESCAPE:
         case WXK_TAB:
         case WXK_RETURN:
         case WXK_ESCAPE:
         case WXK_TAB:
         case WXK_RETURN:

+        case WXK_NUMPAD_ENTER:

             break;
 
         default:
             break;
 
         default:


@@ -987,40 +1522,58 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
     }
 }
 
     }
 }
 

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

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

-// wxGridCellRenderer
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting

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

-void wxGridCellRenderer::Draw(wxGrid& grid,
-                              wxGridCellAttr& attr,
+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,
                               wxDC& dc,
                               const wxRect& rect,

-                              int row, int col,
+                              int WXUNUSED(row), int WXUNUSED(col),

                               bool isSelected)
 {
     dc.SetBackgroundMode( wxSOLID );
 
                               bool isSelected)
 {
     dc.SetBackgroundMode( wxSOLID );
 

-    if ( isSelected )
-    {
-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
-    }
+    // grey out fields if the grid is disabled
+    if( grid.IsEnabled() )
+    {
+      if ( isSelected )
+      {
+          dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+      }
+      else
+      {
+          dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+      }
+    }  

     else
     {
     else
     {

-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+      dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));

     }
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(rect);
 }
 
     }
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(rect);
 }
 

-wxGridCellRenderer::~wxGridCellRenderer()
-{
-}
-

 // ----------------------------------------------------------------------------
 // wxGridCellStringRenderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellStringRenderer
 // ----------------------------------------------------------------------------


@@ -1034,15 +1587,24 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
 
     // TODO some special colours for attr.IsReadOnly() case?
 
 
     // TODO some special colours for attr.IsReadOnly() case?
 

-    if ( isSelected )
+    // different coloured text when the grid is disabled
+    if( grid.IsEnabled() )

     {
     {

-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
+      if ( isSelected )
+      {
+          dc.SetTextBackground( grid.GetSelectionBackground() );
+          dc.SetTextForeground( grid.GetSelectionForeground() );
+      }
+      else
+      {
+          dc.SetTextBackground( attr.GetBackgroundColour() );
+          dc.SetTextForeground( attr.GetTextColour() );
+      }

     }
     else
     {
     }
     else
     {

-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
+      dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+      dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT));

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


@@ -1052,11 +1614,18 @@ wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
                                                wxDC& dc,
                                                const wxString& text)
 {
                                                wxDC& dc,
                                                const wxString& text)
 {

-    wxCoord x, y;
+    wxCoord x = 0, y = 0, max_x = 0;

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

-    dc.GetTextExtent(text, &x, &y);
+    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(x, y);
+    return wxSize(max_x, y);

 }
 
 wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
 }
 
 wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,


@@ -1074,16 +1643,85 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
                                     int row, int col,
                                     bool isSelected)
 {
                                     int row, int col,
                                     bool isSelected)
 {

-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+    wxRect rect = rectCell;
+    rect.Inflate(-1);

 
 

-    // now we only have to draw the text
-    SetTextColoursAndFont(grid, attr, dc, isSelected);
+    // erase only this cells background, overflow cells should have been erased
+    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);

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

-    wxRect rect = rectCell;
-    rect.Inflate(-1);
+    int overflowCols = 0;
+
+    if (attr.GetOverflow())
+    {
+        int cols = grid.GetNumberCols();
+        int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
+        int cell_rows, cell_cols;
+        attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0
+        if ((best_width > rectCell.width) && (col < cols) && grid.GetTable())
+        {
+            int i, c_cols, c_rows;
+            for (i = col+cell_cols; i < cols; i++)
+            {
+                bool is_empty = TRUE;
+                for (int j=row; j<row+cell_rows; j++)
+                {
+                    // check w/ anchor cell for multicell block
+                    grid.GetCellSize(j, i, &c_rows, &c_cols);
+                    if (c_rows > 0) c_rows = 0;
+                    if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
+                    {
+                        is_empty = FALSE;
+                        break;
+                    }
+                }
+                if (is_empty)
+                    rect.width += grid.GetColSize(i);
+                else
+                {
+                    i--;
+                    break;
+                }
+                if (rect.width >= best_width) break;
+            }
+            overflowCols = i - col - cell_cols + 1;
+            if (overflowCols >= cols) overflowCols = cols - 1;
+        }
+
+        if (overflowCols > 0) // redraw overflow cells w/ proper hilight
+        {
+            hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
+            wxRect clip = rect;
+            clip.x += rectCell.width;
+            // draw each overflow cell individually
+            int col_end = col+cell_cols+overflowCols;
+            if (col_end >= grid.GetNumberCols())
+                col_end = grid.GetNumberCols() - 1;
+            for (int i = col+cell_cols; i <= col_end; i++)
+            {
+                clip.width = grid.GetColSize(i) - 1;
+                dc.DestroyClippingRegion();
+                dc.SetClippingRegion(clip);
+
+                SetTextColoursAndFont(grid, attr, dc,
+                        grid.IsInSelection(row,i));
+
+                grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+                        rect, hAlign, vAlign);
+                clip.x += grid.GetColSize(i) - 1;
+            }
+
+            rect = rectCell;
+            rect.Inflate(-1);
+            rect.width++;
+            dc.DestroyClippingRegion();
+        }
+    }
+
+    // now we only have to draw the text
+    SetTextColoursAndFont(grid, attr, dc, isSelected);

 
     grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
                            rect, hAlign, vAlign);
 
     grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
                            rect, hAlign, vAlign);


@@ -1123,7 +1761,7 @@ void wxGridCellNumberRenderer::Draw(wxGrid& grid,
     // draw the text right aligned by default
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
     // draw the text right aligned by default
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);

-    hAlign = wxRIGHT;
+    hAlign = wxALIGN_RIGHT;

 
     wxRect rect = rectCell;
     rect.Inflate(-1);
 
     wxRect rect = rectCell;
     rect.Inflate(-1);


@@ -1149,23 +1787,65 @@ wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision)
     SetPrecision(precision);
 }
 
     SetPrecision(precision);
 }
 

+wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const
+{
+    wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer;
+    renderer->m_width = m_width;
+    renderer->m_precision = m_precision;
+    renderer->m_format = m_format;
+
+    return renderer;
+}
+

 wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
 {
     wxGridTableBase *table = grid.GetTable();
 wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
 {
     wxGridTableBase *table = grid.GetTable();

+
+    bool hasDouble;
+    double val;

     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {

-        if ( !m_format )
-        {
-            m_format.Printf(_T("%%%d.%d%%f"), m_width, m_precision);
-        }
-
-        text.Printf(m_format, table->GetValueAsDouble(row, col));
+        val = table->GetValueAsDouble(row, col);
+        hasDouble = TRUE;

     }
     else
     {
         text = table->GetValue(row, col);
     }
     else
     {
         text = table->GetValue(row, col);

+        hasDouble = text.ToDouble(&val);
+    }
+
+    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;
 }
 
     return text;
 }


@@ -1184,7 +1864,7 @@ void wxGridCellFloatRenderer::Draw(wxGrid& grid,
     // draw the text right aligned by default
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
     // draw the text right aligned by default
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);

-    hAlign = wxRIGHT;
+    hAlign = wxALIGN_RIGHT;

 
     wxRect rect = rectCell;
     rect.Inflate(-1);
 
     wxRect rect = rectCell;
     rect.Inflate(-1);


@@ -1200,14 +1880,58 @@ wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid,
     return DoGetBestSize(attr, dc, GetString(grid, row, 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
 // ----------------------------------------------------------------------------
 
 wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
 
 // ----------------------------------------------------------------------------
 // wxGridCellBoolRenderer
 // ----------------------------------------------------------------------------
 
 wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
 

+// FIXME these checkbox size calculations are really ugly...
+

 // between checkmark and box
 // between checkmark and box

-static const wxCoord wxGRID_CHECKMARK_MARGIN = 4;
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;

 
 wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
                                            wxGridCellAttr& WXUNUSED(attr),
 
 wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
                                            wxGridCellAttr& WXUNUSED(attr),


@@ -1222,10 +1946,10 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
         wxCoord checkSize = 0;
         wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = 0;
         wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
         wxSize size = checkbox->GetBestSize();

-        checkSize = size.y + wxGRID_CHECKMARK_MARGIN;
+        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;

 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result

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

         checkSize -= size.y / 2;
 #endif
 
         checkSize -= size.y / 2;
 #endif
 


@@ -1248,42 +1972,191 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 
     // draw a check mark in the centre (ignoring alignment - TODO)
     wxSize size = GetBestSize(grid, attr, dc, row, col);
 
     // draw a check mark in the centre (ignoring alignment - TODO)
     wxSize size = GetBestSize(grid, attr, dc, row, col);

-    wxRect rectMark;
-    rectMark.x = rect.x + rect.width/2 - size.x/2;
-    rectMark.y = rect.y + rect.height/2 - size.y/2;
-    rectMark.width = size.x;
-    rectMark.height = size.y;

 
 

-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectMark);
+    // 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(-wxGRID_CHECKMARK_MARGIN);
+    // draw a border around checkmark
+    int vAlign, hAlign;
+    attr.GetAlignment(& hAlign, &vAlign);
+    
+    wxRect rectBorder;
+    if (hAlign == wxALIGN_CENTRE)
+    {
+        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;
+    }
+    else if (hAlign == wxALIGN_LEFT)
+    {
+        rectBorder.x = rect.x + 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;        
+    }
+    else if (hAlign == wxALIGN_RIGHT)
+    {
+        rectBorder.x = rect.x + rect.width - size.x - 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;        
+    }

 
     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 == wxT("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
 // ----------------------------------------------------------------------------
 

+void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
+{
+    m_nRef = 1;
+
+    m_isReadOnly = Unset;
+
+    m_renderer = NULL;
+    m_editor = NULL;
+
+    m_attrkind = wxGridCellAttr::Cell;
+
+    m_sizeRows = m_sizeCols = 1;
+    m_overflow = TRUE;
+
+    SetDefAttr(attrDefault);
+}
+
+wxGridCellAttr *wxGridCellAttr::Clone() const
+{
+    wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr);
+
+    if ( HasTextColour() )
+        attr->SetTextColour(GetTextColour());
+    if ( HasBackgroundColour() )
+        attr->SetBackgroundColour(GetBackgroundColour());
+    if ( HasFont() )
+        attr->SetFont(GetFont());
+    if ( HasAlignment() )
+        attr->SetAlignment(m_hAlign, m_vAlign);
+
+    attr->SetSize( m_sizeRows, m_sizeCols );
+
+    if ( m_renderer )
+    {
+        attr->SetRenderer(m_renderer);
+        m_renderer->IncRef();
+    }
+    if ( m_editor )
+    {
+        attr->SetEditor(m_editor);
+        m_editor->IncRef();
+    }
+
+    if ( IsReadOnly() )
+        attr->SetReadOnly();
+
+    attr->SetKind( m_attrkind );
+
+    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);
+    }
+
+    mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
+
+    // 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);
+}
+
+void wxGridCellAttr::SetSize(int num_rows, int num_cols)
+{
+    // The size of a cell is normally 1,1
+
+    // If this cell is larger (2,2) then this is the top left cell
+    // the other cells that will be covered (lower right cells) must be
+    // set to negative or zero values such that
+    // row + num_rows of the covered cell points to the larger cell (this cell)
+    // same goes for the col + num_cols.
+
+    // Size of 0,0 is NOT valid, neither is <=0 and any positive value
+
+    wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) ||
+                  !((num_rows<=0)&&(num_cols>0)) ||
+                  !((num_rows==0)&&(num_cols==0))),
+                  wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
+
+    m_sizeRows = num_rows;
+    m_sizeCols = num_cols;
+}
+

 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())
     {
         return m_colText;
     }
 const wxColour& wxGridCellAttr::GetTextColour() const
 {
     if (HasTextColour())
     {
         return m_colText;
     }

-    else if (m_defGridAttr != this)
+    else if (m_defGridAttr && m_defGridAttr != this)

     {
         return m_defGridAttr->GetTextColour();
     }
     {
         return m_defGridAttr->GetTextColour();
     }


@@ -1299,7 +2172,7 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const
 {
     if (HasBackgroundColour())
         return m_colBack;
 {
     if (HasBackgroundColour())
         return m_colBack;

-    else if (m_defGridAttr != this)
+    else if (m_defGridAttr && m_defGridAttr != this)

         return m_defGridAttr->GetBackgroundColour();
     else
     {
         return m_defGridAttr->GetBackgroundColour();
     else
     {


@@ -1313,7 +2186,7 @@ const wxFont& wxGridCellAttr::GetFont() const
 {
     if (HasFont())
         return m_font;
 {
     if (HasFont())
         return m_font;

-    else if (m_defGridAttr != this)
+    else if (m_defGridAttr && m_defGridAttr != this)

         return m_defGridAttr->GetFont();
     else
     {
         return m_defGridAttr->GetFont();
     else
     {


@@ -1330,7 +2203,7 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
         if ( hAlign ) *hAlign = m_hAlign;
         if ( vAlign ) *vAlign = m_vAlign;
     }
         if ( hAlign ) *hAlign = m_hAlign;
         if ( vAlign ) *vAlign = m_vAlign;
     }

-    else if (m_defGridAttr != this)
+    else if (m_defGridAttr && m_defGridAttr != this)

         m_defGridAttr->GetAlignment(hAlign, vAlign);
     else
     {
         m_defGridAttr->GetAlignment(hAlign, vAlign);
     else
     {


@@ -1338,6 +2211,11 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
     }
 }
 
     }
 }
 

+void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
+{
+    if ( num_rows ) *num_rows = m_sizeRows;
+    if ( num_cols ) *num_cols = m_sizeCols;
+}

 
 // GetRenderer and GetEditor use a slightly different decision path about
 // which attribute to use.  If a non-default attr object has one then it is
 
 // GetRenderer and GetEditor use a slightly different decision path about
 // which attribute to use.  If a non-default attr object has one then it is


@@ -1348,38 +2226,95 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
 
 wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {
 
 wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
 {

-    if ((m_defGridAttr != this || grid == NULL) && HasRenderer())
-        return m_renderer;      // use local attribute
+    wxGridCellRenderer *renderer;

 
 

-    wxGridCellRenderer* renderer = NULL;
-    if (grid)                   // get renderer for the data type
-        renderer =  grid->GetDefaultRendererForCell(row, col);
+    if ( m_renderer && this != m_defGridAttr )
+    {
+        // use the cells renderer if it has one
+        renderer = m_renderer;
+        renderer->IncRef();
+    }
+    else // no non default cell renderer
+    {
+        // get default renderer for the data type
+        if ( grid )
+        {
+            // GetDefaultRendererForCell() will do IncRef() for us
+            renderer = grid->GetDefaultRendererForCell(row, col);
+        }
+        else
+        {
+            renderer = NULL;
+        }

 
 

-    if (! renderer)
-        // if we still don't have one then use the grid default
-        renderer = m_defGridAttr->GetRenderer(NULL,0,0);
+        if ( !renderer )
+        {
+            if (m_defGridAttr &&  this != m_defGridAttr )
+            {
+                // if we still don't have one then use the grid default
+                // (no need for IncRef() here neither)
+                renderer = m_defGridAttr->GetRenderer(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_renderer which we had decided not to use initially
+                renderer = m_renderer;
+                if ( renderer )
+                    renderer->IncRef();
+            }
+        }
+    }

 
 

-    if (! renderer)
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
+    // we're supposed to always find something
+    wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));

 
     return renderer;
 }
 
 
     return renderer;
 }
 

+// same as above, except for s/renderer/editor/g

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

-    if ((m_defGridAttr != this || grid == NULL) && HasEditor())
-        return m_editor;      // use local attribute
+    wxGridCellEditor *editor;

 
 

-    wxGridCellEditor* editor = NULL;
-    if (grid)                   // get renderer for the data type
-        editor =  grid->GetDefaultEditorForCell(row, col);
+    if ( m_editor && this != m_defGridAttr )
+    {
+        // use the cells editor if it has one
+        editor = m_editor;
+        editor->IncRef();
+    }
+    else // no non default cell editor
+    {
+        // get default editor for the data type
+        if ( grid )
+        {
+            // GetDefaultEditorForCell() will do IncRef() for us
+            editor = grid->GetDefaultEditorForCell(row, col);
+        }
+        else
+        {
+            editor = NULL;
+        }

 
 

-    if (! editor)
-        // if we still don't have one then use the grid default
-        editor = m_defGridAttr->GetEditor(NULL,0,0);
+        if ( !editor )
+        {
+            if ( m_defGridAttr && this != m_defGridAttr )
+            {
+                // if we still don't have one then use the grid default
+                // (no need for IncRef() here neither)
+                editor = m_defGridAttr->GetEditor(NULL, 0, 0);
+            }
+            else // default grid attr
+            {
+                // use m_editor which we had decided not to use initially
+                editor = m_editor;
+                if ( editor )
+                    editor->IncRef();
+            }
+        }
+    }

 
 

-    if (! editor)
-        wxFAIL_MSG(wxT("Missing default cell attribute"));
+    // we're supposed to always find something
+    wxASSERT_MSG(editor, wxT("Missing default cell editor"));

 
     return editor;
 }
 
     return editor;
 }


@@ -1398,6 +2333,9 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
     }
     else
     {
     }
     else
     {

+        // free the old attribute
+        m_attrs[(size_t)n].attr->DecRef();
+

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


@@ -1535,8 +2473,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);


@@ -1544,17 +2482,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);

         }
     }
 }
         }
     }
 }


@@ -1607,28 +2547,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;
 }
 


@@ -1683,7 +2672,8 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {

-    for (size_t i=0; i<m_typeinfo.Count(); i++)
+    size_t count = m_typeinfo.Count();
+    for ( size_t i = 0; i < count; i++ )

         delete m_typeinfo[i];
 }
 
         delete m_typeinfo[i];
 }
 


@@ -1692,48 +2682,149 @@ void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
                                           wxGridCellRenderer* renderer,
                                           wxGridCellEditor* editor)
 {
                                           wxGridCellRenderer* renderer,
                                           wxGridCellEditor* editor)
 {

-    int loc;

     wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
 
     // is it already registered?
     wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
 
     // is it already registered?

-    if ((loc = FindDataType(typeName)) != -1) {
+    int loc = FindRegisteredDataType(typeName);
+    if ( loc != wxNOT_FOUND )
+    {

         delete m_typeinfo[loc];
         m_typeinfo[loc] = info;
     }
         delete m_typeinfo[loc];
         m_typeinfo[loc] = info;
     }

-    else {
+    else
+    {

         m_typeinfo.Add(info);
     }
 }
 
         m_typeinfo.Add(info);
     }
 }
 

-int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName)

 {
 {

-    int found = -1;
-
-    for (size_t i=0; i<m_typeinfo.Count(); i++) {
-        if (typeName == m_typeinfo[i]->m_typeName) {
-            found = i;
-            break;
+    size_t count = m_typeinfo.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( typeName == m_typeinfo[i]->m_typeName )
+        {
+            return i;

         }
     }
 
         }
     }
 

-    return found;
+    return wxNOT_FOUND;

 }
 
 }
 

-wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)

 {
 {

-    wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
-    return renderer;
-}
+    int index = FindRegisteredDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // check whether this is one of the standard ones, in which case
+        // register it "on the fly"
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_STRING )
+        {
+            RegisterDataType(wxGRID_VALUE_STRING,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellTextEditor);
+        } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+        if ( typeName == wxGRID_VALUE_BOOL )
+        {
+            RegisterDataType(wxGRID_VALUE_BOOL,
+                             new wxGridCellBoolRenderer,
+                             new wxGridCellBoolEditor);
+        } else
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_NUMBER )
+        {
+            RegisterDataType(wxGRID_VALUE_NUMBER,
+                             new wxGridCellNumberRenderer,
+                             new wxGridCellNumberEditor);
+        }
+        else if ( typeName == wxGRID_VALUE_FLOAT )
+        {
+            RegisterDataType(wxGRID_VALUE_FLOAT,
+                             new wxGridCellFloatRenderer,
+                             new wxGridCellFloatEditor);
+        } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+        if ( typeName == wxGRID_VALUE_CHOICE )
+        {
+            RegisterDataType(wxGRID_VALUE_CHOICE,
+                             new wxGridCellStringRenderer,
+                             new wxGridCellChoiceEditor);
+        } else
+#endif // wxUSE_COMBOBOX
+        {
+            return wxNOT_FOUND;
+        }

 
 

-wxGridCellEditor*   wxGridTypeRegistry::GetEditor(int index)
-{
-    wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
-    return editor;
+        // we get here only if just added the entry for this type, so return
+        // the last index
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
+{
+    int index = FindDataType(typeName);
+    if ( index == wxNOT_FOUND )
+    {
+        // the first part of the typename is the "real" type, anything after ':'
+        // are the parameters for the renderer
+        index = FindDataType(typeName.BeforeFirst(_T(':')));
+        if ( index == wxNOT_FOUND )
+        {
+            return wxNOT_FOUND;
+        }
+
+        wxGridCellRenderer *renderer = GetRenderer(index);
+        wxGridCellRenderer *rendererOld = renderer;
+        renderer = renderer->Clone();
+        rendererOld->DecRef();
+
+        wxGridCellEditor *editor = GetEditor(index);
+        wxGridCellEditor *editorOld = editor;
+        editor = editor->Clone();
+        editorOld->DecRef();
+
+        // do it even if there are no parameters to reset them to defaults
+        wxString params = typeName.AfterFirst(_T(':'));
+        renderer->SetParameters(params);
+        editor->SetParameters(params);
+
+        // register the new typename
+        RegisterDataType(typeName, renderer, editor);
+
+        // we just registered it, it's the last one
+        index = m_typeinfo.GetCount() - 1;
+    }
+
+    return index;
+}
+
+wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+{
+    wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+    if (renderer)
+        renderer->IncRef();
+    return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+    wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+    if (editor)
+        editor->IncRef();
+    return editor;

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

-// wxGridTableBase
-// ----------------------------------------------------------------------------
+// wxGridTableBase
+// ----------------------------------------------------------------------------

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


@@ -1765,10 +2856,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;
 }


@@ -1777,13 +2868,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);

     }
 }
 
     }
 }
 


@@ -1791,13 +2883,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);

     }
 }
 
     }
 }
 


@@ -1805,76 +2898,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;
 }


@@ -1974,7 +3050,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


@@ -2018,33 +3093,25 @@ wxGridStringTable::wxGridStringTable()
 wxGridStringTable::wxGridStringTable( int numRows, int numCols )
         : wxGridTableBase()
 {
 wxGridStringTable::wxGridStringTable( int numRows, int numCols )
         : wxGridTableBase()
 {

-    int row, col;
-

     m_data.Alloc( numRows );
 
     wxArrayString sa;
     sa.Alloc( numCols );
     m_data.Alloc( numRows );
 
     wxArrayString sa;
     sa.Alloc( numCols );

-    for ( col = 0;  col < numCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
+    sa.Add( wxEmptyString, numCols );

 
 

-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
+    m_data.Add( sa, numRows );

 }
 
 wxGridStringTable::~wxGridStringTable()
 {
 }
 
 }
 
 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();


@@ -2054,26 +3121,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;


@@ -2097,10 +3166,9 @@ void wxGridStringTable::Clear()
 
 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {
 
 bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 {

-    size_t row, col;
-

     size_t curNumRows = m_data.GetCount();
     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 )
     {


@@ -2109,16 +3177,8 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 
     wxArrayString sa;
     sa.Alloc( curNumCols );
 
     wxArrayString sa;
     sa.Alloc( curNumCols );

-    for ( col = 0;  col < curNumCols;  col++ )
-    {
-        sa.Add( wxEmptyString );
-    }
-
-    for ( row = pos;  row < pos + numRows;  row++ )
-    {
-        m_data.Insert( sa, row );
-    }
-    UpdateAttrRows( pos, numRows );
+    sa.Add( wxEmptyString, curNumCols );
+    m_data.Insert( sa, pos, numRows );

     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,


@@ -2134,25 +3194,18 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
 
 bool wxGridStringTable::AppendRows( size_t numRows )
 {
 
 bool wxGridStringTable::AppendRows( size_t numRows )
 {

-    size_t row, col;
-

     size_t curNumRows = m_data.GetCount();
     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 )
     {
         sa.Alloc( curNumCols );
 
     wxArrayString sa;
     if ( curNumCols > 0 )
     {
         sa.Alloc( curNumCols );

-        for ( col = 0;  col < curNumCols;  col++ )
-        {
-            sa.Add( wxEmptyString );
-        }
+        sa.Add( wxEmptyString, curNumCols );

     }
 
     }
 

-    for ( row = 0;  row < numRows;  row++ )
-    {
-        m_data.Add( sa );
-    }
+    m_data.Add( sa, numRows );

 
     if ( GetView() )
     {
 
     if ( GetView() )
     {


@@ -2168,17 +3221,18 @@ bool wxGridStringTable::AppendRows( size_t numRows )
 
 bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
 {
 
 bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
 {

-    size_t n;
-

     size_t curNumRows = m_data.GetCount();
 
     if ( pos >= curNumRows )
     {
     size_t curNumRows = m_data.GetCount();
 
     if ( pos >= curNumRows )
     {

-        wxString errmsg;
-        errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
-                      "Pos value is invalid for present table with %d rows",
-                      pos, numRows, curNumRows );
-        wxFAIL_MSG( wxT(errmsg) );
+        wxFAIL_MSG( wxString::Format
+                    (
+                        wxT("Called wxGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"),
+                        (unsigned long)pos,
+                        (unsigned long)numRows,
+                        (unsigned long)curNumRows
+                    ) );
+

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -2189,16 +3243,12 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
 
     if ( numRows >= curNumRows )
     {
 
     if ( numRows >= curNumRows )
     {

-        m_data.Empty();  // don't release memory just yet
+        m_data.Clear();

     }
     else
     {
     }
     else
     {

-        for ( n = 0;  n < numRows;  n++ )
-        {
-            m_data.Remove( pos );
-        }
+        m_data.RemoveAt( pos, numRows );

     }
     }

-    UpdateAttrRows( pos, -((int)numRows) );

     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,


@@ -2217,7 +3267,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 )
     {


@@ -2231,7 +3282,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,


@@ -2247,24 +3297,22 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
 
 bool wxGridStringTable::AppendCols( size_t numCols )
 {
 
 bool wxGridStringTable::AppendCols( size_t numCols )
 {

-    size_t row, n;
+    size_t row;

 
     size_t curNumRows = m_data.GetCount();
 
     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++ )
     {

-        for ( n = 0;  n < numCols;  n++ )
-        {
-            m_data[row].Add( wxEmptyString );
-        }
+        m_data[row].Add( wxEmptyString, numCols );

     }
 
     if ( GetView() )
     }
 
     if ( GetView() )


@@ -2281,18 +3329,21 @@ bool wxGridStringTable::AppendCols( size_t numCols )
 
 bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
 {
 
 bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
 {

-    size_t row, n;
+    size_t row;

 
     size_t curNumRows = m_data.GetCount();
 
     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 )
     {

-        wxString errmsg;
-        errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
-                        "Pos value is invalid for present table with %d cols",
-                        pos, numCols, curNumCols );
-        wxFAIL_MSG( wxT( errmsg ) );
+        wxFAIL_MSG( wxString::Format
+                    (
+                        wxT("Called wxGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"),
+                        (unsigned long)pos,
+                        (unsigned long)numCols,
+                        (unsigned long)curNumCols
+                    ) );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -2309,13 +3360,9 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         }
         else
         {
         }
         else
         {

-            for ( n = 0;  n < numCols;  n++ )
-            {
-                m_data[row].Remove( pos );
-            }
+            m_data[row].RemoveAt( pos, numCols );

         }
     }
         }
     }

-    UpdateAttrCols( pos, -((int)numCols) );

     if ( GetView() )
     {
         wxGridTableMessage msg( this,
     if ( GetView() )
     {
         wxGridTableMessage msg( this,


@@ -2396,19 +3443,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);
 


@@ -2422,8 +3471,8 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( 0, -y );
 
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( 0, -y );
 

-    m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawRowLabels( dc );
+    wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawRowLabels( dc , rows );

 }
 
 
 }
 
 


@@ -2433,12 +3482,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();

 }
 
 
 }
 
 


@@ -2449,19 +3509,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);
 


@@ -2475,8 +3537,8 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( -x, 0 );
 
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( -x, 0 );
 

-    m_owner->CalcColLabelsExposed( GetUpdateRegion() );
-    m_owner->DrawColLabels( dc );
+    wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+    m_owner->DrawColLabels( dc , cols );

 }
 
 
 }
 
 


@@ -2485,13 +3547,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();

 }
 
 
 }
 
 


@@ -2501,15 +3573,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;
 }


@@ -2522,13 +3596,15 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
     dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
     dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
     dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );

-
-    dc.SetPen( *wxWHITE_PEN );

     dc.DrawLine( 0, 0, client_width, 0 );
     dc.DrawLine( 0, 0, 0, client_height );
     dc.DrawLine( 0, 0, client_width, 0 );
     dc.DrawLine( 0, 0, 0, client_height );

+
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 1, 1, client_width-1, 1 );
+    dc.DrawLine( 1, 1, 1, client_height-1 );

 }
 
 
 }
 
 


@@ -2538,37 +3614,53 @@ 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();

 }
 
 
 
 //////////////////////////////////////////////////////////////////////
 
 }
 
 
 
 //////////////////////////////////////////////////////////////////////
 

-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )

 
 

-BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
+BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )

     EVT_PAINT( wxGridWindow::OnPaint )
     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()
 
 wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
 wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,

-                            wxWindowID id, const wxPoint &pos, const wxSize &size )
-        : wxPanel( parent, id, pos, size, 0, "grid window" )
+                            wxWindowID id,
+                            const wxPoint &pos,
+                            const wxSize &size )
+            : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxCLIP_CHILDREN,
+                        wxT("grid window") )
+

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;

-    SetBackgroundColour( "WHITE" );
+    SetBackgroundColour(_T("WHITE"));

 }
 
 
 }
 
 


@@ -2582,19 +3674,19 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();
     wxPaintDC dc( this );
     m_owner->PrepareDC( dc );
     wxRegion reg = GetUpdateRegion();

-    m_owner->CalcCellsExposed( reg );
-    m_owner->DrawGridCellArea( dc );
-    m_owner->DrawGridSpace( dc );
+    wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
+    m_owner->DrawGridCellArea( dc , DirtyCells);

 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif
 #if WXGRID_DRAW_LINES
     m_owner->DrawAllGridLines( dc, reg );
 #endif

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

 }
 
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {
 }
 
 
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {

-    wxPanel::ScrollWindow( dx, dy, rect );
+    wxWindow::ScrollWindow( dx, dy, rect );

     m_rowLabelWin->ScrollWindow( 0, dy, rect );
     m_colLabelWin->ScrollWindow( dx, 0, rect );
 }
     m_rowLabelWin->ScrollWindow( 0, dy, rect );
     m_colLabelWin->ScrollWindow( dx, 0, rect );
 }


@@ -2605,23 +3697,49 @@ 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();

 }
 
 }
 

+void wxGridWindow::OnKeyUp( wxKeyEvent& event )
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}

 
 

-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

 {
 }
 
 
 //////////////////////////////////////////////////////////////////////
 
 {
 }
 
 
 //////////////////////////////////////////////////////////////////////
 

+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
+
+// Internal helper macros for simpler use of that function
+
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+                           const wxArrayInt& BorderArray, int nMax,
+                           bool maxOnOverflow);
+
+#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
+                                          WXGRID_MIN_COL_WIDTH, \
+                                          m_colRights, m_numCols, TRUE)
+#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
+                                          WXGRID_MIN_ROW_HEIGHT, \
+                                          m_rowBottoms, m_numRows, TRUE)
+/////////////////////////////////////////////////////////////////////

 
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
 


@@ -2629,6 +3747,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()
 


@@ -2638,8 +3757,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();
 }


@@ -2647,8 +3767,10 @@ wxGrid::wxGrid( wxWindow *parent,
 
 wxGrid::~wxGrid()
 {
 
 wxGrid::~wxGrid()
 {

+    // Must do this or ~wxScrollHelper will pop the wrong event handler
+    SetTargetWindow(this);

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


@@ -2662,6 +3784,7 @@ wxGrid::~wxGrid()
         delete m_table;
 
     delete m_typeRegistry;
         delete m_table;
 
     delete m_typeRegistry;

+    delete m_selection;

 }
 
 
 }
 
 


@@ -2672,23 +3795,23 @@ 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_cellEditCtrlEnabled = FALSE;
 
 
     m_table        = (wxGridTableBase *) NULL;
     m_ownTable     = FALSE;
 
     m_cellEditCtrlEnabled = FALSE;
 

-    m_defaultCellAttr = new wxGridCellAttr;
-    m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+    m_defaultCellAttr = new wxGridCellAttr();

 
     // Set default cell attributes
 
     // Set default cell attributes

+    m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+    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(
     m_defaultCellAttr->SetTextColour(

-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
+        wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));

     m_defaultCellAttr->SetBackgroundColour(
     m_defaultCellAttr->SetBackgroundColour(

-        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+        wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

     m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
     m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
 
     m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
     m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
 


@@ -2700,18 +3823,9 @@ void wxGrid::Create()
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 
     m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
 

-    // data type registration: register all standard data types
-    // TODO: may be allow the app to selectively disable some of them?
+    // create the type registry

     m_typeRegistry = new wxGridTypeRegistry;
     m_typeRegistry = new wxGridTypeRegistry;

-    RegisterDataType(wxGRID_VALUE_STRING,
-                     new wxGridCellStringRenderer,
-                     new wxGridCellTextEditor);
-    RegisterDataType(wxGRID_VALUE_BOOL,
-                     new wxGridCellBoolRenderer,
-                     new wxGridCellBoolEditor);
-    RegisterDataType(wxGRID_VALUE_NUMBER,
-                     new wxGridCellNumberRenderer,
-                     new wxGridCellNumberEditor);
+    m_selection = NULL;

 
     // subwindow components that make up the wxGrid
     m_cornerLabelWin = new wxGridCornerLabelWindow( this,
 
     // subwindow components that make up the wxGrid
     m_cornerLabelWin = new wxGridCornerLabelWindow( this,


@@ -2737,40 +3851,60 @@ void wxGrid::Create()
                                   wxDefaultSize );
 
     SetTargetWindow( m_gridWin );
                                   wxDefaultSize );
 
     SetTargetWindow( m_gridWin );

+
+    Init();

 }
 
 
 }
 
 

-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 );
+
+    CalcDimensions();
+
+    m_created = TRUE;

 
     return m_created;
 }
 
 
     return m_created;
 }
 

-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
+void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+{
+    wxCHECK_RET( m_created,
+                 wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+
+    m_selection->SetSelectionMode( selmode );
+}
+
+wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
+{
+    wxCHECK_MSG( m_created, wxGrid::wxGridSelectCells,
+                 wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
+
+    return m_selection->GetSelectionMode();
+}
+
+bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
+                       wxGrid::wxGridSelectionModes selmode )

 {
     if ( m_created )
     {
         // RD: Actually, this should probably be allowed.  I think it would be
 {
     if ( m_created )
     {
         // RD: Actually, this should probably be allowed.  I think it would be

-        // nice to be able to switch multiple Tables in and out of a single
-        // View at runtime.  Is there anything in the implmentation that would
-        // prevent this?
+        //     nice to be able to switch multiple Tables in and out of a single
+        //     View at runtime.  Is there anything in the implementation 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;
     }


@@ -2783,7 +3917,10 @@ 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;

-        Init();
+        m_selection = new wxGridSelection( this, selmode );
+
+        CalcDimensions();
+

         m_created = TRUE;
     }
 
         m_created = TRUE;
     }
 


@@ -2793,12 +3930,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;
 


@@ -2815,17 +3946,20 @@ void wxGrid::Init()
 
     // init attr cache
     m_attrCache.row = -1;
 
     // init attr cache
     m_attrCache.row = -1;

+    m_attrCache.col = -1;
+    m_attrCache.attr = NULL;

 
     // TODO: something better than this ?
     //
     m_labelFont = this->GetFont();
 
     // TODO: something better than this ?
     //
     m_labelFont = this->GetFont();

-    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+//    m_labelFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+//    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );

 
 

-    m_rowLabelHorizAlign = wxLEFT;
-    m_rowLabelVertAlign  = wxCENTRE;
+    m_rowLabelHorizAlign = wxALIGN_CENTRE;
+    m_rowLabelVertAlign  = wxALIGN_CENTRE;

 
 

-    m_colLabelHorizAlign = wxCENTRE;
-    m_colLabelVertAlign  = wxTOP;
+    m_colLabelHorizAlign = wxALIGN_CENTRE;
+    m_colLabelVertAlign  = wxALIGN_CENTRE;

 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();
 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();


@@ -2836,8 +3970,11 @@ void wxGrid::Init()
     m_defaultRowHeight += 4;
 #endif
 
     m_defaultRowHeight += 4;
 #endif
 

-    m_gridLineColour = wxColour( 128, 128, 255 );
+    m_gridLineColour = wxColour( 192,192,192 );

     m_gridLinesEnabled = TRUE;
     m_gridLinesEnabled = TRUE;

+    m_cellHighlightColour = *wxBLACK;
+    m_cellHighlightPenWidth = 2;
+    m_cellHighlightROPenWidth = 1;

 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;


@@ -2856,15 +3993,20 @@ void wxGrid::Init()
 
     m_currentCellCoords = wxGridNoCellCoords;
 
 
     m_currentCellCoords = wxGridNoCellCoords;
 

-    m_selectedTopLeft = wxGridNoCellCoords;
-    m_selectedBottomRight = wxGridNoCellCoords;
-    m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
-    m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    m_selectingTopLeft = wxGridNoCellCoords;
+    m_selectingBottomRight = wxGridNoCellCoords;
+//  m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+//  m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    m_selectionBackground = *wxBLACK; 
+    m_selectionForeground = *wxWHITE; 

 
     m_editable = TRUE;  // default for whole grid
 
     m_inOnKeyDown = FALSE;
     m_batchCount = 0;
 
     m_editable = TRUE;  // default for whole grid
 
     m_inOnKeyDown = FALSE;
     m_batchCount = 0;

+
+    m_extraWidth =
+    m_extraHeight = 0;

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


@@ -2886,9 +4028,11 @@ void wxGrid::InitRowHeights()
     m_rowBottoms.Alloc( m_numRows );
 
     int rowBottom = 0;
     m_rowBottoms.Alloc( m_numRows );
 
     int rowBottom = 0;

+
+    m_rowHeights.Add( m_defaultRowHeight, m_numRows );
+

     for ( int i = 0;  i < m_numRows;  i++ )
     {
     for ( int i = 0;  i < m_numRows;  i++ )
     {

-        m_rowHeights.Add( m_defaultRowHeight );

         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );
     }
         rowBottom += m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );
     }


@@ -2902,9 +4046,11 @@ void wxGrid::InitColWidths()
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );
     int colRight = 0;
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );
     int colRight = 0;

+
+    m_colWidths.Add( m_defaultColWidth, m_numCols );
+

     for ( int i = 0;  i < m_numCols;  i++ )
     {
     for ( int i = 0;  i < m_numCols;  i++ )
     {

-        m_colWidths.Add( m_defaultColWidth );

         colRight += m_defaultColWidth;
         m_colRights.Add( colRight );
     }
         colRight += m_defaultColWidth;
         m_colRights.Add( colRight );
     }


@@ -2949,19 +4095,71 @@ void wxGrid::CalcDimensions()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

-    if ( m_numRows > 0  &&  m_numCols > 0 )
+    if ( m_rowLabelWin->IsShown() )
+        cw -= m_rowLabelWidth;
+    if ( m_colLabelWin->IsShown() )
+        ch -= m_colLabelHeight;
+
+    // grid total size
+    int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+    // take into account editor if shown
+    if( IsCellEditControlShown() )
+    {
+      int w2, h2;
+      int r = m_currentCellCoords.GetRow();
+      int c = m_currentCellCoords.GetCol();
+      int x = GetColLeft(c);
+      int y = GetRowTop(r);
+
+      // how big is the editor
+      wxGridCellAttr* attr = GetCellAttr(r, c);
+      wxGridCellEditor* editor = attr->GetEditor(this, r, c);
+      editor->GetControl()->GetSize(&w2, &h2);
+      w2 += x;
+      h2 += y;
+      if( w2 > w ) w = w2;
+      if( h2 > h ) h = h2;
+      editor->DecRef();
+      attr->DecRef();
+    }
+
+    // preserve (more or less) the previous position
+    int x, y;
+    GetViewStart( &x, &y );
+
+    // maybe we don't need scrollbars at all?
+    //
+    // also adjust the position to be valid for the new scroll rangs
+    if ( w <= cw )
+    {
+        w = x = 0;
+    }
+    else

     {
     {

-        int right = GetColRight( m_numCols-1 ) + 50;
-        int bottom = GetRowBottom( m_numRows-1 ) + 50;
+        if ( x >= w )
+            x = w - 1;
+    }

 
 

-        // 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 );
+    if ( h <= ch )
+    {
+        h = y = 0;
+    }
+    else
+    {
+        if ( y >= h )
+            y = h - 1;

     }
     }

+
+    // do set scrollbar parameters
+    SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
+                   GetScrollX(w), GetScrollY(h), x, y,
+                   GetBatchCount() != 0);
+
+    // if our OnSize() hadn't been called (it would if we have scrollbars), we
+    // still must reposition the children
+    CalcWindowSizes();

 }
 
 
 }
 
 


@@ -2990,7 +4188,18 @@ void wxGrid::CalcWindowSizes()
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;

+    bool result = FALSE;

 
 

+    // Clear the attribute cache as the attribute might refer to a different
+    // cell than stored in the cache after adding/removing rows/columns.
+    ClearAttrCache();
+    // By the same reasoning, the editor should be dismissed if columns are
+    // added or removed. And for consistency, it should IMHO always be
+    // removed, not only if the cell "underneath" it actually changes.
+    // For now, I intentionally do not save the editor's content as the
+    // cell it might want to save that stuff to might no longer exist.
+    HideCellEditControl();
+#if 0

     // if we were using the default widths/heights so far, we must change them
     // now
     if ( m_colWidths.IsEmpty() )
     // if we were using the default widths/heights so far, we must change them
     // now
     if ( m_colWidths.IsEmpty() )


@@ -3002,6 +4211,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
     {
         InitRowHeights();
     }
     {
         InitRowHeights();
     }

+#endif

 
     switch ( msg.GetId() )
     {
 
     switch ( msg.GetId() )
     {


@@ -3009,71 +4219,92 @@ 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_numRows += numRows;
+
+            if ( !m_rowHeights.IsEmpty() )

             {
             {

-                m_rowHeights.Insert( m_defaultRowHeight, pos );
-                m_rowBottoms.Insert( 0, pos );
+                m_rowHeights.Insert( m_defaultRowHeight, pos, numRows );
+                m_rowBottoms.Insert( 0, pos, numRows );
+
+                int bottom = 0;
+                if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+
+                for ( i = pos;  i < m_numRows;  i++ )
+                {
+                    bottom += m_rowHeights[i];
+                    m_rowBottoms[i] = bottom;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );

             }
             }

-            m_numRows += numRows;

 
 

-            int bottom = 0;
-            if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+            if ( m_selection )
+                m_selection->UpdateRows( pos, numRows );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider)
+                attrProvider->UpdateAttrRows( pos, numRows );

 
 

-            for ( i = pos;  i < m_numRows;  i++ )
+            if ( !GetBatchCount() )

             {
             {

-                bottom += m_rowHeights[i];
-                m_rowBottoms[i] = bottom;
+                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() )
+            {
+                m_rowHeights.Add( m_defaultRowHeight, numRows );
+                m_rowBottoms.Add( 0, numRows );
+
+                int bottom = 0;
+                if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];

 
 

-            for ( i = oldNumRows;  i < m_numRows;  i++ )
+                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 );
+                m_rowHeights.RemoveAt( pos, numRows );
+                m_rowBottoms.RemoveAt( pos, numRows );

 
                 int h = 0;
                 for ( i = 0;  i < m_numRows;  i++ )
 
                 int h = 0;
                 for ( i = 0;  i < m_numRows;  i++ )


@@ -3082,82 +4313,129 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                     m_rowBottoms[i] = h;
                 }
             }
                     m_rowBottoms[i] = h;
                 }
             }

+            if ( !m_numRows )
+            {
+                m_currentCellCoords = wxGridNoCellCoords;
+            }
+            else
+            {
+                if ( m_currentCellCoords.GetRow() >= m_numRows )
+                    m_currentCellCoords.Set( 0, 0 );
+            }

 
 

-            CalcDimensions();
+            if ( m_selection )
+                m_selection->UpdateRows( pos, -((int)numRows) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider) {
+                attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+                // No need to touch column attributes, unless we
+                // removed _all_ rows, in this case, we remove
+                // all column attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrRows.
+                if ( !GetNumberRows() )
+                    attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
+#endif
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_rowLabelWin->Refresh();
+            }

         }
         }

-        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() )
+            {
+                m_colWidths.Insert( m_defaultColWidth, pos, numCols );
+                m_colRights.Insert( 0, pos, numCols );
+
+                int right = 0;
+                if ( pos > 0 ) right = m_colRights[pos-1];
+
+                for ( i = pos;  i < m_numCols;  i++ )
+                {
+                    right += m_colWidths[i];
+                    m_colRights[i] = right;
+                }
+            }
+            if ( m_currentCellCoords == wxGridNoCellCoords )
+            {
+                // if we have just inserted cols into an empty grid the current
+                // cell will be undefined...
+                //
+                SetCurrentCell( 0, 0 );
+            }

 
 

-            for ( i = pos;  i < m_numCols;  i++ )
+            if ( m_selection )
+                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() )
+            {
+                m_colWidths.Add( m_defaultColWidth, numCols );
+                m_colRights.Add( 0, numCols );

 
 

-            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 );
+                m_colWidths.RemoveAt( pos, numCols );
+                m_colRights.RemoveAt( pos, numCols );

 
                 int w = 0;
                 for ( i = 0;  i < m_numCols;  i++ )
 
                 int w = 0;
                 for ( i = 0;  i < m_numCols;  i++ )


@@ -3166,21 +4444,54 @@ 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 );
+            }
+
+            if ( m_selection )
+                m_selection->UpdateCols( pos, -((int)numCols) );
+            wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+            if (attrProvider) {
+                attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+                // No need to touch row attributes, unless we
+                // removed _all_ columns, in this case, we remove
+                // all row attributes.
+                // I hate to do this here, but the
+                // needed data is not available inside UpdateAttrCols.
+                if ( !GetNumberCols() )
+                    attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
+            }
+            if ( !GetBatchCount() )
+            {
+                CalcDimensions();
+                m_colLabelWin->Refresh();
+            }

         }
         }

-        return TRUE;
+        result = TRUE;
+        break;

     }
 
     }
 

-    return FALSE;
+    if (result && !GetBatchCount() )
+        m_gridWin->Refresh();
+    return result;

 }
 
 
 }
 
 

-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )

 {
     wxRegionIterator iter( reg );
     wxRect r;
 
 {
     wxRegionIterator iter( reg );
     wxRect r;
 

-    m_rowLabelsExposed.Empty();
+    wxArrayInt  rowlabels;

 
     int top, bottom;
     while ( iter )
 
     int top, bottom;
     while ( iter )


@@ -3208,7 +4519,7 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
         // find the row labels within these bounds
         //
         int row;
         // find the row labels within these bounds
         //
         int row;

-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top);  row < m_numRows;  row++ )

         {
             if ( GetRowBottom(row) < top )
                 continue;
         {
             if ( GetRowBottom(row) < top )
                 continue;


@@ -3216,20 +4527,22 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
             if ( GetRowTop(row) > bottom )
                 break;
 
             if ( GetRowTop(row) > bottom )
                 break;
 

-            m_rowLabelsExposed.Add( row );
+            rowlabels.Add( row );

         }
 
         iter++ ;
     }
         }
 
         iter++ ;
     }

+
+    return rowlabels;

 }
 
 
 }
 
 

-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )

 {
     wxRegionIterator iter( reg );
     wxRect r;
 
 {
     wxRegionIterator iter( reg );
     wxRect r;
 

-    m_colLabelsExposed.Empty();
+    wxArrayInt colLabels;

 
     int left, right;
     while ( iter )
 
     int left, right;
     while ( iter )


@@ -3257,7 +4570,7 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
         // find the cells within these bounds
         //
         int col;
         // find the cells within these bounds
         //
         int col;

-        for ( col = 0;  col < m_numCols;  col++ )
+        for ( col = internalXToCol(left);  col < m_numCols;  col++ )

         {
             if ( GetColRight(col) < left )
                 continue;
         {
             if ( GetColRight(col) < left )
                 continue;


@@ -3265,22 +4578,21 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg )
             if ( GetColLeft(col) > right )
                 break;
 
             if ( GetColLeft(col) > right )
                 break;
 

-            m_colLabelsExposed.Add( col );
+            colLabels.Add( col );

         }
 
         iter++ ;
     }
         }
 
         iter++ ;
     }

+    return colLabels;

 }
 
 
 }
 
 

-void wxGrid::CalcCellsExposed( wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )

 {
     wxRegionIterator iter( reg );
     wxRect r;
 
 {
     wxRegionIterator iter( reg );
     wxRect r;
 

-    m_cellsExposed.Empty();
-    m_rowsExposed.Empty();
-    m_colsExposed.Empty();
+    wxGridCellCoordsArray  cellsExposed;

 
     int left, top, right, bottom;
     while ( iter )
 
     int left, top, right, bottom;
     while ( iter )


@@ -3309,7 +4621,7 @@ void wxGrid::CalcCellsExposed( wxRegion& reg )
         // find the cells within these bounds
         //
         int row, col;
         // find the cells within these bounds
         //
         int row, col;

-        for ( row = 0;  row < m_numRows;  row++ )
+        for ( row = internalYToRow(top);  row < m_numRows;  row++ )

         {
             if ( GetRowBottom(row) <= top )
                 continue;
         {
             if ( GetRowBottom(row) <= top )
                 continue;


@@ -3317,9 +4629,7 @@ void wxGrid::CalcCellsExposed( wxRegion& reg )
             if ( GetRowTop(row) > bottom )
                 break;
 
             if ( GetRowTop(row) > bottom )
                 break;
 

-            m_rowsExposed.Add( row );
-
-            for ( col = 0;  col < m_numCols;  col++ )
+            for ( col = internalXToCol(left);  col < m_numCols;  col++ )

             {
                 if ( GetColRight(col) <= left )
                     continue;
             {
                 if ( GetColRight(col) <= left )
                     continue;


@@ -3327,14 +4637,14 @@ void wxGrid::CalcCellsExposed( wxRegion& reg )
                 if ( GetColLeft(col) > right )
                     break;
 
                 if ( GetColLeft(col) > right )
                     break;
 

-                if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
-                    m_colsExposed.Add( col );
-                m_cellsExposed.Add( wxGridCellCoords( row, col ) );
+                cellsExposed.Add( wxGridCellCoords( row, col ) );

             }
         }
 
         iter++;
     }
             }
         }
 
         iter++;
     }

+
+    return cellsExposed;

 }
 
 
 }
 
 


@@ -3346,7 +4656,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
 
     if ( event.Dragging() )
     {
 
     if ( event.Dragging() )
     {

-        m_isDragging = TRUE;
+        if (!m_isDragging)
+        {
+            m_isDragging = TRUE;
+            m_rowLabelWin->CaptureMouse();
+        }

 
         if ( event.LeftIsDown() )
         {
 
         if ( event.LeftIsDown() )
         {


@@ -3360,7 +4674,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 )
                     {


@@ -3372,10 +4688,16 @@ 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 );
+                        if ( m_selection )
+                        {
+                            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


@@ -3387,8 +4709,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         return;
     }
 
         return;
     }
 

-    m_isDragging = FALSE;
+    if ( m_isDragging && (event.Entering() || event.Leaving()) )
+        return;

 
 

+    if (m_isDragging)
+    {
+        if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
+        m_isDragging = FALSE;
+    }

 
     // ------------ Entering or leaving the window
     //
 
     // ------------ Entering or leaving the window
     //


@@ -3412,7 +4740,31 @@ 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 ( m_selection )
+                {
+                    if ( event.ShiftDown() )
+                    {
+                        m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                                  0,
+                                                  row,
+                                                  GetNumberCols() - 1,
+                                                  event.ControlDown(),
+                                                  event.ShiftDown(),
+                                                  event.AltDown(),
+                                                  event.MetaDown() );
+                    }
+                    else
+                    {
+                        m_selection->SelectRow( row,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+                }
+

                 ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
             }
         }
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
             }
         }


@@ -3511,7 +4863,11 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 
     if ( event.Dragging() )
     {
 
     if ( event.Dragging() )
     {

-        m_isDragging = TRUE;
+        if (!m_isDragging)
+        {
+            m_isDragging = TRUE;
+            m_colLabelWin->CaptureMouse();
+        }

 
         if ( event.LeftIsDown() )
         {
 
         if ( event.LeftIsDown() )
         {


@@ -3539,10 +4895,16 @@ 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 );
+                        if ( m_selection )
+                        {
+                            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


@@ -3554,8 +4916,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         return;
     }
 
         return;
     }
 

-    m_isDragging = FALSE;
+    if ( m_isDragging && (event.Entering() || event.Leaving()) )
+        return;

 
 

+    if (m_isDragging)
+    {
+        if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
+        m_isDragging = FALSE;
+    }

 
     // ------------ Entering or leaving the window
     //
 
     // ------------ Entering or leaving the window
     //


@@ -3579,7 +4947,30 @@ 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 ( m_selection )
+                {
+                    if ( event.ShiftDown() )
+                    {
+                        m_selection->SelectBlock( 0,
+                                                  m_currentCellCoords.GetCol(),
+                                                  GetNumberRows() - 1, col,
+                                                  event.ControlDown(),
+                                                  event.ShiftDown(),
+                                                  event.AltDown(),
+                                                  event.MetaDown() );
+                    }
+                    else
+                    {
+                        m_selection->SelectCol( col,
+                                                event.ControlDown(),
+                                                event.ShiftDown(),
+                                                event.AltDown(),
+                                                event.MetaDown() );
+                    }
+                }
+

                 ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
             }
         }
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
             }
         }


@@ -3727,7 +5118,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 )


@@ -3738,7 +5131,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
 
     if ( m_winCapture )
     {
 
     if ( m_winCapture )
     {

-        m_winCapture->ReleaseMouse();
+        if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();

         m_winCapture = (wxWindow *)NULL;
     }
 
         m_winCapture = (wxWindow *)NULL;
     }
 


@@ -3778,6 +5171,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     wxGridCellCoords coords;
     XYToCell( x, y, coords );
 
     wxGridCellCoords coords;
     XYToCell( x, y, coords );
 

+    int cell_rows, cell_cols;
+    GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
+    if ((cell_rows < 0) || (cell_cols < 0))
+    {
+        coords.SetRow(coords.GetRow() + cell_rows);
+        coords.SetCol(coords.GetCol() + cell_cols);
+    }
+

     if ( event.Dragging() )
     {
         //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
     if ( event.Dragging() )
     {
         //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());


@@ -3800,8 +5201,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)


@@ -3812,20 +5216,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.

                 }
             }
         }
                 }
             }
         }


@@ -3837,7 +5250,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 )
             {


@@ -3871,206 +5285,263 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     m_isDragging = FALSE;
     m_startDragPos = wxDefaultPosition;
 
     m_isDragging = FALSE;
     m_startDragPos = wxDefaultPosition;
 

-//      if ( coords == wxGridNoCellCoords && m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
-//      {
-//          ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-//      }
-
-//      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() && coords != wxGridNoCellCoords )
+    // ------------ 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 );
+                if ( m_selection )
+                {
+                    m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+                                              m_currentCellCoords.GetCol(),
+                                              coords.GetRow(),
+                                              coords.GetCol(),
+                                              event.ControlDown(),
+                                              event.ShiftDown(),
+                                              event.AltDown(),
+                                              event.MetaDown() );
+                }

             }
             else if ( XToEdgeOfCol(x) < 0  &&
                       YToEdgeOfRow(y) < 0 )
             {
             }
             else if ( XToEdgeOfCol(x) < 0  &&
                       YToEdgeOfRow(y) < 0 )
             {

-                if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
-                                 coords.GetRow(),
-                                 coords.GetCol(),
-                                 event ) )
-                {
-                    MakeCellVisible( coords );
+                DisableCellEditControl();
+                MakeCellVisible( coords );

 
 

-                    // if this is the second click on this cell then start
-                    // the edit control
-                    if ( m_waitForSlowClick &&
-                         (coords == m_currentCellCoords) &&
-                         CanEnableCellControl())
+                if ( event.ControlDown() )
+                {
+                    if ( m_selection )

                     {
                     {

-                        EnableCellEditControl();
-
-                        wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                        attr->GetEditor(this, coords.GetRow(), coords.GetCol())->StartingClick();
-                        attr->DecRef();
-
-                        m_waitForSlowClick = FALSE;
+                        m_selection->ToggleCellSelection( coords.GetRow(),
+                                                          coords.GetCol(),
+                                                          event.ControlDown(),
+                                                          event.ShiftDown(),
+                                                          event.AltDown(),
+                                                          event.MetaDown() );

                     }
                     }

-                    else
+                    m_selectingTopLeft = wxGridNoCellCoords;
+                    m_selectingBottomRight = wxGridNoCellCoords;
+                    m_selectingKeyboard = coords;
+                }
+                else
+                {
+                    m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
+                    SetCurrentCell( coords );
+                    if ( m_selection )

                     {
                     {

-                        SetCurrentCell( coords );
-                        m_waitForSlowClick = TRUE;
+                        if ( m_selection->GetSelectionMode() !=
+                                wxGrid::wxGridSelectCells )
+                        {
+                            HighlightBlock( coords, coords );
+                        }

                     }
                 }
             }
         }
                     }
                 }
             }
         }

+    }

 
 
 
 

-        // ------------ Left double click
-        //
-        else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+    // ------------ 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 );
+                    if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                    m_winCapture = NULL;
+                }
+
+                if ( m_selection )
+                {
+                    m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                              m_selectingTopLeft.GetCol(),
+                                              m_selectingBottomRight.GetRow(),
+                                              m_selectingBottomRight.GetCol(),
+                                              event.ControlDown(),
+                                              event.ShiftDown(),
+                                              event.AltDown(),
+                                              event.MetaDown() );

                 }
 
                 }
 

+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
+

                 // Show the edit control, if it has been hidden for
                 // drag-shrinking.
                 ShowCellEditControl();
             }
                 // Show the edit control, if it has been hidden for
                 // drag-shrinking.
                 ShowCellEditControl();
             }

-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+            else

             {
             {

-                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 );
+              if( m_waitForSlowClick && CanEnableCellControl())
+              {
+                EnableCellEditControl();
+
+                wxGridCellAttr* attr = GetCellAttr(coords);
+                wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+                editor->StartingClick();
+                editor->DecRef();
+                attr->DecRef();
+
+                m_waitForSlowClick = FALSE;
+              }

             }
             }

-            else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
-            {
-                ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
-                DoEndDragResizeCol();
+        }
+        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() && coords != wxGridNoCellCoords )
+    // ------------ 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() && coords != wxGridNoCellCoords )
+    // ------------ 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() )
+    // ------------ Moving and no button action
+    //
+    else if ( event.Moving() && !event.IsButton() )
+    {
+        if( coords.GetRow() < 0 || coords.GetCol() < 0 )

         {
         {

-            int dragRow = YToEdgeOfRow( y );
-            int dragCol = XToEdgeOfCol( x );
+            // out of grid cell area
+            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;
-            }
+        int dragRow = YToEdgeOfRow( y );
+        int dragCol = XToEdgeOfCol( x );

 
 

-            if ( dragRow >= 0 )
-            {
-                m_dragRowOrCol = dragRow;
+        // 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 ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
-                {
-                    if ( CanDragRowSize() && CanDragGridSize() )
-                        ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
-                }
+        if ( dragRow >= 0 )
+        {
+            m_dragRowOrCol = dragRow;

 
 

-                return;
+            if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+            {
+                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() && CanDragGridSize() )
-                        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);

         }
         }

+    }

 }
 
 
 }
 
 


@@ -4089,6 +5560,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,


@@ -4104,6 +5576,26 @@ void wxGrid::DoEndDragResizeRow()
             rect.height = ch - rect.y;
             m_rowLabelWin->Refresh( TRUE, &rect );
             rect.width = cw;
             rect.height = ch - rect.y;
             m_rowLabelWin->Refresh( TRUE, &rect );
             rect.width = cw;

+            // if there is a multicell block, paint all of it
+            if (m_table)
+            {
+                int i, cell_rows, cell_cols, subtract_rows = 0;
+                int leftCol = XToCol(left);
+                int rightCol = XToCol(left+cw);
+                if (leftCol >= 0)
+                {
+                    if (rightCol < 0) rightCol = m_numCols;
+                    for (i=leftCol; i<rightCol; i++)
+                    {
+                        GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
+                        if (cell_rows < subtract_rows)
+                            subtract_rows = cell_rows;
+                    }
+                    rect.y = GetRowTop(m_dragRowOrCol + subtract_rows);
+                    CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+                    rect.height = ch - rect.y;
+                }
+            }

             m_gridWin->Refresh( FALSE, &rect );
         }
 
             m_gridWin->Refresh( FALSE, &rect );
         }
 


@@ -4127,6 +5619,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,


@@ -4143,6 +5636,26 @@ void wxGrid::DoEndDragResizeCol()
             rect.height = m_colLabelHeight;
             m_colLabelWin->Refresh( TRUE, &rect );
             rect.height = ch;
             rect.height = m_colLabelHeight;
             m_colLabelWin->Refresh( TRUE, &rect );
             rect.height = ch;

+            // if there is a multicell block, paint all of it
+            if (m_table)
+            {
+                int i, cell_rows, cell_cols, subtract_cols = 0;
+                int topRow = YToRow(top);
+                int bottomRow = YToRow(top+cw);
+                if (topRow >= 0)
+                {
+                    if (bottomRow < 0) bottomRow = m_numRows;
+                    for (i=topRow; i<bottomRow; i++)
+                    {
+                        GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
+                        if (cell_cols < subtract_cols)
+                            subtract_cols = cell_cols;
+                    }
+                    rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
+                    CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+                    rect.width = cw - rect.x;
+                }
+            }

             m_gridWin->Refresh( FALSE, &rect );
         }
 
             m_gridWin->Refresh( FALSE, &rect );
         }
 


@@ -4213,102 +5726,49 @@ 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 ?
-                //
-            }
+    }
+    return FALSE;
+}

 
 

-            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();
-        }
+bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+{
+    // TODO: something with updateLabels flag

 
 

-        return ok;
-    }
-    else
+    if ( !m_created )

     {
     {

+        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );

         return FALSE;
     }
         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

 }
 
 
 }
 
 

-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )

 {
     // TODO: something with updateLabels flag
 
     if ( !m_created )
     {
 {
     // TODO: something with updateLabels flag
 
     if ( !m_created )
     {

-        wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
+        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );

         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;
-    }
-}
-
-
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
-{
-    // TODO: something with updateLabels flag
-
-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
-        return FALSE;
-    }
-
-    if ( m_table )
+    if ( m_table )

     {
         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;
 }


@@ -4329,31 +5789,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();
-        }
-
-        return ok;
-    }
-    else
-    {
-        return FALSE;

     }
     }

+    return FALSE;

 }
 
 
 }
 
 


@@ -4367,27 +5807,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

 }
 
 
 }
 
 


@@ -4406,15 +5828,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;
 }


@@ -4428,63 +5844,80 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 // Generate a grid event based on a mouse event and
 // return the result of ProcessEvent()
 //
 // Generate a grid event based on a mouse event and
 // return the result of ProcessEvent()
 //

-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,

                         int row, int col,
                         wxMouseEvent& mouseEv )
 {
                         int row, int col,
                         wxMouseEvent& mouseEv )
 {

-    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
-    {
-        int rowOrCol = (row == -1 ? col : row);
-
-        wxGridSizeEvent gridEvt( GetId(),
-                                 type,
-                                 this,
-                                 rowOrCol,
-                                 mouseEv.GetX(), mouseEv.GetY(),
-                                 mouseEv.ControlDown(),
-                                 mouseEv.ShiftDown(),
-                                 mouseEv.AltDown(),
-                                 mouseEv.MetaDown() );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else if ( type == wxEVT_GRID_RANGE_SELECT )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        type,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight,
-                                        mouseEv.ControlDown(),
-                                        mouseEv.ShiftDown(),
-                                        mouseEv.AltDown(),
-                                        mouseEv.MetaDown() );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
-    else
-    {
-        wxGridEvent gridEvt( GetId(),
-                             type,
-                             this,
-                             row, col,
-                             mouseEv.GetX(), mouseEv.GetY(),
-                             mouseEv.ControlDown(),
-                             mouseEv.ShiftDown(),
-                             mouseEv.AltDown(),
-                             mouseEv.MetaDown() );
-
-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+   bool claimed;
+   bool vetoed= FALSE;
+
+   if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
+   {
+       int rowOrCol = (row == -1 ? col : row);
+
+       wxGridSizeEvent gridEvt( GetId(),
+               type,
+               this,
+               rowOrCol,
+               mouseEv.GetX() + GetRowLabelSize(),
+               mouseEv.GetY() + GetColLabelSize(),
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else if ( type == wxEVT_GRID_RANGE_SELECT )
+   {
+       // Right now, it should _never_ end up here!
+       wxGridRangeSelectEvent gridEvt( GetId(),
+               type,
+               this,
+               m_selectingTopLeft,
+               m_selectingBottomRight,
+               TRUE,
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+   else
+   {
+       wxGridEvent gridEvt( GetId(),
+               type,
+               this,
+               row, col,
+               mouseEv.GetX() + GetRowLabelSize(),
+               mouseEv.GetY() + GetColLabelSize(),
+               FALSE,
+               mouseEv.ControlDown(),
+               mouseEv.ShiftDown(),
+               mouseEv.AltDown(),
+               mouseEv.MetaDown() );
+       claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+   }
+
+   // A Veto'd event may not be `claimed' so test this first
+   if (vetoed) return -1;
+   return claimed ? 1 : 0;

 }
 
 
 // Generate a grid event of specified type and return the result
 // of ProcessEvent().
 //
 }
 
 
 // Generate a grid event of specified type and return the result
 // of ProcessEvent().
 //

-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,

                         int row, int col )
 {
                         int row, int col )
 {

+   bool claimed;
+   bool vetoed= FALSE;
+

     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
         int rowOrCol = (row == -1 ? col : row);
     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
         int rowOrCol = (row == -1 ? col : row);


@@ -4494,7 +5927,8 @@ bool wxGrid::SendEvent( const wxEventType type,
                                  this,
                                  rowOrCol );
 
                                  this,
                                  rowOrCol );
 

-        return GetEventHandler()->ProcessEvent(gridEvt);
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();

     }
     else
     {
     }
     else
     {


@@ -4503,34 +5937,116 @@ bool wxGrid::SendEvent( const wxEventType type,
                              this,
                              row, col );
 
                              this,
                              row, col );
 

-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();
+     }
+
+    // A Veto'd event may not be `claimed' so test this first
+    if (vetoed) return -1;
+    return claimed ? 1 : 0;

 }
 
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 }
 
 
 void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {

-    wxPaintDC dc( this );
+    wxPaintDC dc(this);  // needed to prevent zillions of paint events on MSW
+}

 
 

-    if ( m_currentCellCoords == wxGridNoCellCoords  &&
-         m_numRows && m_numCols )
+void wxGrid::Refresh(bool eraseb, const wxRect* rect)
+{
+    // Don't do anything if between Begin/EndBatch...
+    // EndBatch() will do all this on the last nested one anyway.
+    if (! GetBatchCount())

     {
     {

-        m_currentCellCoords.Set(0, 0);
-        ShowCellEditControl();
-    }
+        // Refresh to get correct scrolled position:
+        wxScrolledWindow::Refresh(eraseb,rect);

 
 

-    m_displayed = TRUE;
-}
+        if (rect)
+        {
+            int rect_x, rect_y, rectWidth, rectHeight;
+            int width_label, width_cell, height_label, height_cell;
+            int x, y;

 
 

+            //Copy rectangle can get scroll offsets..
+            rect_x = rect->GetX();
+            rect_y = rect->GetY();
+            rectWidth = rect->GetWidth();
+            rectHeight = rect->GetHeight();
+
+            width_label = m_rowLabelWidth - rect_x;
+            if (width_label > rectWidth) width_label = rectWidth;
+
+            height_label = m_colLabelHeight - rect_y;
+            if (height_label > rectHeight) height_label = rectHeight;
+
+            if (rect_x > m_rowLabelWidth)
+            {
+                x = rect_x - m_rowLabelWidth;
+                width_cell = rectWidth;
+            }
+            else
+            {
+                x = 0;
+                width_cell = rectWidth - (m_rowLabelWidth - rect_x);
+            }
+
+            if (rect_y > m_colLabelHeight)
+            {
+                y = rect_y - m_colLabelHeight;
+                height_cell = rectHeight;
+            }
+            else
+            {
+                y = 0;
+                height_cell = rectHeight - (m_colLabelHeight - rect_y);
+            }
+
+            // Paint corner label part intersecting rect.
+            if ( width_label > 0 && height_label > 0 )
+            {
+                wxRect anotherrect(rect_x, rect_y, width_label, height_label);
+                m_cornerLabelWin->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint col labels part intersecting rect.
+            if ( width_cell > 0 && height_label > 0 )
+            {
+                wxRect anotherrect(x, rect_y, width_cell, height_label);
+                m_colLabelWin->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint row labels part intersecting rect.
+            if ( width_label > 0 && height_cell > 0 )
+            {
+                wxRect anotherrect(rect_x, y, width_label, height_cell);
+                m_rowLabelWin->Refresh(eraseb, &anotherrect);
+            }
+
+            // Paint cell area part intersecting rect.
+            if ( width_cell > 0 && height_cell > 0 )
+            {
+                wxRect anotherrect(x, y, width_cell, height_cell);
+                m_gridWin->Refresh(eraseb, &anotherrect);
+            }
+        }
+        else
+        {
+            m_cornerLabelWin->Refresh(eraseb, NULL);
+            m_colLabelWin->Refresh(eraseb, NULL);
+            m_rowLabelWin->Refresh(eraseb, NULL);
+            m_gridWin->Refresh(eraseb, NULL);
+        }
+    }
+}

 
 

-// This is just here to make sure that CalcDimensions gets called when
-// the grid view is resized... then the size event is skipped to allow
-// the box sizers to handle everything
-//

 void wxGrid::OnSize( wxSizeEvent& event )
 {
 void wxGrid::OnSize( wxSizeEvent& event )
 {

+    // position the child windows

     CalcWindowSizes();
     CalcWindowSizes();

-    CalcDimensions();
+
+    // don't call CalcDimensions() from here, the base class handles the size
+    // changes itself
+    event.Skip();

 }
 
 
 }
 
 


@@ -4554,11 +6070,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() )


@@ -4566,63 +6077,99 @@ 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
                 {
                 }
                 else
                 {

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

                 }
                 break;
 
             case WXK_RETURN:
                 }
                 break;
 
             case WXK_RETURN:

+            case WXK_NUMPAD_ENTER:

                 if ( event.ControlDown() )
                 {
                     event.Skip();  // to let the edit control have the return
                 }
                 else
                 {
                 if ( event.ControlDown() )
                 {
                     event.Skip();  // to let the edit control have the return
                 }
                 else
                 {

-                    MoveCursorDown();
+                    if ( GetGridCursorRow() < GetNumberRows()-1 )
+                    {
+                        MoveCursorDown( event.ShiftDown() );
+                    }
+                    else
+                    {
+                        // at the bottom of a column
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }

                 }
                 break;
 
                 }
                 break;
 

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

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

-                    MoveCursorLeft();
+                {
+                    if ( GetGridCursorCol() > 0 )
+                    {
+                        MoveCursorLeft( FALSE );
+                    }
+                    else
+                    {
+                        // at left of grid
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
+                }

                 else
                 else

-                    MoveCursorRight();
+                {
+                    if ( GetGridCursorCol() < GetNumberCols()-1 )
+                    {
+                        MoveCursorRight( FALSE );
+                    }
+                    else
+                    {
+                        // at right of grid
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
+                }

                 break;
 
             case WXK_HOME:
                 break;
 
             case WXK_HOME:


@@ -4657,37 +6204,64 @@ 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() )
+                {
+                    if ( m_selection )
+                    {
+                        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(this, 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) )
+                    {
+                        // ensure cell is visble
+                        MakeCellVisible(row, col);
+                        EnableCellEditControl();
+
+                        // a problem can arise if the cell is not completely
+                        // visible (even after calling MakeCellVisible the
+                        // control is not created and calling StartingKey will
+                        // crash the app
+                        if( editor->IsCreated() && m_cellEditCtrlEnabled ) 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;


@@ -4697,6 +6271,33 @@ 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 )
+        {
+            if ( m_selection )
+            {
+                m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+                                          m_selectingTopLeft.GetCol(),
+                                          m_selectingBottomRight.GetRow(),
+                                          m_selectingBottomRight.GetCol(),
+                                          event.ControlDown(),
+                                          TRUE,
+                                          event.AltDown(),
+                                          event.MetaDown() );
+            }
+        }
+
+        m_selectingTopLeft = wxGridNoCellCoords;
+        m_selectingBottomRight = wxGridNoCellCoords;
+        m_selectingKeyboard = wxGridNoCellCoords;
+    }
+}

 
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 
 void wxGrid::OnEraseBackground(wxEraseEvent&)
 {


@@ -4710,128 +6311,380 @@ 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();
         DisableCellEditControl();
 
     {
         HideCellEditControl();
         DisableCellEditControl();
 

-        // Clear the old current cell highlight
-        wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
-
-        // Otherwise refresh redraws the highlight!
-        m_currentCellCoords = coords;
-
-        m_gridWin->Refresh( FALSE, &r );
-    }
-
-    m_currentCellCoords = coords;
+        if ( IsVisible( m_currentCellCoords, FALSE ) )
+        {
+            wxRect r;
+            r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+            if ( !m_gridLinesEnabled )
+            {
+                r.x--;
+                r.y--;
+                r.width++;
+                r.height++;
+            }

 
 

-    if ( m_displayed )
-    {
-        wxClientDC dc(m_gridWin);
-        PrepareDC(dc);
+            wxGridCellCoordsArray cells = CalcCellsExposed( r );

 
 

-        wxGridCellAttr* attr = GetCellAttr(coords);
-        DrawCellHighlight(dc, attr);
-        attr->DecRef();
+            // Otherwise refresh redraws the highlight!
+            m_currentCellCoords = coords;

 
 

-        if ( IsSelection() )
-        {
-            wxRect r( SelectionToDeviceRect() );
-            ClearSelection();
-            if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+            DrawGridCellArea(dc,cells);
+            DrawAllGridLines( dc, r );

         }
     }
         }
     }

-}
-
-
-//
-// ------ functions to get/send data (see also public functions)
-//

 
 

-bool wxGrid::GetModelValues()
-{
-    if ( m_table )
-    {
-        // all we need to do is repaint the grid
-        //
-        m_gridWin->Refresh();
-        return TRUE;
-    }
+    m_currentCellCoords = coords;

 
 

-    return FALSE;
+    wxGridCellAttr* attr = GetCellAttr(coords);
+    DrawCellHighlight(dc, attr);
+    attr->DecRef();

 }
 
 
 }
 
 

-bool wxGrid::SetModelValues()
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )

 {
 {

-    int row, col;
+    int temp;
+    wxGridCellCoords updateTopLeft, updateBottomRight;

 
 

-    if ( m_table )
+    if ( m_selection )

     {
     {

-        for ( row = 0;  row < m_numRows;  row++ )
+        if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )

         {
         {

-            for ( col = 0;  col < m_numCols;  col++ )
-            {
-                m_table->SetValue( row, col, GetCellValue(row, col) );
-            }
+            leftCol = 0;
+            rightCol = GetNumberCols() - 1;
+        }
+        else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+        {
+            topRow = 0;
+            bottomRow = GetNumberRows() - 1;

         }
         }

-
-        return TRUE;

     }
 
     }
 

-    return FALSE;
-}
-
-
-
-// Note - this function only draws cells that are in the list of
-// exposed cells (usually set from the update region by
-// CalcExposedCells)
-//
-void wxGrid::DrawGridCellArea( wxDC& dc )
-{
-    if ( !m_numRows || !m_numCols ) return;
-
-    size_t i;
-    size_t numCells = m_cellsExposed.GetCount();
-
-    for ( i = 0;  i < numCells;  i++ )
+    if ( topRow > bottomRow )

     {
     {

-        DrawCell( dc, m_cellsExposed[i] );
+        temp = topRow;
+        topRow = bottomRow;
+        bottomRow = temp;

     }
     }

-}

 
 

+    if ( leftCol > rightCol )
+    {
+        temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;
+    }

 
 

-void wxGrid::DrawGridSpace( wxDC& dc )
+    updateTopLeft = wxGridCellCoords( topRow, leftCol );
+    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+    // First the case that we selected a completely new area
+    if ( m_selectingTopLeft == wxGridNoCellCoords ||
+         m_selectingBottomRight == wxGridNoCellCoords )
+    {
+        wxRect rect;
+        rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
+                                  wxGridCellCoords ( bottomRow, rightCol ) );
+        m_gridWin->Refresh( FALSE, &rect );
+    }
+    // Now handle changing an existing selection area.
+    else if ( m_selectingTopLeft != updateTopLeft ||
+              m_selectingBottomRight != updateBottomRight )
+    {
+        // Compute two optimal update rectangles:
+        // Either one rectangle is a real subset of the
+        // other, or they are (almost) disjoint!
+        wxRect  rect[4];
+        bool    need_refresh[4];
+        need_refresh[0] =
+        need_refresh[1] =
+        need_refresh[2] =
+        need_refresh[3] = FALSE;
+        int     i;
+
+        // Store intermediate values
+        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
+        wxCoord oldTop    = m_selectingTopLeft.GetRow();
+        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+        // Determine the outer/inner coordinates.
+        if (oldLeft > leftCol)
+        {
+            temp = oldLeft;
+            oldLeft = leftCol;
+            leftCol = temp;
+        }
+        if (oldTop > topRow )
+        {
+            temp = oldTop;
+            oldTop = topRow;
+            topRow = temp;
+        }
+        if (oldRight < rightCol )
+        {
+            temp = oldRight;
+            oldRight = rightCol;
+            rightCol = temp;
+        }
+        if (oldBottom < bottomRow)
+        {
+            temp = oldBottom;
+            oldBottom = bottomRow;
+            bottomRow = temp;
+        }
+
+        // Now, either the stuff marked old is the outer
+        // rectangle or we don't have a situation where one
+        // is contained in the other.
+
+        if ( oldLeft < leftCol )
+        {
+            // Refresh the newly selected or deselected
+            // area to the left of the old or new selection.
+            need_refresh[0] = TRUE;
+            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            oldLeft ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            leftCol - 1 ) );
+        }
+
+        if ( oldTop  < topRow )
+        {
+            // Refresh the newly selected or deselected
+            // area above the old or new selection.
+            need_refresh[1] = TRUE;
+            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            leftCol ),
+                                         wxGridCellCoords ( topRow - 1,
+                                                            rightCol ) );
+        }
+
+        if ( oldRight > rightCol )
+        {
+            // Refresh the newly selected or deselected
+            // area to the right of the old or new selection.
+            need_refresh[2] = TRUE;
+            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            rightCol + 1 ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            oldRight ) );
+        }
+
+        if ( oldBottom > bottomRow )
+        {
+            // Refresh the newly selected or deselected
+            // area below the old or new selection.
+            need_refresh[3] = TRUE;
+            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+                                                            leftCol ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            rightCol ) );
+        }
+
+        // various Refresh() calls
+        for (i = 0; i < 4; i++ )
+            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+                m_gridWin->Refresh( FALSE, &(rect[i]) );
+    }
+    // Change Selection
+    m_selectingTopLeft = updateTopLeft;
+    m_selectingBottomRight = updateBottomRight;
+}
+
+//
+// ------ functions to get/send data (see also public functions)
+//
+
+bool wxGrid::GetModelValues()

 {
 {

-    if ( m_numRows  &&  m_numCols )
+    // Hide the editor, so it won't hide a changed value.
+    HideCellEditControl();
+
+    if ( m_table )

     {
     {

-        int cw, ch;
-        m_gridWin->GetClientSize( &cw, &ch );
+        // all we need to do is repaint the grid
+        //
+        m_gridWin->Refresh();
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+bool wxGrid::SetModelValues()
+{
+    int row, col;
+
+    // Disable the editor, so it won't hide a changed value.
+    // Do we also want to save the current value of the editor first?
+    // I think so ...
+    DisableCellEditControl();
+
+    if ( m_table )
+    {
+        for ( row = 0;  row < m_numRows;  row++ )
+        {
+            for ( col = 0;  col < m_numCols;  col++ )
+            {
+                m_table->SetValue( row, col, GetCellValue(row, col) );
+            }
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+
+// Note - this function only draws cells that are in the list of
+// exposed cells (usually set from the update region by
+// CalcExposedCells)
+//
+void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
+{
+    if ( !m_numRows || !m_numCols ) return;
+
+    int i, numCells = cells.GetCount();
+    int row, col, cell_rows, cell_cols;
+    wxGridCellCoordsArray redrawCells;

 
 

-        int right, bottom;
-        CalcUnscrolledPosition( cw, ch, &right, &bottom );
+    for ( i = numCells-1; i >= 0;  i-- )
+    {
+        row = cells[i].GetRow();
+        col = cells[i].GetCol();
+        GetCellSize( row, col, &cell_rows, &cell_cols );

 
 

-        if ( right > GetColRight(m_numCols-1)  ||
-             bottom > GetRowBottom(m_numRows-1) )
+        // If this cell is part of a multicell block, find owner for repaint
+        if ( cell_rows <= 0 || cell_cols <= 0 )

         {
         {

-            int left, top;
-            CalcUnscrolledPosition( 0, 0, &left, &top );
+            wxGridCellCoords cell(row+cell_rows, col+cell_cols);
+            bool marked = FALSE;
+            for ( int j = 0;  j < numCells;  j++ )
+            {
+                if ( cell == cells[j] )
+                {
+                    marked = TRUE;
+                    break;
+                }
+            }
+            if (!marked)
+            {
+                int count = redrawCells.GetCount();
+                for (int j = 0; j < count; j++)
+                {
+                    if ( cell == redrawCells[j] )
+                    {
+                        marked = TRUE;
+                        break;
+                    }
+                }
+                if (!marked) redrawCells.Add( cell );
+            }
+            continue; // don't bother drawing this cell
+        }

 
 

-            dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
-            dc.SetPen( *wxTRANSPARENT_PEN );
+        // If this cell is empty, find cell to left that might want to overflow
+        if (m_table && m_table->IsEmptyCell(row, col))
+        {
+            for ( int l = 0; l < cell_rows; l++ )
+            {
+                // find a cell in this row to left alreay marked for repaint
+                int left = col;
+                for (int k = 0; k < int(redrawCells.GetCount()); k++)
+                    if ((redrawCells[k].GetCol() < left) &&
+                        (redrawCells[k].GetRow() == row))
+                        left=redrawCells[k].GetCol();

 
 

-            if ( right > GetColRight(m_numCols-1) )
-                dc.DrawRectangle( GetColRight(m_numCols-1)+1, top,
-                                  right - GetColRight(m_numCols-1), ch );
+                if (left == col) left = 0; // oh well

 
 

-            if ( bottom > GetRowBottom(m_numRows-1) )
-                dc.DrawRectangle( left, GetRowBottom(m_numRows-1)+1,
-                                  cw, bottom - GetRowBottom(m_numRows-1) );
+                for (int j = col-1; j >= left; j--)
+                {
+                    if (!m_table->IsEmptyCell(row+l, j))
+                    {
+                        if (GetCellOverflow(row+l, j))
+                        {
+                            wxGridCellCoords cell(row+l, j);
+                            bool marked = FALSE;
+
+                            for (int k = 0; k < numCells; k++)
+                            {
+                                if ( cell == cells[k] )
+                                {
+                                    marked = TRUE;
+                                    break;
+                                }
+                            }
+                            if (!marked)
+                            {
+                                int count = redrawCells.GetCount();
+                                for (int k = 0; k < count; k++)
+                                {
+                                    if ( cell == redrawCells[k] )
+                                    {
+                                        marked = TRUE;
+                                        break;
+                                    }
+                                }
+                                if (!marked) redrawCells.Add( cell );
+                            }
+                        }
+                        break;
+                    }
+                }
+            }

         }
         }

+        DrawCell( dc, cells[i] );

     }
     }

+
+    numCells = redrawCells.GetCount();
+
+    for ( i = numCells - 1; i >= 0;  i-- )
+    {
+        DrawCell( dc, redrawCells[i] );
+    }
+}
+
+
+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);
+      }
+  }

 }
 
 
 }
 
 


@@ -4853,24 +6706,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(this, 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(this, 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();


@@ -4884,19 +6736,34 @@ 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
+        // use the cellHighlightColour if the cell is inside a selection, this
+        // will ensure the cell is always visible.
+        dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(rect);
+    }

 
 #if 0
         // VZ: my experiments with 3d borders...
 
 #if 0
         // VZ: my experiments with 3d borders...


@@ -4930,20 +6797,31 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
 
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 

+    wxRect rect = CellToRect( row, col );
+

     // right hand border
     //
     // right hand border
     //

-    dc.DrawLine( GetColRight(col), GetRowTop(row),
-                 GetColRight(col), GetRowBottom(row) );
+    dc.DrawLine( rect.x + rect.width, rect.y,
+                 rect.x + rect.width, rect.y + rect.height + 1 );

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

-    dc.DrawLine( GetColLeft(col), GetRowBottom(row),
-                 GetColRight(col), GetRowBottom(row) );
+    dc.DrawLine( rect.x,              rect.y + rect.height,
+                 rect.x + rect.width, rect.y + rect.height);

 }
 
 }
 

-void wxGrid::DrawHighlight(wxDC& dc)
+void wxGrid::DrawHighlight(wxDC& dc,const  wxGridCellCoordsArray& cells)

 {
 {

-    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;


@@ -4951,10 +6829,10 @@ void wxGrid::DrawHighlight(wxDC& dc)
 
     // if the active cell was repainted, repaint its highlight too because it
     // might have been damaged by the grid lines
 
     // if the active cell was repainted, repaint its highlight too because it
     // might have been damaged by the grid lines

-    size_t count = m_cellsExposed.GetCount();
+    size_t count = cells.GetCount();

     for ( size_t n = 0; n < count; n++ )
     {
     for ( size_t n = 0; n < count; n++ )
     {

-        if ( m_cellsExposed[n] == m_currentCellCoords )
+        if ( cells[n] == m_currentCellCoords )

         {
             wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
             DrawCellHighlight(dc, attr);
         {
             wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
             DrawCellHighlight(dc, attr);


@@ -4969,15 +6847,19 @@ 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 !WXGRID_DRAW_LINES
+    return;
+#endif
+

     if ( !m_gridLinesEnabled ||
          !m_numRows ||
          !m_numCols ) return;
 
     int top, bottom, left, right;
 
     if ( !m_gridLinesEnabled ||
          !m_numRows ||
          !m_numCols ) return;
 
     int top, bottom, left, right;
 

-#ifndef __WXGTK__
+#if 0  //#ifndef __WXGTK__

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


@@ -5007,12 +6889,49 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
     right = wxMin( right, GetColRight(m_numCols - 1) );
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     right = wxMin( right, GetColRight(m_numCols - 1) );
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 

+    // no gridlines inside multicells, clip them out
+    int leftCol   = XToCol(left);
+    int topRow    = YToRow(top);
+    int rightCol  = XToCol(right);
+    int bottomRow = YToRow(bottom);
+    wxRegion clippedcells(0, 0, cw, ch);
+
+    if ((leftCol >= 0) && (topRow >= 0))
+    {
+        if (rightCol  < 0) rightCol  = m_numCols;
+        if (bottomRow < 0) bottomRow = m_numRows;
+
+        int i, j, cell_rows, cell_cols;
+        wxRect rect;
+
+        for (j=topRow; j<bottomRow; j++)
+        {
+            for (i=leftCol; i<rightCol; i++)
+            {
+                GetCellSize( j, i, &cell_rows, &cell_cols );
+                if ((cell_rows > 1) || (cell_cols > 1))
+                {
+                    rect = CellToRect(j,i);
+                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                    clippedcells.Subtract(rect);
+                }
+                else if ((cell_rows < 0) || (cell_cols < 0))
+                {
+                    rect = CellToRect(j+cell_rows, i+cell_cols);
+                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                    clippedcells.Subtract(rect);
+                }
+            }
+        }
+    }
+    dc.SetClippingRegion( clippedcells );
+

     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
     // horizontal grid lines
     //
     int i;
     dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
 
     // horizontal grid lines
     //
     int i;

-    for ( i = 0; i < m_numRows; i++ )
+    for ( i = internalYToRow(top); i < m_numRows; i++ )

     {
         int bot = GetRowBottom(i) - 1;
 
     {
         int bot = GetRowBottom(i) - 1;
 


@@ -5030,7 +6949,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
 
     // vertical grid lines
     //
 
     // vertical grid lines
     //

-    for ( i = 0; i < m_numCols; i++ )
+    for ( i = internalXToCol(left); i < m_numCols; i++ )

     {
         int colRight = GetColRight(i) - 1;
         if ( colRight > right )
     {
         int colRight = GetColRight(i) - 1;
         if ( colRight > right )


@@ -5043,19 +6962,20 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }

+    dc.DestroyClippingRegion();

 }
 
 
 }
 
 

-void wxGrid::DrawRowLabels( wxDC& dc )
+void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)

 {
 {

-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numRows ) return;

 
     size_t i;
 
     size_t i;

-    size_t numLabels = m_rowLabelsExposed.GetCount();
+    size_t numLabels = rows.GetCount();

 
     for ( i = 0;  i < numLabels;  i++ )
     {
 
     for ( i = 0;  i < numLabels;  i++ )
     {

-        DrawRowLabel( dc, m_rowLabelsExposed[i] );
+        DrawRowLabel( dc, rows[i] );

     }
 }
 
     }
 }
 


@@ -5068,15 +6988,17 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( m_rowLabelWidth-1, rowTop,
                  m_rowLabelWidth-1, rowBottom );
 
     dc.DrawLine( m_rowLabelWidth-1, rowTop,
                  m_rowLabelWidth-1, rowBottom );
 

-    dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
+    dc.DrawLine( 0, rowTop, 0, rowBottom );
+
+    dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );

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

-    dc.DrawLine( 0, rowTop, 0, rowBottom );
-    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+    dc.DrawLine( 1, rowTop, 1, rowBottom );
+    dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );

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


@@ -5094,16 +7016,16 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 }
 
 
 }
 
 

-void wxGrid::DrawColLabels( wxDC& dc )
+void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )

 {
 {

-    if ( !m_numRows || !m_numCols ) return;
+    if ( !m_numCols ) return;

 
     size_t i;
 
     size_t i;

-    size_t numLabels = m_colLabelsExposed.GetCount();
+    size_t numLabels = cols.GetCount();

 
     for ( i = 0;  i < numLabels;  i++ )
     {
 
     for ( i = 0;  i < numLabels;  i++ )
     {

-        DrawColLabel( dc, m_colLabelsExposed[i] );
+        DrawColLabel( dc, cols[i] );

     }
 }
 
     }
 }
 


@@ -5116,16 +7038,18 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     int colLeft = GetColLeft(col),
         colRight = GetColRight(col) - 1;
 
     int colLeft = GetColLeft(col),
         colRight = GetColRight(col) - 1;
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( colRight, 0,
                  colRight, m_colLabelHeight-1 );
 
     dc.DrawLine( colRight, 0,
                  colRight, m_colLabelHeight-1 );
 

+    dc.DrawLine( colLeft, 0, colRight, 0 );
+

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

-                 colRight, m_colLabelHeight-1 );
+                 colRight+1, m_colLabelHeight-1 );

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

-    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
-    dc.DrawLine( colLeft, 0, colRight, 0 );
+    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 1, colRight, 1 );

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


@@ -5146,64 +7070,85 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
 }
 
     DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
 }
 

-

 void wxGrid::DrawTextRectangle( wxDC& dc,
                                 const wxString& value,
                                 const wxRect& rect,
                                 int horizAlign,
                                 int vertAlign )
 void wxGrid::DrawTextRectangle( wxDC& dc,
                                 const wxString& value,
                                 const wxRect& rect,
                                 int horizAlign,
                                 int vertAlign )

+{
+    wxArrayString lines;
+
+    StringToLines( value, lines );
+
+
+    //Forward to new API.
+    DrawTextRectangle(  dc,
+                        lines,
+                        rect,
+                        horizAlign,
+                        vertAlign );
+
+}
+
+void wxGrid::DrawTextRectangle( wxDC& dc,
+                                const wxArrayString& lines,
+                                const wxRect& rect,
+                                int horizAlign,
+                                int vertAlign )

 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;
 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;

-    wxArrayString lines;
+    int nLines;

 
     dc.SetClippingRegion( rect );
 
     dc.SetClippingRegion( rect );

-    StringToLines( value, lines );
-    if ( lines.GetCount() )
+
+    nLines = lines.GetCount();
+    if( nLines > 0 )

     {
     {

-        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
-        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+      int l;
+      float x, y;
+      GetTextBoxSize(dc, lines, &textWidth, &textHeight);
+      switch( vertAlign )
+      {
+        case wxALIGN_BOTTOM:
+          y = rect.y + (rect.height - textHeight - 1);
+          break;

 
 

-        float x, y;
-        switch ( horizAlign )
-        {
-            case wxRIGHT:
-                x = rect.x + (rect.width - textWidth - 1);
-                break;
+        case wxALIGN_CENTRE:
+          y = rect.y + ((rect.height - textHeight)/2);
+          break;

 
 

-            case wxCENTRE:
-                x = rect.x + ((rect.width - textWidth)/2);
-                break;
+        case wxALIGN_TOP:
+        default:
+          y = rect.y + 1;
+          break;
+      }

 
 

-            case wxLEFT:
-            default:
-                x = rect.x + 1;
-                break;
-        }
+      // Align each line of a multi-line label
+      for( l = 0; l < nLines; l++ )
+      {
+        dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);

 
 

-        switch ( vertAlign )
+        switch( horizAlign )

         {
         {

-            case wxBOTTOM:
-                y = rect.y + (rect.height - textHeight - 1);
-                break;
+          case wxALIGN_RIGHT:
+            x = rect.x + (rect.width - lineWidth - 1);
+            break;

 
 

-            case wxCENTRE:
-                y = rect.y + ((rect.height - textHeight)/2);
-                break;
+          case wxALIGN_CENTRE:
+            x = rect.x + ((rect.width - lineWidth)/2);
+            break;

 
 

-            case wxTOP:
-            default:
-                y = rect.y + 1;
-                break;
+          case wxALIGN_LEFT:
+          default:
+            x = rect.x + 1;
+            break;

         }
 
         }
 

-        for ( size_t i = 0;  i < lines.GetCount();  i++ )
-        {
-            dc.DrawText( lines[i], (long)x, (long)y );
-            y += lineHeight;
-        }
+        dc.DrawText( lines[l], (int)x, (int)y );
+        y += lineHeight;
+      }

     }
     }

-

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 


@@ -5243,7 +7188,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
 
 
 void wxGrid::GetTextBoxSize( wxDC& dc,
 
 
 void wxGrid::GetTextBoxSize( wxDC& dc,

-                             wxArrayString& lines,
+                             const wxArrayString& lines,

                              long *width, long *height )
 {
     long w = 0;
                              long *width, long *height )
 {
     long w = 0;


@@ -5262,6 +7207,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


@@ -5274,12 +7248,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);

     }
 }
 
     }
 }
 


@@ -5294,11 +7264,11 @@ void wxGrid::EnableCellEditControl( bool enable )
 
     if ( enable != m_cellEditCtrlEnabled )
     {
 
     if ( enable != m_cellEditCtrlEnabled )
     {

-        // TODO allow the app to Veto() this event?
-        SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN);
-

         if ( enable )
         {
         if ( enable )
         {

+            if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+                return;
+

             // this should be checked by the caller!
             wxASSERT_MSG( CanEnableCellControl(),
                           _T("can't enable editing for this cell!") );
             // this should be checked by the caller!
             wxASSERT_MSG( CanEnableCellControl(),
                           _T("can't enable editing for this cell!") );


@@ -5310,6 +7280,9 @@ void wxGrid::EnableCellEditControl( bool enable )
         }
         else
         {
         }
         else
         {

+            //FIXME:add veto support
+            SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
+

             HideCellEditControl();
             SaveEditControlValue();
 
             HideCellEditControl();
             SaveEditControlValue();
 


@@ -5341,12 +7314,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


@@ -5355,6 +7355,17 @@ void wxGrid::ShowCellEditControl()
             int row = m_currentCellCoords.GetRow();
             int col = m_currentCellCoords.GetCol();
 
             int row = m_currentCellCoords.GetRow();
             int col = m_currentCellCoords.GetCol();
 

+            // if this is part of a multicell, find owner (topleft)
+            int cell_rows, cell_cols;
+            GetCellSize( row, col, &cell_rows, &cell_cols );
+            if ( cell_rows <= 0 || cell_cols <= 0 )
+            {
+                row += cell_rows;
+                col += cell_cols;
+                m_currentCellCoords.SetRow( row );
+                m_currentCellCoords.SetCol( col );
+            }
+

             // convert to scrolled coords
             //
             CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
             // convert to scrolled coords
             //
             CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );


@@ -5371,8 +7382,13 @@ void wxGrid::ShowCellEditControl()
 #endif // 0
 
             // cell is shifted by one pixel
 #endif // 0
 
             // cell is shifted by one pixel

-            rect.x--;
-            rect.y--;
+            // However, don't allow x or y to become negative
+            // since the SetSize() method interprets that as
+            // "don't change."
+            if (rect.x > 0)
+                rect.x--;
+            if (rect.y > 0)
+                rect.y--;

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


@@ -5380,14 +7396,64 @@ void wxGrid::ShowCellEditControl()
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));
             {
                 editor->Create(m_gridWin, -1,
                                new wxGridCellEditorEvtHandler(this, editor));

+
+                wxGridEditorCreatedEvent evt(GetId(),
+                                             wxEVT_GRID_EDITOR_CREATED,
+                                             this,
+                                             row,
+                                             col,
+                                             editor->GetControl());
+                GetEventHandler()->ProcessEvent(evt);

             }
 
             }
 

-            editor->SetSize( rect );

 
 

+            // resize editor to overflow into righthand cells if allowed
+            int maxWidth = rect.width;
+            wxString value = GetCellValue(row, col);
+            if ( (value != wxEmptyString) && (attr->GetOverflow()) )
+            {
+                int y;
+                GetTextExtent(value, &maxWidth, &y,
+                        NULL, NULL, &attr->GetFont());
+                if (maxWidth < rect.width) maxWidth = rect.width;
+            }
+            int client_right = m_gridWin->GetClientSize().GetWidth();
+            if (rect.x+maxWidth > client_right)
+                maxWidth = client_right - rect.x;
+
+            if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
+            {
+                GetCellSize( row, col, &cell_rows, &cell_cols );
+                // may have changed earlier
+                for (int i = col+cell_cols; i < m_numCols; i++)
+                {
+                    int c_rows, c_cols;
+                    GetCellSize( row, i, &c_rows, &c_cols );
+                    // looks weird going over a multicell
+                    if (m_table->IsEmptyCell(row,i) &&
+                            (rect.width < maxWidth) && (c_rows == 1))
+                        rect.width += GetColWidth(i);
+                    else
+                        break;
+                }
+                if (rect.GetRight() > client_right)
+                    rect.SetRight(client_right-1);
+            }
+
+            editor->SetCellAttr(attr);
+            editor->SetSize( rect );

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

+
+            // recalc dimensions in case we need to
+            // expand the scrolled window to account for editor
+            CalcDimensions();
+

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

+            editor->SetCellAttr(NULL);
+
+            editor->DecRef();

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

-         }
+        }

     }
 }
 
     }
 }
 


@@ -5400,9 +7466,16 @@ 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(this, 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();

+        // refresh whole row to the right
+        wxRect rect( CellToRect(row, col) );
+        CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
+        rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
+        m_gridWin->Refresh( FALSE, &rect );

     }
 }
 
     }
 }
 


@@ -5414,17 +7487,24 @@ void wxGrid::SaveEditControlValue()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 

+        wxString oldval = GetCellValue(row,col);
+

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

+        editor->DecRef();

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

-            SendEvent( wxEVT_GRID_CELL_CHANGE,
+            if ( SendEvent( wxEVT_GRID_CELL_CHANGE,

                        m_currentCellCoords.GetRow(),
                        m_currentCellCoords.GetRow(),

-                       m_currentCellCoords.GetCol() );
+                       m_currentCellCoords.GetCol() ) < 0 ) {
+
+                // Event has been vetoed, set the data back.
+                SetCellValue(row,col,oldval);
+            }

         }
     }
 }
         }
     }
 }


@@ -5453,31 +7533,72 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
 }
 
 
 }
 
 

-int wxGrid::YToRow( int y )
+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
+
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+                           const wxArrayInt& BorderArray, int nMax,
+                           bool maxOnOverflow)

 {
 {

-    int i;
+    if (!defaultDist)
+        defaultDist = 1;
+    size_t i_max = coord / defaultDist,
+           i_min = 0;

 
 

-    for ( i = 0;  i < m_numRows;  i++ )
+    if (BorderArray.IsEmpty())

     {
     {

-        if ( y < GetRowBottom(i) )
-            return i;
+        if((int) i_max < nMax)
+            return i_max;
+        return maxOnOverflow ? nMax - 1 : -1;

     }
 
     }
 

-    return -1;
-}
+    if ( i_max >= BorderArray.GetCount())
+        i_max = BorderArray.GetCount() - 1;
+    else
+    {
+        if ( coord >= BorderArray[i_max])
+        {
+            i_min = i_max;
+            i_max = coord / minDist;
+        }
+        if ( i_max >= BorderArray.GetCount())
+            i_max = BorderArray.GetCount() - 1;
+    }
+    if ( coord >= BorderArray[i_max])
+        return maxOnOverflow ? (int)i_max : -1;
+    if ( coord < BorderArray[0] )
+        return 0;

 
 

+    while ( i_max - i_min > 0 )
+    {
+        wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
+                    0, _T("wxGrid: internal error in CoordToRowOrCol"));
+        if (coord >=  BorderArray[ i_max - 1])
+            return i_max;
+        else
+            i_max--;
+        int median = i_min + (i_max - i_min + 1) / 2;
+        if (coord < BorderArray[median])
+            i_max = median;
+        else
+            i_min = median;
+    }
+    return i_max;
+}

 
 

-int wxGrid::XToCol( int x )
+int wxGrid::YToRow( int y )

 {
 {

-    int i;
+    return CoordToRowOrCol(y, m_defaultRowHeight,
+                           WXGRID_MIN_ROW_HEIGHT, m_rowBottoms, m_numRows, FALSE);
+}

 
 

-    for ( i = 0;  i < m_numCols;  i++ )
-    {
-        if ( x < GetColRight(i) )
-            return i;
-    }

 
 

-    return -1;
+int wxGrid::XToCol( int x )
+{
+    return CoordToRowOrCol(x, m_defaultColWidth,
+                           WXGRID_MIN_COL_WIDTH, m_colRights, m_numCols, FALSE);

 }
 
 
 }
 
 


@@ -5486,16 +7607,17 @@ int wxGrid::XToCol( int x )
 //
 int wxGrid::YToEdgeOfRow( int y )
 {
 //
 int wxGrid::YToEdgeOfRow( int y )
 {

-    int i, d;
+    int i;
+    i = internalYToRow(y);

 
 

-    for ( i = 0;  i < m_numRows;  i++ )
+    if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )

     {
     {

-        if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
-        {
-            d = abs( y - GetRowBottom(i) );
-            if ( d < WXGRID_LABEL_EDGE_ZONE )
-                return i;
-        }
+        // We know that we are in row i, test whether we are
+        // close enough to lower or upper border, respectively.
+        if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
+            return i;
+        else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
+            return i - 1;

     }
 
     return -1;
     }
 
     return -1;


@@ -5507,16 +7629,17 @@ int wxGrid::YToEdgeOfRow( int y )
 //
 int wxGrid::XToEdgeOfCol( int x )
 {
 //
 int wxGrid::XToEdgeOfCol( int x )
 {

-    int i, d;
+    int i;
+    i = internalXToCol(x);

 
 

-    for ( i = 0;  i < m_numCols;  i++ )
+    if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )

     {
     {

-        if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
-        {
-            d = abs( x - GetColRight(i) );
-            if ( d < WXGRID_LABEL_EDGE_ZONE )
-                return i;
-        }
+        // We know that we are in column i,  test whether we are
+        // close enough to right or left border, respectively.
+        if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
+            return i;
+        else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
+            return i - 1;

     }
 
     return -1;
     }
 
     return -1;


@@ -5530,12 +7653,27 @@ wxRect wxGrid::CellToRect( int row, int col )
     if ( row >= 0  &&  row < m_numRows  &&
          col >= 0  &&  col < m_numCols )
     {
     if ( row >= 0  &&  row < m_numRows  &&
          col >= 0  &&  col < m_numCols )
     {

+        int i, cell_rows, cell_cols;
+        rect.width = rect.height = 0;
+        GetCellSize( row, col, &cell_rows, &cell_cols );
+        // if negative then find multicell owner
+        if (cell_rows < 0) row += cell_rows;
+        if (cell_cols < 0) col += cell_cols;
+        GetCellSize( row, col, &cell_rows, &cell_cols );
+

         rect.x = GetColLeft(col);
         rect.y = GetRowTop(row);
         rect.x = GetColLeft(col);
         rect.y = GetRowTop(row);

-        rect.width = GetColWidth(col);
-        rect.height = GetRowHeight(row);
+        for (i=col; i<col+cell_cols; i++)
+            rect.width  += GetColWidth(i);
+        for (i=row; i<row+cell_rows; i++)
+            rect.height += GetRowHeight(i);

     }
 
     }
 

+    // if grid lines are enabled, then the area of the cell is a bit smaller
+    if (m_gridLinesEnabled) {
+        rect.width -= 1;
+        rect.height -= 1;
+    }

     return rect;
 }
 
     return rect;
 }
 


@@ -5579,6 +7717,7 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {

+

     int i;
     int xpos = -1, ypos = -1;
 
     int i;
     int xpos = -1, ypos = -1;
 


@@ -5619,7 +7758,10 @@ void wxGrid::MakeCellVisible( int row, int col )
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             // have rounding errors (this is important, because if we do, we
             // might not scroll at all and some cells won't be redrawn)
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             // have rounding errors (this is important, because if we do, we
             // might not scroll at all and some cells won't be redrawn)

-            ypos += GRID_SCROLL_LINE / 2;
+            //
+            // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
+            // scroll unit...
+            ypos += GRID_SCROLL_LINE_Y;

         }
 
         if ( left < 0 )
         }
 
         if ( left < 0 )


@@ -5628,26 +7770,21 @@ void wxGrid::MakeCellVisible( int row, int col )
         }
         else if ( right > cw )
         {
         }
         else if ( right > cw )
         {

-            int w = r.GetWidth();
-            xpos = r.GetLeft();
-            for ( i = col-1;  i >= 0;  i-- )
-            {
-                int colWidth = GetColWidth(i);
-                if ( w + colWidth > cw )
-                    break;
-
-                w += colWidth;
-                xpos -= colWidth;
-            }
+            // position the view so that the cell is on the right
+            int x0, y0;
+            CalcUnscrolledPosition(0, 0, &x0, &y0);
+            xpos = x0 + (right - cw);

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

-            xpos += GRID_SCROLL_LINE / 2;
+            xpos += GRID_SCROLL_LINE_X;

         }
 
         if ( xpos != -1  ||  ypos != -1 )
         {
         }
 
         if ( xpos != -1  ||  ypos != -1 )
         {

-            if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
-            if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
+            if ( xpos != -1 )
+                xpos /= GRID_SCROLL_LINE_X;
+            if ( ypos != -1 )
+                ypos /= GRID_SCROLL_LINE_Y;

             Scroll( xpos, ypos );
             AdjustScrollbars();
         }
             Scroll( xpos, ypos );
             AdjustScrollbars();
         }


@@ -5659,17 +7796,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;
     }
 


@@ -5677,19 +7830,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;
     }
 


@@ -5697,17 +7864,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;
     }
 


@@ -5715,17 +7898,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;
     }
 


@@ -5793,7 +7992,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  &&


@@ -5840,15 +8039,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  &&


@@ -5895,7 +8102,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;
     }


@@ -5903,7 +8119,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  &&


@@ -5950,7 +8166,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;
     }


@@ -5958,7 +8183,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  &&


@@ -6005,7 +8230,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;
     }


@@ -6078,7 +8312,7 @@ void wxGrid::SetRowLabelSize( int width )
 
         m_rowLabelWidth = width;
         CalcWindowSizes();
 
         m_rowLabelWidth = width;
         CalcWindowSizes();

-        Refresh( TRUE );
+        wxScrolledWindow::Refresh( TRUE );

     }
 }
 
     }
 }
 


@@ -6101,7 +8335,7 @@ void wxGrid::SetColLabelSize( int height )
 
         m_colLabelHeight = height;
         CalcWindowSizes();
 
         m_colLabelHeight = height;
         CalcWindowSizes();

-        Refresh( TRUE );
+        wxScrolledWindow::Refresh( TRUE );

     }
 }
 
     }
 }
 


@@ -6149,12 +8383,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;
     }


@@ -6167,12 +8416,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;
     }


@@ -6194,7 +8458,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 );
             }


@@ -6213,7 +8477,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 );
             }


@@ -6233,6 +8497,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 )


@@ -6307,6 +8618,11 @@ void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
     m_defaultCellAttr->SetAlignment(horiz, vert);
 }
 
     m_defaultCellAttr->SetAlignment(horiz, vert);
 }
 

+void wxGrid::SetDefaultCellOverflow( bool allow )
+{
+    m_defaultCellAttr->SetOverflow(allow);
+}
+

 void wxGrid::SetDefaultCellFont( const wxFont& font )
 {
     m_defaultCellAttr->SetFont(font);
 void wxGrid::SetDefaultCellFont( const wxFont& font )
 {
     m_defaultCellAttr->SetFont(font);


@@ -6346,9 +8662,14 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 

+bool wxGrid::GetDefaultCellOverflow()
+{
+    return m_defaultCellAttr->GetOverflow();
+}
+

 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {
 wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
 {

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

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


@@ -6364,7 +8685,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;
 }
 


@@ -6372,7 +8693,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;
 }
 


@@ -6380,7 +8701,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;
 }
 


@@ -6388,7 +8709,22 @@ 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();
+}
+
+bool wxGrid::GetCellOverflow( int row, int col )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    bool allow = attr->GetOverflow();
+    attr->DecRef();
+    return allow;
+}
+
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+{
+    wxGridCellAttr *attr = GetCellAttr(row, col);
+    attr->GetSize( num_rows, num_cols );
+    attr->DecRef();

 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
 }
 
 wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)


@@ -6396,6 +8732,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
     attr->DecRef();
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
     attr->DecRef();

+

     return renderer;
 }
 
     return renderer;
 }
 


@@ -6404,6 +8741,7 @@ wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellEditor* editor = attr->GetEditor(this, row, col);
     attr->DecRef();
     wxGridCellAttr* attr = GetCellAttr(row, col);
     wxGridCellEditor* editor = attr->GetEditor(this, row, col);
     attr->DecRef();

+

     return editor;
 }
 
     return editor;
 }
 


@@ -6433,20 +8771,24 @@ 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;
     }
 }
 
 void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {
         m_attrCache.row = -1;
     }
 }
 
 void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {

-    wxGrid *self = (wxGrid *)this;  // const_cast
+    if ( attr != NULL )
+    {
+        wxGrid *self = (wxGrid *)this;  // const_cast

 
 

-    self->ClearAttrCache();
-    self->m_attrCache.row = row;
-    self->m_attrCache.col = col;
-    self->m_attrCache.attr = attr;
-    attr->SafeIncRef();
+        self->ClearAttrCache();
+        self->m_attrCache.row = row;
+        self->m_attrCache.col = col;
+        self->m_attrCache.attr = attr;
+        wxSafeIncRef(attr);
+    }

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


@@ -6454,7 +8796,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++;


@@ -6473,11 +8815,17 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 
 wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 {
 
 wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 {

-    wxGridCellAttr *attr;
-    if ( !LookupAttr(row, col, &attr) )
+    wxGridCellAttr *attr = NULL;
+    // Additional test to avoid looking at the cache e.g. for
+    // wxNoCellCoords, as this will confuse memory management.
+    if ( row >= 0 )

     {
     {

-        attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
-        CacheAttr(row, col, attr);
+        if ( !LookupAttr(row, col, &attr) )
+        {
+            attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any)
+                           : (wxGridCellAttr *)NULL;
+            CacheAttr(row, col, attr);
+        }

     }
     if (attr)
     {
     }
     if (attr)
     {


@@ -6494,43 +8842,90 @@ 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 )
-    {
-        wxASSERT_MSG( m_table,
-                      _T("we may only be called if CanHaveAttributes() "
-                         "returned TRUE and then m_table should be !NULL") );
+    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;

 
 

-        attr = m_table->GetAttr(row, col);
-        if ( !attr )
-        {
-            attr = new wxGridCellAttr;
+    wxCHECK_MSG( m_table, attr,
+                  _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );

 
 

-            // artificially inc the ref count to match DecRef() in caller
-            attr->IncRef();
-
-            m_table->SetAttr(attr, row, col);
-        }
+    attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
+    if ( !attr )
+    {
+        attr = new wxGridCellAttr(m_defaultCellAttr);

 
 

-        CacheAttr(row, col, attr);
+        // artificially inc the ref count to match DecRef() in caller
+        attr->IncRef();
+        m_table->SetAttr(attr, row, col);

     }
     }

-    attr->SetDefAttr(m_defaultCellAttr);
+

     return attr;
 }
 
     return attr;
 }
 

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

+void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr)
+{
+    if ( CanHaveAttributes() )
+    {
+        m_table->SetAttr(attr, row, col);
+        ClearAttrCache();
+    }
+    else
+    {
+        wxSafeDecRef(attr);
+    }
+}
+

 void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
 {
     if ( CanHaveAttributes() )
     {
         m_table->SetRowAttr(attr, row);
 void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
 {
     if ( CanHaveAttributes() )
     {
         m_table->SetRowAttr(attr, row);

+        ClearAttrCache();

     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -6539,10 +8934,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);

     }
 }
 
     }
 }
 


@@ -6586,6 +8982,75 @@ void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
     }
 }
 
     }
 }
 

+void wxGrid::SetCellOverflow( int row, int col, bool allow )
+{
+    if ( CanHaveAttributes() )
+    {
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->SetOverflow(allow);
+        attr->DecRef();
+    }
+}
+
+void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
+{
+    if ( CanHaveAttributes() )
+    {
+        int cell_rows, cell_cols;
+
+        wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+        attr->GetSize(&cell_rows, &cell_cols);
+        attr->SetSize(num_rows, num_cols);
+        attr->DecRef();
+
+        // Cannot set the size of a cell to 0 or negative values
+        // While it is perfectly legal to do that, this function cannot
+        // handle all the possibilies, do it by hand by getting the CellAttr.
+        // You can only set the size of a cell to 1,1 or greater with this fn
+        wxASSERT_MSG( !((cell_rows < 1) || (cell_cols < 1)),
+                      wxT("wxGrid::SetCellSize setting cell size that is already part of another cell"));
+        wxASSERT_MSG( !((num_rows < 1) || (num_cols < 1)),
+                      wxT("wxGrid::SetCellSize setting cell size to < 1"));
+
+        // if this was already a multicell then "turn off" the other cells first
+        if ((cell_rows > 1) || (cell_rows > 1))
+        {
+            int i, j;
+            for (j=row; j<row+cell_rows; j++)
+            {
+                for (i=col; i<col+cell_cols; i++)
+                {
+                    if ((i != col) || (j != row))
+                    {
+                        wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
+                        attr_stub->SetSize( 1, 1 );
+                        attr_stub->DecRef();
+                    }
+                }
+            }
+        }
+
+        // mark the cells that will be covered by this cell to
+        // negative or zero values to point back at this cell
+        if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1))
+        {
+            int i, j;
+            for (j=row; j<row+num_rows; j++)
+            {
+                for (i=col; i<col+num_cols; i++)
+                {
+                    if ((i != col) || (j != row))
+                    {
+                        wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
+                        attr_stub->SetSize( row-j, col-i );
+                        attr_stub->DecRef();
+                    }
+                }
+            }
+        }
+    }
+}
+

 void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
 {
     if ( CanHaveAttributes() )
 void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
 {
     if ( CanHaveAttributes() )


@@ -6643,24 +9108,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);
 }
 


@@ -6692,9 +9161,14 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 
     if ( resizeExistingRows )
     {
 
     if ( resizeExistingRows )
     {

-        InitRowHeights();
-
-        CalcDimensions();
+        // since we are resizing all rows to the default row size,
+        // we can simply clear the row heights and row bottoms
+        // arrays (which also allows us to take advantage of
+        // some speed optimisations)
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();
+        if ( !GetBatchCount() )
+            CalcDimensions();

     }
 }
 
     }
 }
 


@@ -6717,7 +9191,8 @@ void wxGrid::SetRowSize( int row, int height )
     {
         m_rowBottoms[i] += diff;
     }
     {
         m_rowBottoms[i] += diff;
     }

-    CalcDimensions();
+    if ( !GetBatchCount() )
+        CalcDimensions();

 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )


@@ -6726,9 +9201,14 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 
     if ( resizeExistingCols )
     {
 
     if ( resizeExistingCols )
     {

-        InitColWidths();
-
-        CalcDimensions();
+        // since we are resizing all columns to the default column size,
+        // we can simply clear the col widths and col rights
+        // arrays (which also allows us to take advantage of
+        // some speed optimisations)
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        if ( !GetBatchCount() )
+            CalcDimensions();

     }
 }
 
     }
 }
 


@@ -6744,6 +9224,17 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
         InitColWidths();
     }
 

+    // if < 0 calc new width from label
+    if( width < 0 )
+    {
+      long w, h;
+      wxArrayString lines;
+      wxClientDC dc(m_colLabelWin);
+      dc.SetFont(GetLabelFont());
+      StringToLines(GetColLabelValue(col), lines);
+      GetTextBoxSize(dc, lines, &w, &h);
+      width = w + 6;
+    }

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


@@ -6753,421 +9244,473 @@ void wxGrid::SetColSize( int col, int width )
     {
         m_colRights[i] += diff;
     }
     {
         m_colRights[i] += diff;
     }

-    CalcDimensions();
+    if ( !GetBatchCount() )
+        CalcDimensions();

 }
 
 
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
 }
 
 
 void wxGrid::SetColMinimalWidth( int col, int width )
 {

-    m_colMinWidths.Put(col, (wxObject *)width);
+    m_colMinWidths.Put(col, width);
+}
+
+void wxGrid::SetRowMinimalHeight( int row, int width )
+{
+    m_rowMinHeights.Put(row, width);

 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {

-    wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol);
-    return obj ? (int)obj : WXGRID_MIN_COL_WIDTH;
+    long value = m_colMinWidths.Get(col);
+    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;

 }
 
 }
 

-void wxGrid::AutoSizeColumn( int col, bool setAsMin )
+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);
 
 {
     wxClientDC dc(m_gridWin);
 

-    wxCoord width, widthMax = 0;
-    for ( int row = 0; row < m_numRows; row++ )
+    // 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 )
         {
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
         if ( renderer )
         {

-            width = renderer->GetBestSize(*this, *attr, dc, row, col).x;
-            if ( width > widthMax )
+            wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+            extent = column ? size.x : size.y;
+            if ( extent > extentMax )

             {
             {

-                widthMax = width;
+                extentMax = extent;

             }
             }

+
+            renderer->DecRef();

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

-    // now also compare with the column label width
+    // now also compare with the column label extent
+    wxCoord w, h;

     dc.SetFont( GetLabelFont() );
     dc.SetFont( GetLabelFont() );

-    dc.GetTextExtent( GetColLabelValue(col), &width, NULL );
-    if ( width > widthMax )
+
+    if ( column )
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    else
+        dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+
+    extent = column ? w : h;
+    if ( extent > extentMax )

     {
     {

-        widthMax = width;
+        extentMax = extent;

     }
 
     }
 

-    if ( !widthMax )
+    if ( !extentMax )

     {
     {

-        // empty column - give default width (notice that if widthMax is less
-        // than default width but != 0, it's ok)
-        widthMax = m_defaultColWidth;
+        // 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
     {
     }
     else
     {

-        // leave some space around text
-        widthMax += 10;
+        if ( column )
+        {
+            // leave some space around text
+            extentMax += 10;
+        }
+        else
+        {
+            extentMax += 6;
+        }

     }
 
     }
 

-    SetColSize(col, widthMax);
+    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 )
     {
     if ( setAsMin )
     {

-        SetColMinimalWidth(col, widthMax);
+        if ( column )
+            SetColMinimalWidth(col, extentMax);
+        else
+            SetRowMinimalHeight(row, extentMax);

     }
 }
 
     }
 }
 

-void wxGrid::AutoSizeColumns( bool setAsMin )
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)

 {
 {

+    int width = m_rowLabelWidth;
+
+    if ( !calcOnly )
+        BeginBatch();
+

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

-        AutoSizeColumn(col, setAsMin);
+        if ( !calcOnly )
+        {
+            AutoSizeColumn(col, setAsMin);
+        }
+
+        width += GetColWidth(col);

     }
     }

-}

 
 

-//
-// ------ cell value accessor functions
-//
+    if ( !calcOnly )
+        EndBatch();

 
 

-void wxGrid::SetCellValue( int row, int col, const wxString& s )
+    return width;
+}
+
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)

 {
 {

-    if ( m_table )
+    int height = m_colLabelHeight;
+
+    if ( !calcOnly )
+        BeginBatch();
+
+    for ( int row = 0; row < m_numRows; row++ )

     {
     {

-        m_table->SetValue( row, col, s.c_str() );
-        if ( !GetBatchCount() )
+        if ( !calcOnly )

         {
         {

-            wxClientDC dc( m_gridWin );
-            PrepareDC( dc );
-            DrawCell( dc, wxGridCellCoords(row, col) );
+            AutoSizeRow(row, setAsMin);

         }
 
         }
 

-        if ( m_currentCellCoords.GetRow() == row &&
-             m_currentCellCoords.GetCol() == col &&
-             IsCellEditControlEnabled())
-        {
-            HideCellEditControl();
-            ShowCellEditControl(); // will reread data from table
-        }
+        height += GetRowHeight(row);

     }
     }

-}

 
 

+    if ( !calcOnly )
+        EndBatch();

 
 

-//
-// ------ Block, row and col selection
-//
+    return height;
+}

 
 

-void wxGrid::SelectRow( int row, bool addToSelected )
+void wxGrid::AutoSize()

 {
 {

-    wxRect r;
+    BeginBatch();

 
 

-    if ( IsSelection() && addToSelected )
-    {
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
+    wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));

 
 

-        int     i;
+    // round up the size to a multiple of scroll step - this ensures that we
+    // won't get the scrollbars if we're sized exactly to this width
+    // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
+    // scrollbar steps
+    wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
+                   GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);

 
 

-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();
+    // distribute the extra space between the columns/rows to avoid having
+    // extra white space

 
 

-        if ( oldTop > row )
+    // Remove the extra m_extraWidth + 1 added above
+    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+    if ( diff && m_numCols )
+    {
+        // try to resize the columns uniformly
+        wxCoord diffPerCol = diff / m_numCols;
+        if ( diffPerCol )

         {
         {

-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
-                                         wxGridCellCoords ( oldTop - 1,
-                                                            m_numCols - 1 ) );
-            m_selectedTopLeft.SetRow( row );
+            for ( int col = 0; col < m_numCols; col++ )
+            {
+                SetColSize(col, GetColWidth(col) + diffPerCol);
+            }

         }
 
         }
 

-        if ( oldLeft > 0 )
+        // add remaining amount to the last columns
+        diff -= diffPerCol * m_numCols;
+        if ( diff )

         {
         {

-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldLeft - 1 ) );
-
-            m_selectedTopLeft.SetCol( 0 );
+            for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- )
+            {
+                SetColSize(col, GetColWidth(col) + 1);
+            }

         }
         }

+    }

 
 

-        if ( oldBottom < row )
+    // same for rows
+    diff = sizeFit.y - size.y - (m_extraHeight + 1);
+    if ( diff && m_numRows )
+    {
+        // try to resize the columns uniformly
+        wxCoord diffPerRow = diff / m_numRows;
+        if ( diffPerRow )

         {
         {

-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
-                                         wxGridCellCoords ( row,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetRow( row );
+            for ( int row = 0; row < m_numRows; row++ )
+            {
+                SetRowSize(row, GetRowHeight(row) + diffPerRow);
+            }

         }
 
         }
 

-        if ( oldRight < m_numCols - 1 )
+        // add remaining amount to the last rows
+        diff -= diffPerRow * m_numRows;
+        if ( diff )

         {
         {

-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
-                                                            oldRight + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            m_numCols - 1 ) );
-            m_selectedBottomRight.SetCol( m_numCols - 1 );
+            for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- )
+            {
+                SetRowSize(row, GetRowHeight(row) + 1);
+            }

         }
         }

-
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
-    else
-    {
-        r = SelectionToDeviceRect();
-        ClearSelection();
-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
-
-        m_selectedTopLeft.Set( row, 0 );
-        m_selectedBottomRight.Set( row, m_numCols-1 );
-        r = SelectionToDeviceRect();
-        m_gridWin->Refresh( FALSE, &r );

     }
 
     }
 

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

 
 

-    GetEventHandler()->ProcessEvent(gridEvt);
+    SetClientSize(sizeFit);

 }
 
 }
 

+wxSize wxGrid::DoGetBestSize() const
+{
+    // don't set sizes, only calculate them
+    wxGrid *self = (wxGrid *)this;  // const_cast

 
 

-void wxGrid::SelectCol( int col, bool addToSelected )
+    int width, height;
+    width = self->SetOrCalcColumnSizes(TRUE);
+    height = self->SetOrCalcRowSizes(TRUE);
+
+    int maxwidth, maxheight;
+    wxDisplaySize( & maxwidth, & maxheight );
+
+    if ( width > maxwidth ) width = maxwidth;
+    if ( height > maxheight ) height = maxheight;
+
+    return wxSize( width, height );
+}
+
+void wxGrid::Fit()

 {
 {

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

 
 

-        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 );
-        }
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}

 
 

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

 
 

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

         {
         {

-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
-                                         wxGridCellCoords ( m_numRows - 1,
-                                                            col            ) );
-            m_selectedBottomRight.SetCol( col );
+            int dummy;
+            wxRect rect( CellToRect( row, col ) );
+            rect.x = 0;
+            rect.width = m_gridWin->GetClientSize().GetWidth();
+            CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+            m_gridWin->Refresh( FALSE, &rect );

         }
 
         }
 

-        if ( oldBottom < m_numRows - 1 )
+        if ( m_currentCellCoords.GetRow() == row &&
+             m_currentCellCoords.GetCol() == col &&
+             IsCellEditControlShown())
+             // Note: If we are using IsCellEditControlEnabled,
+             // this interacts badly with calling SetCellValue from
+             // an EVT_GRID_CELL_CHANGE handler.

         {
         {

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

         }
         }

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

     }
     }

-    else
-    {
-        wxRect r;
+}

 
 

-        r = SelectionToDeviceRect();
-        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 );
-    }
+//
+// ------ Block, row and col selection
+//

 
 

-    wxGridRangeSelectEvent gridEvt( GetId(),
-                                    wxEVT_GRID_RANGE_SELECT,
-                                    this,
-                                    m_selectedTopLeft,
-                                    m_selectedBottomRight );
+void wxGrid::SelectRow( int row, bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();

 
 

-    GetEventHandler()->ProcessEvent(gridEvt);
+    if ( m_selection )
+        m_selection->SelectRow( row, FALSE, addToSelected );

 }
 
 
 }
 
 

-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::SelectCol( int col, bool addToSelected )

 {
 {

-    int temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();

 
 

-    if ( topRow > bottomRow )
-    {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
-    }
+    if ( m_selection )
+        m_selection->SelectCol( col, FALSE, addToSelected );
+}

 
 

-    if ( leftCol > rightCol )
-    {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
-    }

 
 

-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+                          bool addToSelected )
+{
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();

 
 

-    if ( m_selectedTopLeft != updateTopLeft ||
-         m_selectedBottomRight != updateBottomRight )
-    {
-        // Compute two optimal update rectangles:
-        // Either one rectangle is a real subset of the
-        // other, or they are (almost) disjoint!
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
-        int     i;
+    if ( m_selection )
+        m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+                                  FALSE, addToSelected );
+}

 
 

-        // Store intermediate values
-        wxCoord oldLeft   = m_selectedTopLeft.GetCol();
-        wxCoord oldTop    = m_selectedTopLeft.GetRow();
-        wxCoord oldRight  = m_selectedBottomRight.GetCol();
-        wxCoord oldBottom = m_selectedBottomRight.GetRow();

 
 

-        // Determine the outer/inner coordinates.
-        if (oldLeft > leftCol)
-        {
-            temp = oldLeft;
-            oldLeft = leftCol;
-            leftCol = temp;
-        }
-        if (oldTop > topRow )
-        {
-            temp = oldTop;
-            oldTop = topRow;
-            topRow = temp;
-        }
-        if (oldRight < rightCol )
-        {
-            temp = oldRight;
-            oldRight = rightCol;
-            rightCol = temp;
-        }
-        if (oldBottom < bottomRow)
-        {
-            temp = oldBottom;
-            oldBottom = bottomRow;
-            bottomRow = temp;
-        }
+void wxGrid::SelectAll()
+{
+    if ( m_numRows > 0 && m_numCols > 0 )
+    {
+        if ( m_selection )
+            m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+    }
+}

 
 

-        // Now, either the stuff marked old is the outer
-        // rectangle or we don't have a situation where one
-        // is contained in the other.
+//
+// ------ Cell, row and col deselection
+//

 
 

-        if ( oldLeft < leftCol )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
-        }
+void wxGrid::DeselectRow( int row )
+{
+    if ( !m_selection )
+        return;

 
 

-        if ( oldTop  < topRow )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+    {
+        if ( m_selection->IsInSelection(row, 0 ) )
+            m_selection->ToggleCellSelection( row, 0);
+    }
+    else
+    {
+        int nCols = GetNumberCols();
+        for ( int i = 0; i < nCols ; i++ )

         {
         {

-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
+            if ( m_selection->IsInSelection(row, i ) )
+                m_selection->ToggleCellSelection( row, i);

         }
         }

+    }
+}

 
 

-        if ( oldRight > rightCol )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
-        }
+void wxGrid::DeselectCol( int col )
+{
+    if ( !m_selection )
+        return;

 
 

-        if ( oldBottom > bottomRow )
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+    {
+        if ( m_selection->IsInSelection(0, col ) )
+            m_selection->ToggleCellSelection( 0, col);
+    }
+    else
+    {
+        int nRows = GetNumberRows();
+        for ( int i = 0; i < nRows ; i++ )

         {
         {

-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
+            if ( m_selection->IsInSelection(i, col ) )
+                m_selection->ToggleCellSelection(i, col);

         }
         }

-
-
-        // Change Selection
-        m_selectedTopLeft = updateTopLeft;
-        m_selectedBottomRight = updateBottomRight;
-
-        // various Refresh() calls
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );

     }
     }

+}

 
 

-    // only generate an event if the block is not being selected by
-    // dragging the mouse (in which case the event will be generated in
-    // the mouse event handler)
-    if ( !m_isDragging )
-    {
-        wxGridRangeSelectEvent gridEvt( GetId(),
-                                        wxEVT_GRID_RANGE_SELECT,
-                                        this,
-                                        m_selectedTopLeft,
-                                        m_selectedBottomRight );
+void wxGrid::DeselectCell( int row, int col )
+{
+    if ( m_selection && m_selection->IsInSelection(row, col) )
+        m_selection->ToggleCellSelection(row, col);
+}

 
 

-        GetEventHandler()->ProcessEvent(gridEvt);
-    }
+bool wxGrid::IsSelection()
+{
+    return ( m_selection && (m_selection->IsSelection() ||
+             ( m_selectingTopLeft != wxGridNoCellCoords &&
+               m_selectingBottomRight != wxGridNoCellCoords) ) );

 }
 
 }
 

-void wxGrid::SelectAll()
+bool wxGrid::IsInSelection( int row, int col ) const

 {
 {

-    m_selectedTopLeft.Set( 0, 0 );
-    m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+    return ( m_selection && (m_selection->IsInSelection( row, col ) ||
+             ( row >= m_selectingTopLeft.GetRow() &&
+               col >= m_selectingTopLeft.GetCol() &&
+               row <= m_selectingBottomRight.GetRow() &&
+               col <= m_selectingBottomRight.GetCol() )) );
+}

 
 

-    m_gridWin->Refresh();
+wxGridCellCoordsArray wxGrid::GetSelectedCells() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_cellSelection;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_blockSelectionTopLeft;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
+{
+    if (!m_selection) { wxGridCellCoordsArray a; return a; }
+    return m_selection->m_blockSelectionBottomRight;
+}
+wxArrayInt wxGrid::GetSelectedRows() const
+{
+    if (!m_selection) { wxArrayInt a; return a; }
+    return m_selection->m_rowSelection;
+}
+wxArrayInt wxGrid::GetSelectedCols() const
+{
+    if (!m_selection) { wxArrayInt a; return a; }
+    return m_selection->m_colSelection;

 }
 
 
 void wxGrid::ClearSelection()
 {
 }
 
 
 void wxGrid::ClearSelection()
 {

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

 }
 
 
 }
 
 


@@ -7200,15 +9743,70 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
         return wxGridNoCellRect;
     }
 
         return wxGridNoCellRect;
     }
 

+    int i, j;
+    int left = rect.GetLeft();
+    int top = rect.GetTop();
+    int right = rect.GetRight();
+    int bottom = rect.GetBottom();
+
+    int leftCol = topLeft.GetCol();
+    int topRow = topLeft.GetRow();
+    int rightCol = bottomRight.GetCol();
+    int bottomRow = bottomRight.GetRow();
+
+    if (left > right)
+    {
+        i = left;
+        left = right;
+        right = i;
+        i = leftCol;
+        leftCol=rightCol;
+        rightCol = i;
+    }
+
+    if (top > bottom)
+    {
+        i = top;
+        top = bottom;
+        bottom = i;
+        i = topRow;
+        topRow = bottomRow;
+        bottomRow = i;
+    }
+
+
+    for ( j = topRow; j <= bottomRow; j++ )
+    {
+        for ( i = leftCol; i <= rightCol; i++ )
+        {
+            if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol))
+            {
+                cellRect = CellToRect( j, i );
+
+                if (cellRect.x < left)
+                    left = cellRect.x;
+                if (cellRect.y < top)
+                    top = cellRect.y;
+                if (cellRect.x + cellRect.width > right)
+                    right = cellRect.x + cellRect.width;
+                if (cellRect.y + cellRect.height > bottom)
+                    bottom = cellRect.y + cellRect.height;
+            }
+            else i = rightCol; // jump over inner cells.
+        }
+    }
+

     // convert to scrolled coords
     //
     // convert to scrolled coords
     //

-    int left, top, right, bottom;
-    CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
-    CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+    CalcScrolledPosition( left, top, &left, &top );
+    CalcScrolledPosition( right, bottom, &right, &bottom );

 
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 
 
     int cw, ch;
     m_gridWin->GetClientSize( &cw, &ch );
 

+    if (right < 0 || bottom < 0 || left > cw || top > ch)
+        return wxRect( 0, 0, 0, 0);
+

     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );
     rect.SetLeft( wxMax(0, left) );
     rect.SetTop( wxMax(0, top) );
     rect.SetRight( wxMin(cw, right) );


@@ -7223,10 +9821,10 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 // ------ Grid event classes
 //
 
 // ------ Grid event classes
 //
 

-IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )

 
 wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
 
 wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,

-                          int row, int col, int x, int y,
+                          int row, int col, int x, int y, bool sel,

                           bool control, bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {
                           bool control, bool shift, bool alt, bool meta )
         : wxNotifyEvent( type, id )
 {


@@ -7234,6 +9832,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;


@@ -7243,7 +9842,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )

 
 wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
                                   int rowOrCol, int x, int y,
 
 wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
                                   int rowOrCol, int x, int y,


@@ -7262,16 +9861,18 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent )

 
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                const wxGridCellCoords& topLeft,
                                                const wxGridCellCoords& bottomRight,
 
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                const wxGridCellCoords& topLeft,
                                                const wxGridCellCoords& bottomRight,

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

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

+    m_selecting   = sel;

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


@@ -7281,5 +9882,20 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 }
 
 
 }
 
 

-#endif // ifndef wxUSE_NEW_GRID
+IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+
+wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
+                                                   wxObject* obj, int row,
+                                                   int col, wxControl* ctrl)
+    : wxCommandEvent(type, id)
+{
+    SetEventObject(obj);
+    m_row = row;
+    m_col = col;
+    m_ctrl = ctrl;
+}
+
+
+#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID

 
 

+#endif // wxUSE_GRID