more fixes to handling of the resolution chosen in GTK print dialog (patch 1864504)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c216e7291bc3858f0d8575445255d68fc4cd5089..0fba2b382965da530300336bcfcb18a411ce62ff 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_GRID
 
 
 #if wxUSE_GRID
 

+#include "wx/grid.h"
+

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


@@ -37,9 +39,10 @@
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 

-#include "wx/grid.h"

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

+const wxChar wxGridNameStr[] = wxT("grid");
+

 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else
 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else


@@ -117,16 +120,43 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
+// common base class for various grid subwindows
+class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow

 {
 public:
 {
 public:

-    wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridSubwindow() { m_owner = NULL; }
+    wxGridSubwindow(wxGrid *owner,
+                    wxWindowID id,
+                    const wxPoint& pos,
+                    const wxSize& size,
+                    int additionalStyle = 0,
+                    const wxString& name = wxPanelNameStr)
+        : wxWindow(owner, id, pos, size,
+                   wxWANTS_CHARS | wxBORDER_NONE | additionalStyle,
+                   name)
+    {
+        m_owner = owner;
+    }
+
+    wxGrid *GetOwner() { return m_owner; }
+
+protected:
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+
+    wxGrid *m_owner;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGridSubwindow)
+};
+
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
+{
+public:
+    wxGridRowLabelWindow() { }

     wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:

-    wxGrid   *m_owner;
-

     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );


@@ -140,16 +170,14 @@ private:
 };
 
 
 };
 
 

-class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow

 {
 public:
 {
 public:

-    wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridColLabelWindow() { }

     wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
                           const wxPoint &pos, const wxSize &size );
 
 private:

-    wxGrid   *m_owner;
-

     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );


@@ -163,16 +191,14 @@ private:
 };
 
 
 };
 
 

-class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow

 {
 public:
 {
 public:

-    wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
+    wxGridCornerLabelWindow() { }

     wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
                              const wxPoint &pos, const wxSize &size );
 
 private:
     wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
                              const wxPoint &pos, const wxSize &size );
 
 private:

-    wxGrid *m_owner;
-

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


@@ -185,12 +211,11 @@ private:
     DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
 };
 
     DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
 };
 

-class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow

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

-        m_owner = NULL;

         m_rowLabelWin = NULL;
         m_colLabelWin = NULL;
     }
         m_rowLabelWin = NULL;
         m_colLabelWin = NULL;
     }


@@ -199,14 +224,10 @@ public:
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );

-    virtual ~wxGridWindow() {}

 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 

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

 private:
 private:

-    wxGrid                   *m_owner;

     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 


@@ -621,17 +642,27 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)
 {
                                   wxWindowID id,
                                   wxEvtHandler* evtHandler)
 {

+    DoCreate(parent, id, evtHandler);
+}
+
+void wxGridCellTextEditor::DoCreate(wxWindow* parent,
+                                    wxWindowID id,
+                                    wxEvtHandler* evtHandler,
+                                    long style)
+{
+    style |= wxTE_PROCESS_ENTER |
+             wxTE_PROCESS_TAB |
+             wxTE_AUTO_SCROLL |
+             wxNO_BORDER;
+

     m_control = new wxTextCtrl(parent, id, wxEmptyString,
     m_control = new wxTextCtrl(parent, id, wxEmptyString,

-                               wxDefaultPosition, wxDefaultSize
-#if defined(__WXMSW__)
-                               , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL | wxNO_BORDER
-#endif
-                              );
+                               wxDefaultPosition, wxDefaultSize,
+                               style);

 
     // set max length allowed in the textctrl, if the parameter was set
 
     // set max length allowed in the textctrl, if the parameter was set

-    if (m_maxChars != 0)
+    if ( m_maxChars != 0 )

     {
     {

-        ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+        Text()->SetMaxLength(m_maxChars);

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


@@ -1230,6 +1261,9 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
 

+// the default values for GetValue()
+wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
+

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


@@ -1335,7 +1369,19 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );
     else
     {
         wxString cellval( grid->GetTable()->GetValue(row, col) );

-        m_startValue = !( !cellval || (cellval == wxT("0")) );
+
+        if ( cellval == ms_stringValues[false] )
+            m_startValue = false;
+        else if ( cellval == ms_stringValues[true] )
+            m_startValue = true;
+        else
+        {
+            // do not try to be smart here and convert it to true or false
+            // because we'll still overwrite it with something different and
+            // this risks to be very surprising for the user code, let them
+            // know about it
+            wxFAIL_MSG( _T("invalid value for a cell with bool editor!") );
+        }

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


@@ -1355,10 +1401,11 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
 
     if ( changed )
     {
 
     if ( changed )
     {

-        if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
-            grid->GetTable()->SetValueAsBool(row, col, value);
+        wxGridTableBase * const table = grid->GetTable();
+        if ( table->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+            table->SetValueAsBool(row, col, value);

         else
         else

-            grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+            table->SetValue(row, col, GetValue());

     }
 
     return changed;
     }
 
     return changed;


@@ -1413,12 +1460,23 @@ void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
     }
 }
 
     }
 }
 

-
-// return the value as "1" for true and the empty string for false

 wxString wxGridCellBoolEditor::GetValue() const
 {
 wxString wxGridCellBoolEditor::GetValue() const
 {

-  bool bSet = CBox()->GetValue();
-  return bSet ? _T("1") : wxEmptyString;
+  return ms_stringValues[CBox()->GetValue()];
+}
+
+/* static */ void
+wxGridCellBoolEditor::UseStringValues(const wxString& valueTrue,
+                                      const wxString& valueFalse)
+{
+    ms_stringValues[false] = valueFalse;
+    ms_stringValues[true] = valueTrue;
+}
+
+/* static */ bool
+wxGridCellBoolEditor::IsTrueValue(const wxString& value)
+{
+    return value == ms_stringValues[true];

 }
 
 #endif // wxUSE_CHECKBOX
 }
 
 #endif // wxUSE_CHECKBOX


@@ -1462,10 +1520,12 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {

+    int style = wxBORDER_NONE;
+    if (!m_allowOthers)
+        style |= wxCB_READONLY;

     m_control = new wxComboBox(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,
     m_control = new wxComboBox(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,

-                               m_choices,
-                               m_allowOthers ? 0 : wxCB_READONLY);
+                               m_choices, style );

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


@@ -1500,8 +1560,9 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
     if (m_allowOthers)
     {
         Combo()->SetValue(m_startValue);
     if (m_allowOthers)
     {
         Combo()->SetValue(m_startValue);

+        Combo()->SetInsertionPointEnd();

     }
     }

-    else
+    else // the combobox is read-only

     {
         // find the right position, or default to the first if not found
         int pos = Combo()->FindString(m_startValue);
     {
         // find the right position, or default to the first if not found
         int pos = Combo()->FindString(m_startValue);


@@ -1510,7 +1571,6 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
         Combo()->SetSelection(pos);
     }
 
         Combo()->SetSelection(pos);
     }
 

-    Combo()->SetInsertionPointEnd();

     Combo()->SetFocus();
 
     if (evtHandler)
     Combo()->SetFocus();
 
     if (evtHandler)


@@ -2146,8 +2206,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
 
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
 

-        // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXMOTIF__)

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


@@ -2176,7 +2235,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     if ( size.x >= minSize || size.y >= minSize )
     {
         // and even leave (at least) 1 pixel margin
     if ( size.x >= minSize || size.y >= minSize )
     {
         // and even leave (at least) 1 pixel margin

-        size.x = size.y = minSize - 2;
+        size.x = size.y = minSize;

     }
 
     // draw a border around checkmark
     }
 
     // draw a border around checkmark


@@ -2214,29 +2273,14 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     else
     {
         wxString cellval( grid.GetTable()->GetValue(row, col) );
     else
     {
         wxString cellval( grid.GetTable()->GetValue(row, col) );

-        value = !( !cellval || (cellval == wxT("0")) );
+        value = wxGridCellBoolEditor::IsTrueValue(cellval);

     }
 
     }
 

-    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
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif
-
-        dc.SetTextForeground(attr.GetTextColour());
-        dc.DrawCheckMark(rectMark);
-    }
-
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectBorder);
+    int flags = 0;
+    if (value)
+        flags |= wxCONTROL_CHECKED; 
+        
+    wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags );

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


@@ -2289,6 +2333,7 @@ wxGridCellAttr *wxGridCellAttr::Clone() const
     if ( IsReadOnly() )
         attr->SetReadOnly();
 
     if ( IsReadOnly() )
         attr->SetReadOnly();
 

+    attr->SetOverflow( m_overflow == Overflow );

     attr->SetKind( m_attrkind );
 
     return attr;
     attr->SetKind( m_attrkind );
 
     return attr;


@@ -2440,7 +2485,7 @@ void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 // NULL (because the table has a type that the grid does not have in its
 // registry), then the grid's default editor or renderer is used.
 
 // NULL (because the table has a type that the grid does not have in its
 // registry), then the grid's default editor or renderer is used.
 

-wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const

 {
     wxGridCellRenderer *renderer = NULL;
 
 {
     wxGridCellRenderer *renderer = NULL;
 


@@ -2484,7 +2529,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
 }
 
 // same as above, except for s/renderer/editor/g
 }
 
 // same as above, except for s/renderer/editor/g

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

 {
     wxGridCellEditor *editor = NULL;
 
 {
     wxGridCellEditor *editor = NULL;
 


@@ -2664,7 +2709,7 @@ int wxGridCellAttrData::FindIndex(int row, int col) const
 
 wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
 {
 
 wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
 {

-    size_t count = m_attrs.Count();
+    size_t count = m_attrs.GetCount();

     for ( size_t n = 0; n < count; n++ )
     {
         m_attrs[n]->DecRef();
     for ( size_t n = 0; n < count; n++ )
     {
         m_attrs[n]->DecRef();


@@ -2690,9 +2735,13 @@ void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
     int i = m_rowsOrCols.Index(rowOrCol);
     if ( i == wxNOT_FOUND )
     {
     int i = m_rowsOrCols.Index(rowOrCol);
     if ( i == wxNOT_FOUND )
     {

-        // add the attribute
-        m_rowsOrCols.Add(rowOrCol);
-        m_attrs.Add(attr);
+        if ( attr )
+        {
+            // add the attribute
+            m_rowsOrCols.Add(rowOrCol);
+            m_attrs.Add(attr);
+        }
+        // nothing to remove

     }
     else
     {
     }
     else
     {


@@ -2905,7 +2954,7 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols )
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {
 
 wxGridTypeRegistry::~wxGridTypeRegistry()
 {

-    size_t count = m_typeinfo.Count();
+    size_t count = m_typeinfo.GetCount();

     for ( size_t i = 0; i < count; i++ )
         delete m_typeinfo[i];
 }
     for ( size_t i = 0; i < count; i++ )
         delete m_typeinfo[i];
 }


@@ -3613,7 +3662,12 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
 
     if ( !m_colLabels.IsEmpty() )
     {
 
     if ( !m_colLabels.IsEmpty() )
     {

-        m_colLabels.RemoveAt( colID, numCols );
+        // m_colLabels stores just as many elements as it needs, e.g. if only
+        // the label of the first column had been set it would have only one
+        // element and not numCols, so account for it
+        int nToRm = m_colLabels.size() - colID;
+        if ( nToRm > 0 )
+            m_colLabels.RemoveAt( colID, nToRm );

     }
 
     for ( row = 0; row < curNumRows; row++ )
     }
 
     for ( row = 0; row < curNumRows; row++ )


@@ -3705,9 +3759,18 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 

+BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+    EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
+END_EVENT_TABLE()
+
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+    m_owner->CancelMouseCapture();
+}
+

 IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )

     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )


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

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
+  : wxGridSubwindow(parent, id, pos, size)

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


@@ -3778,7 +3841,7 @@ void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )

     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )


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

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
+  : wxGridSubwindow(parent, id, pos, size)

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


@@ -3852,7 +3915,7 @@ void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 

-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )

     EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint )


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

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
+  : wxGridSubwindow(parent, id, pos, size)

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


@@ -3878,7 +3941,8 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     GetClientSize( &client_width, &client_height );
 
     // VZ: any reason for this ifdef? (FIXME)
     GetClientSize( &client_width, &client_height );
 
     // VZ: any reason for this ifdef? (FIXME)

-#ifdef __WXGTK__
+#if 0
+def __WXGTK__

     wxRect rect;
     rect.SetX( 1 );
     rect.SetY( 1 );
     wxRect rect;
     rect.SetX( 1 );
     rect.SetY( 1 );


@@ -3934,7 +3998,7 @@ void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
 

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

     EVT_PAINT( wxGridWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_PAINT( wxGridWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )


@@ -3952,10 +4016,8 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxWindowID id,
                             const wxPoint &pos,
                             const wxSize &size )
                             wxWindowID id,
                             const wxPoint &pos,
                             const wxSize &size )

-            : wxWindow(
-                parent, id, pos, size,
-                wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN | wxFULL_REPAINT_ON_RESIZE,
-                wxT("grid window") )
+            : wxGridSubwindow(parent, id, pos, size,
+                              wxCLIP_CHILDREN, wxT("grid window") )

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


@@ -4131,7 +4193,7 @@ wxGrid::wxGrid( wxWindow *parent,
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();

-    SetBestFittingSize(size);
+    SetInitialSize(size);

 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,


@@ -4146,7 +4208,8 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
     m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE);
 
     Create();
     m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE);
 
     Create();

-    SetBestFittingSize(size);
+    SetInitialSize(size);
+    CalcDimensions();

 
     return true;
 }
 
     return true;
 }


@@ -4166,8 +4229,12 @@ wxGrid::~wxGrid()
              total ? (gs_nAttrCacheHits*100) / total : 0);
 #endif
 
              total ? (gs_nAttrCacheHits*100) / total : 0);
 #endif
 

-    if (m_ownTable)
+    // if we own the table, just delete it, otherwise at least don't leave it
+    // with dangling view pointer
+    if ( m_ownTable )

         delete m_table;
         delete m_table;

+    else if ( m_table && m_table->GetView() == this )
+        m_table->SetView(NULL);

 
     delete m_typeRegistry;
     delete m_selection;
 
     delete m_typeRegistry;
     delete m_selection;


@@ -4317,24 +4384,33 @@ wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
                        wxGrid::wxGridSelectionModes selmode )
 {
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
                        wxGrid::wxGridSelectionModes selmode )
 {

+    bool checkSelection = false;

     if ( m_created )
     {
         // stop all processing
         m_created = false;
 
     if ( m_created )
     {
         // stop all processing
         m_created = false;
 

-        if (m_ownTable)
+        if (m_table)

         {
         {

-            wxGridTableBase *t = m_table;
+            m_table->SetView(0);
+            if( m_ownTable )
+                delete m_table;

             m_table = NULL;
             m_table = NULL;

-            delete t;

         }
 
         delete m_selection;
         }
 
         delete m_selection;

-
-        m_table = NULL;

         m_selection = NULL;
         m_selection = NULL;

+
+        m_ownTable = false;

         m_numRows = 0;
         m_numCols = 0;
         m_numRows = 0;
         m_numCols = 0;

+        checkSelection = true;
+
+        // kill row and column size arrays
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();

     }
 
     if (table)
     }
 
     if (table)


@@ -4346,7 +4422,28 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
         m_table->SetView( this );
         m_ownTable = takeOwnership;
         m_selection = new wxGridSelection( this, selmode );
         m_table->SetView( this );
         m_ownTable = takeOwnership;
         m_selection = new wxGridSelection( this, selmode );

-
+        if (checkSelection)
+        {
+            // If the newly set table is smaller than the
+            // original one current cell and selection regions
+            // might be invalid,
+            m_selectingKeyboard = wxGridNoCellCoords;
+            m_currentCellCoords =
+              wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+                               wxMin(m_numCols, m_currentCellCoords.GetCol()));
+            if (m_selectingTopLeft.GetRow() >= m_numRows ||
+                m_selectingTopLeft.GetCol() >= m_numCols)
+            {
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
+            }
+            else
+                m_selectingBottomRight =
+                  wxGridCellCoords(wxMin(m_numRows,
+                                         m_selectingBottomRight.GetRow()),
+                                   wxMin(m_numCols,
+                                         m_selectingBottomRight.GetCol()));
+        }

         CalcDimensions();
 
         m_created = true;
         CalcDimensions();
 
         m_created = true;


@@ -4418,6 +4515,7 @@ void wxGrid::Init()
     m_dragRowOrCol = -1;
     m_isDragging = false;
     m_startDragPos = wxDefaultPosition;
     m_dragRowOrCol = -1;
     m_isDragging = false;
     m_startDragPos = wxDefaultPosition;

+    m_nativeColumnLabels = false;

 
     m_waitForSlowClick = false;
 
 
     m_waitForSlowClick = false;
 


@@ -4449,8 +4547,9 @@ void wxGrid::Init()
 // default widths/heights are used for all rows/columns, we may not use these
 // arrays at all
 //
 // default widths/heights are used for all rows/columns, we may not use these
 // arrays at all
 //

-// with some extra code, it should be possible to only store the
-// widths/heights different from default ones but this will be done later...
+// with some extra code, it should be possible to only store the widths/heights
+// different from default ones (resulting in space savings for huge grids) but
+// this is not done currently

 // ----------------------------------------------------------------------------
 
 void wxGrid::InitRowHeights()
 // ----------------------------------------------------------------------------
 
 void wxGrid::InitRowHeights()


@@ -4461,10 +4560,9 @@ void wxGrid::InitRowHeights()
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 
     m_rowHeights.Alloc( m_numRows );
     m_rowBottoms.Alloc( m_numRows );
 

-    int rowBottom = 0;
-

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

+    int rowBottom = 0;

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


@@ -4479,10 +4577,10 @@ void wxGrid::InitColWidths()
 
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );
 
     m_colWidths.Alloc( m_numCols );
     m_colRights.Alloc( m_numCols );

-    int colRight = 0;

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

+    int colRight = 0;

     for ( int i = 0; i < m_numCols; i++ )
     {
         colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
     for ( int i = 0; i < m_numCols; i++ )
     {
         colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;


@@ -4526,17 +4624,12 @@ int wxGrid::GetRowBottom(int row) const
 
 void wxGrid::CalcDimensions()
 {
 
 void wxGrid::CalcDimensions()
 {

-    int cw, ch;
-    GetClientSize( &cw, &ch );
+    // compute the size of the scrollable area
+    int w = m_numCols > 0 ? GetColRight(GetColAt(m_numCols - 1)) : 0;
+    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;

 
 

-    if ( m_rowLabelWin->IsShown() )
-        cw -= m_rowLabelWidth;
-    if ( m_colLabelWin->IsShown() )
-        ch -= m_colLabelHeight;
-
-    // grid total size
-    int w = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) + m_extraWidth + 1 : 0;
-    int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+    w += m_extraWidth;
+    h += m_extraHeight;

 
     // take into account editor if shown
     if ( IsCellEditControlShown() )
 
     // take into account editor if shown
     if ( IsCellEditControlShown() )


@@ -4573,7 +4666,8 @@ void wxGrid::CalcDimensions()
 
     // do set scrollbar parameters
     SetScrollbars( m_scrollLineX, m_scrollLineY,
 
     // do set scrollbar parameters
     SetScrollbars( m_scrollLineX, m_scrollLineY,

-                   GetScrollX(w), GetScrollY(h), x, y,
+                   GetScrollX(w), GetScrollY(h),
+                   x, y,

                    GetBatchCount() != 0);
 
     // if our OnSize() hadn't been called (it would if we have scrollbars), we
                    GetBatchCount() != 0);
 
     // if our OnSize() hadn't been called (it would if we have scrollbars), we


@@ -4591,6 +4685,33 @@ void wxGrid::CalcWindowSizes()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

+    // this block of code tries to work around the following problem: the grid
+    // could have been just resized to have enough space to show the full grid
+    // window contents without the scrollbars, but its client size could be
+    // not big enough because the grid has the scrollbars right now and so the
+    // scrollbars would remain even though we don't need them any more
+    //
+    // to prevent this from happening, check if we have enough space for
+    // everything without the scrollbars and explicitly disable them then
+    wxSize size = GetSize() - GetWindowBorderSize();
+    if ( size != wxSize(cw, ch) )
+    {
+        // check if we have enough space for grid window after accounting for
+        // the fixed size elements
+        size.x -= m_rowLabelWidth;
+        size.y -= m_colLabelHeight;
+
+        const wxSize vsize = m_gridWin->GetVirtualSize();
+
+        if ( size.x >= vsize.x && size.y >= vsize.y )
+        {
+            // yes, we do, so remove the scrollbars and use the new client size
+            // (which should be the same as full window size - borders now)
+            SetScrollbars(0, 0, 0, 0);
+            GetClientSize(&cw, &ch);
+        }
+    }
+

     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 


@@ -4982,7 +5103,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
     return result;
 }
 
     return result;
 }
 

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

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


@@ -5033,7 +5154,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
     return rowlabels;
 }
 
     return rowlabels;
 }
 

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

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


@@ -5087,7 +5208,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
     return colLabels;
 }
 
     return colLabels;
 }
 

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

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


@@ -5709,6 +5830,21 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
     }
 }
 

+void wxGrid::CancelMouseCapture()
+{
+    // cancel operation currently in progress, whatever it is
+    if ( m_winCapture )
+    {
+        m_isDragging = false;
+        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+        m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+        m_winCapture = NULL;
+
+        // remove traces of whatever we drew on screen
+        Refresh();
+    }
+}
+

 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)
 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)


@@ -5828,13 +5964,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 SaveEditControlValue();
             }
 
                 SaveEditControlValue();
             }
 

-            // Have we captured the mouse yet?
-            if (! m_winCapture)
-            {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
-            }
-

             if ( coords != wxGridNoCellCoords )
             {
                 if ( event.CmdDown() )
             if ( coords != wxGridNoCellCoords )
             {
                 if ( event.CmdDown() )


@@ -5854,6 +5983,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                                    coords.GetRow(),
                                    coords.GetCol(),
                                    event );
                                    coords.GetRow(),
                                    coords.GetCol(),
                                    event );

+                        return;

                     }
                 }
                 else
                     }
                 }
                 else


@@ -5875,6 +6005,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                     // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }
                     // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }

+            // Have we captured the mouse yet?
+            if (! m_winCapture)
+            {
+                m_winCapture = m_gridWin;
+                m_winCapture->CaptureMouse();
+            }
+
+

         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {
         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {


@@ -6145,7 +6283,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragRowSize() && CanDragGridSize() )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragRowSize() && CanDragGridSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);

             }
         }
         else if ( dragCol >= 0 )
             }
         }
         else if ( dragCol >= 0 )


@@ -6155,7 +6293,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragColSize() && CanDragGridSize() )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragColSize() && CanDragGridSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);

             }
         }
         else // Neither on a row or col edge
             }
         }
         else // Neither on a row or col edge


@@ -6637,7 +6775,7 @@ int wxGrid::SendEvent( const wxEventType type,
            pos.y += GetColLabelSize();
        if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
            pos.x += GetRowLabelSize();
            pos.y += GetColLabelSize();
        if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
            pos.x += GetRowLabelSize();

-       
+

        wxGridEvent gridEvt( GetId(),
                type,
                this,
        wxGridEvent gridEvt( GetId(),
                type,
                this,


@@ -6803,14 +6941,13 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
     }
 }
 
     }
 }
 

-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))

 {
 {

-    // position the child windows
-    CalcWindowSizes();
-
-    // don't call CalcDimensions() from here, the base class handles the size
-    // changes itself
-    event.Skip();
+    if (m_targetWindow != this) // check whether initialisation has been done
+    {
+        // update our children window positions and scrollbars
+        CalcDimensions();
+    }

 }
 
 void wxGrid::OnKeyDown( wxKeyEvent& event )
 }
 
 void wxGrid::OnKeyDown( wxKeyEvent& event )


@@ -6838,7 +6975,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
             else if (event.GetKeyCode() == WXK_LEFT)
                 event.m_keyCode = WXK_RIGHT;
         }
             else if (event.GetKeyCode() == WXK_LEFT)
                 event.m_keyCode = WXK_RIGHT;
         }

-    
+

         // try local handlers
         switch ( event.GetKeyCode() )
         {
         // try local handlers
         switch ( event.GetKeyCode() )
         {


@@ -7066,8 +7203,10 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
         return;
     }
 

+#if !defined(__WXMAC__)

     wxClientDC dc( m_gridWin );
     PrepareDC( dc );
     wxClientDC dc( m_gridWin );
     PrepareDC( dc );

+#endif

 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {


@@ -7090,15 +7229,21 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 

+#if defined(__WXMAC__)
+            m_gridWin->Refresh(true /*, & r */);
+#else

             DrawGridCellArea( dc, cells );
             DrawAllGridLines( dc, r );
             DrawGridCellArea( dc, cells );
             DrawAllGridLines( dc, r );

+#endif

         }
     }
 
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );
         }
     }
 
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );

+#if !defined(__WXMAC__) 

     DrawCellHighlight( dc, attr );
     DrawCellHighlight( dc, attr );

+#endif

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


@@ -7474,7 +7619,7 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
         // edit control is erased by this code after being rendered.
         // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
         // implicitly, causing this out-of order render.
         // edit control is erased by this code after being rendered.
         // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
         // implicitly, causing this out-of order render.

-#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS
+#if !defined(__WXMAC__)

         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
         editor->PaintBackground(rect, attr);
         editor->DecRef();


@@ -7669,17 +7814,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     int rightCol = GetColPos( internalXToCol(right) );
     int bottomRow = internalYToRow(bottom);
 
     int rightCol = GetColPos( internalXToCol(right) );
     int bottomRow = internalYToRow(bottom);
 

-#ifndef __WXMAC__
-    // CS: I don't know why suddenly unscrolled coordinates are used for clipping

     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 
     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 

-    for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<=bottomRow; j++)

     {
         int colPos;
     {
         int colPos;

-        for (colPos=leftCol; colPos<rightCol; colPos++)
+        for (colPos=leftCol; colPos<=rightCol; colPos++)

         {
             i = GetColAt( colPos );
 
         {
             i = GetColAt( colPos );
 


@@ -7698,30 +7841,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             }
         }
     }
             }
         }
     }

-#else
-    wxRegion clippedcells( left, top, right - left, bottom - top );
-
-    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);
-                clippedcells.Subtract(rect);
-            }
-            else if ((cell_rows < 0) || (cell_cols < 0))
-            {
-                rect = CellToRect(j + cell_rows, i + cell_cols);
-                clippedcells.Subtract(rect);
-            }
-        }
-    }
-#endif

 
     dc.SetClippingRegion( clippedcells );
 
 
     dc.SetClippingRegion( clippedcells );
 


@@ -7794,18 +7913,6 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 
     wxRect rect;
 
 
     wxRect rect;
 

-#ifdef __WXGTK20__
-    rect.SetX( 1 );
-    rect.SetY( GetRowTop(row) + 1 );
-    rect.SetWidth( m_rowLabelWidth - 2 );
-    rect.SetHeight( GetRowHeight(row) - 2 );
-
-    CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
-
-    wxWindowDC *win_dc = (wxWindowDC*) &dc;
-
-    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else

     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 


@@ -7817,7 +7924,6 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( 1, rowTop, 1, rowBottom );
     dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( 1, rowTop, 1, rowBottom );
     dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );

-#endif

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


@@ -7833,6 +7939,18 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 

+void wxGrid::SetUseNativeColLabels( bool native )
+{
+    m_nativeColumnLabels = native;
+    if (native)
+    {
+        int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
+        SetColLabelSize( height );
+    }
+    
+    m_colLabelWin->Refresh();
+}
+

 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
     if ( !m_numCols )
 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
     if ( !m_numCols )


@@ -7856,28 +7974,30 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
 
     wxRect rect;
 
 
     wxRect rect;
 

-#ifdef __WXGTK20__
-    rect.SetX( colLeft + 1 );
-    rect.SetY( 1 );
-    rect.SetWidth( GetColWidth(col) - 2 );
-    rect.SetHeight( m_colLabelHeight - 2 );
-
-    wxWindowDC *win_dc = (wxWindowDC*) &dc;
+    if (m_nativeColumnLabels)
+    {
+        rect.SetX( colLeft);
+        rect.SetY( 0 );
+        rect.SetWidth( GetColWidth(col));
+        rect.SetHeight( m_colLabelHeight );

 
 

-    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else
-    int colRight = GetColRight(col) - 1;
+        wxWindowDC *win_dc = (wxWindowDC*) &dc;
+        wxRendererNative::Get().DrawHeaderButton( win_dc->GetWindow(), dc, rect, 0 );
+    }
+    else
+    {
+        int colRight = GetColRight(col) - 1;

 
 

-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
-    dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
-    dc.DrawLine( colLeft, 0, colRight, 0 );
-    dc.DrawLine( colLeft, m_colLabelHeight - 1,
+        dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+        dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
+        dc.DrawLine( colLeft, 0, colRight, 0 );
+        dc.DrawLine( colLeft, m_colLabelHeight - 1,

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

-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
-    dc.DrawLine( colLeft, 1, colRight, 1 );
-#endif
+        dc.SetPen( *wxWHITE_PEN );
+        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() );


@@ -7975,7 +8095,7 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
             continue;
         }
 
             continue;
         }
 

-        long lineWidth = 0,
+        wxCoord lineWidth = 0,

              lineHeight = 0;
         dc.GetTextExtent(line, &lineWidth, &lineHeight);
 
              lineHeight = 0;
         dc.GetTextExtent(line, &lineWidth, &lineHeight);
 


@@ -8020,7 +8140,7 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
 // Split multi-line text up into an array of strings.
 // Any existing contents of the string array are preserved.
 //
 // Split multi-line text up into an array of strings.
 // Any existing contents of the string array are preserved.
 //

-void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
+void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const

 {
     int startPos = 0;
     int pos;
 {
     int startPos = 0;
     int pos;


@@ -8054,11 +8174,11 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
 
 void wxGrid::GetTextBoxSize( const wxDC& dc,
                              const wxArrayString& lines,
 
 void wxGrid::GetTextBoxSize( const wxDC& dc,
                              const wxArrayString& lines,

-                             long *width, long *height )
+                             long *width, long *height ) const

 {
 {

-    long w = 0;
-    long h = 0;
-    long lineW = 0, lineH = 0;
+    wxCoord w = 0;
+    wxCoord h = 0;
+    wxCoord lineW = 0, lineH = 0;

 
     size_t i;
     for ( i = 0; i < lines.GetCount(); i++ )
 
     size_t i;
     for ( i = 0; i < lines.GetCount(); i++ )


@@ -8241,7 +8361,8 @@ void wxGrid::ShowCellEditControl()
             // might not cover the entire cell
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
             // might not cover the entire cell
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );

-            dc.SetBrush(wxBrush(GetCellAttr(row, col)->GetBackgroundColour(), wxSOLID));
+            wxGridCellAttr* attr = GetCellAttr(row, col);
+            dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));

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


@@ -8261,7 +8382,6 @@ void wxGrid::ShowCellEditControl()
             if (rect.y > 0)
                 rect.y--;
 
             if (rect.y > 0)
                 rect.y--;
 

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

             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {


@@ -8314,7 +8434,7 @@ void wxGrid::ShowCellEditControl()
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }

-
+            

             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)
             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)


@@ -8401,7 +8521,7 @@ void wxGrid::SaveEditControlValue()
 //  coordinates for mouse events etc.
 //
 
 //  coordinates for mouse events etc.
 //
 

-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) const

 {
     int row = YToRow(y);
     int col = XToCol(x);
 {
     int row = YToRow(y);
     int col = XToCol(x);


@@ -8483,19 +8603,18 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
     return i_max;
 }
 
     return i_max;
 }
 

-int wxGrid::YToRow( int y )
+int wxGrid::YToRow( int y ) const

 {
     return CoordToRowOrCol(y, m_defaultRowHeight,
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 
 {
     return CoordToRowOrCol(y, m_defaultRowHeight,
                            m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
 }
 

-int wxGrid::XToCol( int x, bool clipToMinMax )
+int wxGrid::XToCol( int x, bool clipToMinMax ) const

 {
     if (x < 0)
         return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
 
 {
     if (x < 0)
         return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
 

-    if (!m_defaultColWidth)
-        m_defaultColWidth = 1;
+    wxASSERT_MSG(m_defaultColWidth > 0, wxT("Default column width can not be zero"));

 
     int maxPos = x / m_defaultColWidth;
     int minPos = 0;
 
     int maxPos = x / m_defaultColWidth;
     int minPos = 0;


@@ -8561,7 +8680,7 @@ int wxGrid::XToCol( int x, bool clipToMinMax )
 //    (b) resizing rows/columns (the thing for which edge detection is
 //        relevant at all) is enabled.
 //
 //    (b) resizing rows/columns (the thing for which edge detection is
 //        relevant at all) is enabled.
 //

-int wxGrid::YToEdgeOfRow( int y )
+int wxGrid::YToEdgeOfRow( int y ) const

 {
     int i;
     i = internalYToRow(y);
 {
     int i;
     i = internalYToRow(y);


@@ -8583,7 +8702,7 @@ int wxGrid::YToEdgeOfRow( int y )
 // -1 if not near an edge
 // See comment at YToEdgeOfRow for conditions on edge detection.
 //
 // -1 if not near an edge
 // See comment at YToEdgeOfRow for conditions on edge detection.
 //

-int wxGrid::XToEdgeOfCol( int x )
+int wxGrid::XToEdgeOfCol( int x ) const

 {
     int i;
     i = internalXToCol(x);
 {
     int i;
     i = internalXToCol(x);


@@ -8601,7 +8720,7 @@ int wxGrid::XToEdgeOfCol( int x )
     return -1;
 }
 
     return -1;
 }
 

-wxRect wxGrid::CellToRect( int row, int col )
+wxRect wxGrid::CellToRect( int row, int col ) const

 {
     wxRect rect( -1, -1, -1, -1 );
 
 {
     wxRect rect( -1, -1, -1, -1 );
 


@@ -8636,7 +8755,7 @@ wxRect wxGrid::CellToRect( int row, int col )
     return rect;
 }
 
     return rect;
 }
 

-bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const

 {
     // get the cell rectangle in logical coords
     //
 {
     // get the cell rectangle in logical coords
     //


@@ -9214,7 +9333,7 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 // ------ Label values and formatting
 //
 
 // ------ Label values and formatting
 //
 

-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const

 {
     if ( horiz )
         *horiz = m_rowLabelHorizAlign;
 {
     if ( horiz )
         *horiz = m_rowLabelHorizAlign;


@@ -9222,7 +9341,7 @@ void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
         *vert  = m_rowLabelVertAlign;
 }
 
         *vert  = m_rowLabelVertAlign;
 }
 

-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const

 {
     if ( horiz )
         *horiz = m_colLabelHorizAlign;
 {
     if ( horiz )
         *horiz = m_colLabelHorizAlign;


@@ -9230,12 +9349,12 @@ void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
         *vert  = m_colLabelVertAlign;
 }
 
         *vert  = m_colLabelVertAlign;
 }
 

-int wxGrid::GetColLabelTextOrientation()
+int wxGrid::GetColLabelTextOrientation() const

 {
     return m_colLabelTextOrientation;
 }
 
 {
     return m_colLabelTextOrientation;
 }
 

-wxString wxGrid::GetRowLabelValue( int row )
+wxString wxGrid::GetRowLabelValue( int row ) const

 {
     if ( m_table )
     {
 {
     if ( m_table )
     {


@@ -9249,7 +9368,7 @@ wxString wxGrid::GetRowLabelValue( int row )
     }
 }
 
     }
 }
 

-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const

 {
     if ( m_table )
     {
 {
     if ( m_table )
     {


@@ -9265,7 +9384,13 @@ wxString wxGrid::GetColLabelValue( int col )
 
 void wxGrid::SetRowLabelSize( int width )
 {
 
 void wxGrid::SetRowLabelSize( int width )
 {

-    width = wxMax( width, 0 );
+    wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE );
+
+    if ( width == wxGRID_AUTOSIZE )
+    {
+        width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW);
+    }
+

     if ( width != m_rowLabelWidth )
     {
         if ( width == 0 )
     if ( width != m_rowLabelWidth )
     {
         if ( width == 0 )


@@ -9288,7 +9413,13 @@ void wxGrid::SetRowLabelSize( int width )
 
 void wxGrid::SetColLabelSize( int height )
 {
 
 void wxGrid::SetColLabelSize( int height )
 {

-    height = wxMax( height, 0 );
+    wxASSERT( height >=0 || height == wxGRID_AUTOSIZE );
+
+    if ( height == wxGRID_AUTOSIZE )
+    {
+        height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN);
+    }
+

     if ( height != m_colLabelHeight )
     {
         if ( height == 0 )
     if ( height != m_colLabelHeight )
     {
         if ( height == 0 )


@@ -9506,7 +9637,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         // 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 )
+        if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )

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


@@ -9554,24 +9685,24 @@ void wxGrid::EnableGridLines( bool enable )
     }
 }
 
     }
 }
 

-int wxGrid::GetDefaultRowSize()
+int wxGrid::GetDefaultRowSize() const

 {
     return m_defaultRowHeight;
 }
 
 {
     return m_defaultRowHeight;
 }
 

-int wxGrid::GetRowSize( int row )
+int wxGrid::GetRowSize( int row ) const

 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
     return GetRowHeight(row);
 }
 
 {
     wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
 
     return GetRowHeight(row);
 }
 

-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const

 {
     return m_defaultColWidth;
 }
 
 {
     return m_defaultColWidth;
 }
 

-int wxGrid::GetColSize( int col )
+int wxGrid::GetColSize( int col ) const

 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 
 {
     wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
 


@@ -9635,30 +9766,30 @@ void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// access to the default attrbiutes
+// access to the default attributes

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

-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxColour wxGrid::GetDefaultCellBackgroundColour() const

 {
     return m_defaultCellAttr->GetBackgroundColour();
 }
 
 {
     return m_defaultCellAttr->GetBackgroundColour();
 }
 

-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const

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

-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const

 {
     return m_defaultCellAttr->GetFont();
 }
 
 {
     return m_defaultCellAttr->GetFont();
 }
 

-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const

 {
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 
 {
     m_defaultCellAttr->GetAlignment(horiz, vert);
 }
 

-bool wxGrid::GetDefaultCellOverflow()
+bool wxGrid::GetDefaultCellOverflow() const

 {
     return m_defaultCellAttr->GetOverflow();
 }
 {
     return m_defaultCellAttr->GetOverflow();
 }


@@ -9677,7 +9808,7 @@ wxGridCellEditor *wxGrid::GetDefaultEditor() const
 // access to cell attributes
 // ----------------------------------------------------------------------------
 
 // access to cell attributes
 // ----------------------------------------------------------------------------
 

-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+wxColour wxGrid::GetCellBackgroundColour(int row, int col) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetBackgroundColour();


@@ -9686,7 +9817,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col)
     return colour;
 }
 
     return colour;
 }
 

-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int row, int col ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxColour colour = attr->GetTextColour();


@@ -9695,7 +9826,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col )
     return colour;
 }
 
     return colour;
 }
 

-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int row, int col ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     wxFont font = attr->GetFont();


@@ -9704,14 +9835,14 @@ wxFont wxGrid::GetCellFont( int row, int col )
     return font;
 }
 
     return font;
 }
 

-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
     attr->DecRef();
 }
 
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetAlignment(horiz, vert);
     attr->DecRef();
 }
 

-bool wxGrid::GetCellOverflow( int row, int col )
+bool wxGrid::GetCellOverflow( int row, int col ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     bool allow = attr->GetOverflow();
 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     bool allow = attr->GetOverflow();


@@ -9720,14 +9851,14 @@ bool wxGrid::GetCellOverflow( int row, int col )
     return allow;
 }
 
     return allow;
 }
 

-void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const

 {
     wxGridCellAttr *attr = GetCellAttr(row, col);
     attr->GetSize( num_rows, num_cols );
     attr->DecRef();
 }
 
 {
     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) const

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


@@ -9736,7 +9867,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
     return renderer;
 }
 
     return renderer;
 }
 

-wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const

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


@@ -9758,7 +9889,7 @@ bool wxGrid::IsReadOnly(int row, int col) const
 // attribute support: cache, automatic provider creation, ...
 // ----------------------------------------------------------------------------
 
 // attribute support: cache, automatic provider creation, ...
 // ----------------------------------------------------------------------------
 

-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const

 {
     if ( !m_table )
     {
 {
     if ( !m_table )
     {


@@ -10112,10 +10243,7 @@ wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) con
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {

-        wxString errStr;
-
-        errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
-        wxFAIL_MSG(errStr.c_str());
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));

 
         return NULL;
     }
 
         return NULL;
     }


@@ -10128,10 +10256,7 @@ wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName)
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {
     int index = m_typeRegistry->FindOrCloneDataType(typeName);
     if ( index == wxNOT_FOUND )
     {

-        wxString errStr;
-
-        errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
-        wxFAIL_MSG(errStr.c_str());
+        wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));

 
         return NULL;
     }
 
         return NULL;
     }


@@ -10198,8 +10323,7 @@ void wxGrid::SetRowSize( int row, int height )
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;
     int diff = h - m_rowHeights[row];
 
     m_rowHeights[row] = h;

-    int i;
-    for ( i = row; i < m_numRows; i++ )
+    for ( int i = row; i < m_numRows; i++ )

     {
         m_rowBottoms[i] += diff;
     }
     {
         m_rowBottoms[i] += diff;
     }


@@ -10210,7 +10334,8 @@ void wxGrid::SetRowSize( int row, int height )
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {

-    m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
+    // we dont allow zero default column width
+    m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );

 
     if ( resizeExistingCols )
     {
 
     if ( resizeExistingCols )
     {


@@ -10262,12 +10387,9 @@ void wxGrid::SetColSize( int col, int width )
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
 

-    int i;
-    int colPos;
-    for ( colPos = GetColPos( col ); colPos < m_numCols; colPos++ )
+    for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )

     {
     {

-        i = GetColAt( colPos );
-        m_colRights[i] += diff;
+        m_colRights[GetColAt(colPos)] += diff;

     }
 
     if ( !GetBatchCount() )
     }
 
     if ( !GetBatchCount() )


@@ -10338,8 +10460,11 @@ int  wxGrid::GetRowMinimalAcceptableHeight() const
 // auto sizing
 // ----------------------------------------------------------------------------
 
 // auto sizing
 // ----------------------------------------------------------------------------
 

-void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
+void
+wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)

 {
 {

+    const bool column = direction == wxGRID_COLUMN;
+

     wxClientDC dc(m_gridWin);
 
     // cancel editing of cell
     wxClientDC dc(m_gridWin);
 
     // cancel editing of cell


@@ -10412,6 +10537,12 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 
     if ( column )
     {
 
     if ( column )
     {

+        // Ensure automatic width is not less than minimal width. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetColSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+

         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {
         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {


@@ -10427,6 +10558,12 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     }
     else
     {
     }
     else
     {

+        // Ensure automatic width is not less than minimal height. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetRowSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+

         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {
         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {


@@ -10450,12 +10587,66 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     }
 }
 
     }
 }
 

+wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction)
+{
+    // calculate size for the rows or columns?
+    const bool calcRows = direction == wxGRID_ROW;
+
+    wxClientDC dc(calcRows ? GetGridRowLabelWindow()
+                           : GetGridColLabelWindow());
+    dc.SetFont(GetLabelFont());
+
+    // which dimension should we take into account for calculations?
+    //
+    // for columns, the text can be only horizontal so it's easy but for rows
+    // we also have to take into account the text orientation
+    const bool
+        useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL);
+
+    wxArrayString lines;
+    wxCoord extentMax = 0;
+
+    const int numRowsOrCols = calcRows ? m_numRows : m_numCols;
+    for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ )
+    {
+        lines.Clear();
+
+        wxString label = calcRows ? GetRowLabelValue(rowOrCol)
+                                  : GetColLabelValue(rowOrCol);
+        StringToLines(label, lines);
+
+        long w, h;
+        GetTextBoxSize(dc, lines, &w, &h);
+
+        const wxCoord extent = useWidth ? w : h;
+        if ( extent > extentMax )
+            extentMax = extent;
+    }
+
+    if ( !extentMax )
+    {
+        // empty column - give default extent (notice that if extentMax is less
+        // than default extent but != 0, it's OK)
+        extentMax = calcRows ? GetDefaultRowLabelSize()
+                             : GetDefaultColLabelSize();
+    }
+
+    // leave some space around text (taken from AutoSizeColOrRow)
+    if ( calcRows )
+        extentMax += 10;
+    else
+        extentMax += 6;
+
+    return extentMax;
+}
+

 int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
     int width = m_rowLabelWidth;
 
 int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
 {
     int width = m_rowLabelWidth;
 

-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);

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


@@ -10465,9 +10656,6 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
         width += GetColWidth(col);
     }
 
         width += GetColWidth(col);
     }
 

-    if ( !calcOnly )
-        EndBatch();
-

     return width;
 }
 
     return width;
 }
 


@@ -10475,8 +10663,9 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
 {
     int height = m_colLabelHeight;
 
 {
     int height = m_colLabelHeight;
 

-    if ( !calcOnly )
-        BeginBatch();
+    wxGridUpdateLocker locker;
+    if(!calcOnly)
+        locker.Create(this);

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


@@ -10486,31 +10675,24 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
         height += GetRowHeight(row);
     }
 
         height += GetRowHeight(row);
     }
 

-    if ( !calcOnly )
-        EndBatch();
-

     return height;
 }
 
 void wxGrid::AutoSize()
 {
     return height;
 }
 
 void wxGrid::AutoSize()
 {

-    BeginBatch();
-
-    wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));
+    wxGridUpdateLocker locker(this);

 
 

-    // 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) * m_scrollLineX,
-        GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY );
+    // we need to round up the size of the scrollable area to a multiple of
+    // scroll step to ensure that we don't get the scrollbars when we're sized
+    // exactly to fit our contents
+    wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
+                SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
+    wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+                   GetScrollY(size.y) * GetScrollLineY());

 
     // distribute the extra space between the columns/rows to avoid having
     // extra white space
 
     // distribute the extra space between the columns/rows to avoid having
     // extra white space

-
-    // Remove the extra m_extraWidth + 1 added above
-    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+    wxCoord diff = sizeFit.x - size.x;

     if ( diff && m_numCols )
     {
         // try to resize the columns uniformly
     if ( diff && m_numCols )
     {
         // try to resize the columns uniformly


@@ -10535,7 +10717,7 @@ void wxGrid::AutoSize()
     }
 
     // same for rows
     }
 
     // same for rows

-    diff = sizeFit.y - size.y - (m_extraHeight + 1);
+    diff = sizeFit.y - size.y;

     if ( diff && m_numRows )
     {
         // try to resize the columns uniformly
     if ( diff && m_numRows )
     {
         // try to resize the columns uniformly


@@ -10559,9 +10741,11 @@ void wxGrid::AutoSize()
         }
     }
 
         }
     }
 

-    EndBatch();
-
-    SetClientSize(sizeFit);
+    // we know that we're not going to have scrollbars so disable them now to
+    // avoid trouble in SetClientSize() which can otherwise set the correct
+    // client size but also leave space for (not needed any more) scrollbars
+    SetScrollbars(0, 0, 0, 0, 0, 0, true);
+    SetClientSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight);

 }
 
 void wxGrid::AutoSizeRowLabelSize( int row )
 }
 
 void wxGrid::AutoSizeRowLabelSize( int row )


@@ -10615,46 +10799,22 @@ void wxGrid::AutoSizeColLabelSize( int col )
 
 wxSize wxGrid::DoGetBestSize() const
 {
 
 wxSize wxGrid::DoGetBestSize() const
 {

-    // don't set sizes, only calculate them

     wxGrid *self = (wxGrid *)this;  // const_cast
 
     wxGrid *self = (wxGrid *)this;  // const_cast
 

-    int width, height;
-    width = self->SetOrCalcColumnSizes(true);
-    height = self->SetOrCalcRowSizes(true);
-
-    if (!width)
-        width = 100;
-    if (!height)
-        height = 80;
-
-    // Round up to a multiple the scroll rate
-    // NOTE: this still doesn't get rid of the scrollbars;
-    // is there any magic incantation for that?
-    int xpu, ypu;
-    GetScrollPixelsPerUnit(&xpu, &ypu);
-    if (xpu)
-        width  += 1 + xpu - (width  % xpu);
-    if (ypu)
-        height += 1 + ypu - (height % ypu);
-
-    // limit to 1/4 of the screen size
-    int maxwidth, maxheight;
-    wxDisplaySize( &maxwidth, &maxheight );
-    maxwidth /= 2;
-    maxheight /= 2;
-    if ( width > maxwidth )
-        width = maxwidth;
-    if ( height > maxheight )
-        height = maxheight;
-
-    wxSize best(width, height);
+    // we do the same as in AutoSize() here with the exception that we don't
+    // change the column/row sizes, only calculate them
+    wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth,
+                self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight);
+    wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+                   GetScrollY(size.y) * GetScrollLineY());

 
     // NOTE: This size should be cached, but first we need to add calls to
     // InvalidateBestSize everywhere that could change the results of this
     // calculation.
     // CacheBestSize(size);
 
 
     // NOTE: This size should be cached, but first we need to add calls to
     // InvalidateBestSize everywhere that could change the results of this
     // calculation.
     // CacheBestSize(size);
 

-    return best;
+    return wxSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight)
+            + GetWindowBorderSize();

 }
 
 void wxGrid::Fit()
 }
 
 void wxGrid::Fit()


@@ -10793,7 +10953,7 @@ void wxGrid::DeselectCell( int row, int col )
         m_selection->ToggleCellSelection(row, col);
 }
 
         m_selection->ToggleCellSelection(row, col);
 }
 

-bool wxGrid::IsSelection()
+bool wxGrid::IsSelection() const

 {
     return ( m_selection && (m_selection->IsSelection() ||
              ( m_selectingTopLeft != wxGridNoCellCoords &&
 {
     return ( m_selection && (m_selection->IsSelection() ||
              ( m_selectingTopLeft != wxGridNoCellCoords &&


@@ -10877,7 +11037,7 @@ void wxGrid::ClearSelection()
 // in device coords clipped to the client size of the grid window.
 //
 wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 // in device coords clipped to the client size of the grid window.
 //
 wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,

-                                  const wxGridCellCoords &bottomRight )
+                                  const wxGridCellCoords &bottomRight ) const

 {
     wxRect rect( wxGridNoCellRect );
     wxRect cellRect;
 {
     wxRect rect( wxGridNoCellRect );
     wxRect cellRect;