Ensure there is valid context for DrawRectangle

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 21c53c66dabe54a6fd54ec1e7b38fb8d199e9ab6..def4fb5877478b7f13170d42e6f05da2070d84ce 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -80,7 +80,22 @@ static const int EXPANDER_OFFSET = 1;
 // For the generic implementation, both the leaf nodes and the nodes are sorted for
 // fast search when needed
 static wxDataViewModel* g_model;
 // For the generic implementation, both the leaf nodes and the nodes are sorted for
 // fast search when needed
 static wxDataViewModel* g_model;

-static int g_column = -2;
+
+// The column is either the index of the column to be used for sorting or one
+// of the special values in this enum:
+enum
+{
+    // Sort when we're thawed later.
+    SortColumn_OnThaw = -3,
+
+    // Don't sort at all.
+    SortColumn_None = -2,
+
+    // Sort using the model default sort order.
+    SortColumn_Default = -1
+};
+
+static int g_column = SortColumn_None;

 static bool g_asending = true;
 
 // ----------------------------------------------------------------------------
 static bool g_asending = true;
 
 // ----------------------------------------------------------------------------


@@ -347,7 +362,7 @@ public:
     static wxDataViewTreeNode* CreateRootNode()
     {
         wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());
     static wxDataViewTreeNode* CreateRootNode()
     {
         wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());

-        n->SetHasChildren(true);
+        n->m_branchData = new BranchNodeData;

         n->m_branchData->open = true;
         return n;
     }
         n->m_branchData->open = true;
         return n;
     }


@@ -416,6 +431,11 @@ public:
 
     void ToggleOpen()
     {
 
     void ToggleOpen()
     {

+        // We do not allow the (invisible) root node to be collapsed because
+        // there is no way to expand it again.
+        if ( !m_parent )
+            return;
+

         wxCHECK_RET( m_branchData != NULL, "can't open leaf node" );
 
         int sum = 0;
         wxCHECK_RET( m_branchData != NULL, "can't open leaf node" );
 
         int sum = 0;


@@ -446,6 +466,11 @@ public:
 
     void SetHasChildren(bool has)
     {
 
     void SetHasChildren(bool has)
     {

+        // The invisible root item always has children, so ignore any attempts
+        // to change this.
+        if ( !m_parent )
+            return;
+

         if ( !has )
         {
             wxDELETE(m_branchData);
         if ( !has )
         {
             wxDELETE(m_branchData);


@@ -571,16 +596,39 @@ public:
         UpdateDisplay();
     }
 
         UpdateDisplay();
     }
 

+    // Override the base class method to resort if needed, i.e. if
+    // SortPrepare() was called -- and ignored -- while we were frozen.
+    virtual void DoThaw()
+    {
+        if ( g_column == SortColumn_OnThaw )
+        {
+            Resort();
+            g_column = SortColumn_None;
+        }
+
+        wxWindow::DoThaw();
+    }
+

     void SortPrepare()
     {
         g_model = GetModel();
     void SortPrepare()
     {
         g_model = GetModel();

+
+        // Avoid sorting while the window is frozen, this allows to quickly add
+        // many items without resorting after each addition and only resort
+        // them all at once when the window is finally thawed, see above.
+        if ( IsFrozen() )
+        {
+            g_column = SortColumn_OnThaw;
+            return;
+        }
+

         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
         if( !col )
         {
             if (g_model->HasDefaultCompare())
         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
         if( !col )
         {
             if (g_model->HasDefaultCompare())

-                g_column = -1;
+                g_column = SortColumn_Default;

             else
             else

-                g_column = -2;
+                g_column = SortColumn_None;

 
             g_asending = true;
             return;
 
             g_asending = true;
             return;


@@ -602,7 +650,7 @@ public:
     void OnPaint( wxPaintEvent &event );
     void OnCharHook( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnPaint( wxPaintEvent &event );
     void OnCharHook( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );

-    void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event);
+    void OnVerticalNavigation(int delta, const wxKeyEvent& event);

     void OnLeftKey();
     void OnRightKey();
     void OnMouse( wxMouseEvent &event );
     void OnLeftKey();
     void OnRightKey();
     void OnMouse( wxMouseEvent &event );


@@ -668,6 +716,7 @@ public:
 
     void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
     int GetRowHeight() const { return m_lineHeight; }
 
     void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
     int GetRowHeight() const { return m_lineHeight; }

+    int GetDefaultRowHeight() const;

 
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
 
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;


@@ -1007,11 +1056,13 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
         GetEnabled() == false)
         flags |= wxCONTROL_DISABLED;
 
         GetEnabled() == false)
         flags |= wxCONTROL_DISABLED;
 

-    // check boxes we draw must always have the same, standard size (if it's
-    // bigger than the cell size the checkbox will be truncated because the
-    // caller had set the clipping rectangle to prevent us from drawing outside
-    // the cell)
-    cell.SetSize(GetSize());
+    // Ensure that the check boxes always have at least the minimal required
+    // size, otherwise DrawCheckBox() doesn't really work well. If this size is
+    // greater than the cell size, the checkbox will be truncated but this is a
+    // lesser evil.
+    wxSize size = cell.GetSize();
+    size.IncTo(GetSize());
+    cell.SetSize(size);

 
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
 
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),


@@ -1187,7 +1238,17 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVar
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 

-    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    // The icon can't be edited so get its old value and reuse it.
+    wxVariant valueOld;
+    wxDataViewColumn* const col = GetOwner();
+    GetView()->GetModel()->GetValue(valueOld, m_item, col->GetModelColumn());
+
+    wxDataViewIconText iconText;
+    iconText << valueOld;
+
+    // But replace the text with the value entered by user.
+    iconText.SetText(text->GetValue());
+

     value << iconText;
     return true;
 }
     value << iconText;
     return true;
 }


@@ -1375,16 +1436,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_currentCol = NULL;
     m_currentColSetByKeyboard = false;
     m_useCellFocus = false;
     m_currentCol = NULL;
     m_currentColSetByKeyboard = false;
     m_useCellFocus = false;

-    m_currentRow = 0;
-
-#ifdef __WXMSW__
-    // We would like to use the same line height that Explorer uses. This is
-    // different from standard ListView control since Vista.
-    if ( wxGetWinVersion() >= wxWinVersion_Vista )
-        m_lineHeight = wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height
-    else
-#endif // __WXMSW__
-        m_lineHeight = wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height
+    m_currentRow = (unsigned)-1;
+    m_lineHeight = GetDefaultRowHeight();

 
 #if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;
 
 #if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;


@@ -1427,6 +1480,20 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
 }
 
 
 }
 
 

+int wxDataViewMainWindow::GetDefaultRowHeight() const
+{
+#ifdef __WXMSW__
+    // We would like to use the same line height that Explorer uses. This is
+    // different from standard ListView control since Vista.
+    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+        return wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height
+    else
+#endif // __WXMSW__
+        return wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height
+}
+
+
+

 #if wxUSE_DRAG_AND_DROP
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {
 #if wxUSE_DRAG_AND_DROP
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {


@@ -1480,6 +1547,7 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );

+    event.SetDropEffect( def );

     if (!m_owner->HandleWindowEvent( event ))
     {
         RemoveDropHint();
     if (!m_owner->HandleWindowEvent( event ))
     {
         RemoveDropHint();


@@ -1556,6 +1624,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo
     event.SetDataFormat( format );
     event.SetDataSize( obj->GetSize() );
     event.SetDataBuffer( obj->GetData() );
     event.SetDataFormat( format );
     event.SetDataSize( obj->GetSize() );
     event.SetDataBuffer( obj->GetData() );

+    event.SetDropEffect( def );

     if (!m_owner->HandleWindowEvent( event ))
         return wxDragNone;
 
     if (!m_owner->HandleWindowEvent( event ))
         return wxDragNone;
 


@@ -1681,11 +1750,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxDataViewModel *model = GetModel();
     wxAutoBufferedPaintDC dc( this );
 
     wxDataViewModel *model = GetModel();
     wxAutoBufferedPaintDC dc( this );
 

-#ifdef __WXMSW__

     dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(GetClientSize());
     dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(GetClientSize());

-#endif

 
     if ( IsEmpty() )
     {
 
     if ( IsEmpty() )
     {


@@ -2325,7 +2392,17 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         // If this was the last child to be removed, it's possible the parent
         // node became a leaf. Let's ask the model about it.
         if ( parentNode->GetChildNodes().empty() )
         // If this was the last child to be removed, it's possible the parent
         // node became a leaf. Let's ask the model about it.
         if ( parentNode->GetChildNodes().empty() )

-            parentNode->SetHasChildren(GetModel()->IsContainer(parent));
+        {
+            bool isContainer = GetModel()->IsContainer(parent);
+            parentNode->SetHasChildren(isContainer);
+            if ( isContainer )
+            {
+                // If it's still a container, make sure we show "+" icon for it
+                // and not "-" one as there is nothing to collapse any more.
+                if ( parentNode->IsOpen() )
+                    parentNode->ToggleOpen();
+            }
+        }

 
         // Update selection by removing 'item' and its entire children tree from the selection.
         if ( !m_selection.empty() )
 
         // Update selection by removing 'item' and its entire children tree from the selection.
         if ( !m_selection.empty() )


@@ -2366,7 +2443,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     }
 
     // Change the current row to the last row if the current exceed the max row number
     }
 
     // Change the current row to the last row if the current exceed the max row number

-    if( m_currentRow > GetRowCount() )
+    if ( m_currentRow >= GetRowCount() )

         ChangeCurrentRow(m_count - 1);
 
     GetOwner()->InvalidateColBestWidths();
         ChangeCurrentRow(m_count - 1);
 
     GetOwner()->InvalidateColBestWidths();


@@ -2440,9 +2517,17 @@ bool wxDataViewMainWindow::Cleared()
 {
     DestroyTree();
     m_selection.Clear();
 {
     DestroyTree();
     m_selection.Clear();

+    m_currentRow = (unsigned)-1;

 
 

-    SortPrepare();
-    BuildTree( GetModel() );
+    if (GetModel())
+    {
+        SortPrepare();
+        BuildTree( GetModel() );
+    }
+    else
+    {
+        m_count = 0;
+    }

 
     GetOwner()->InvalidateColBestWidths();
     UpdateDisplay();
 
     GetOwner()->InvalidateColBestWidths();
     UpdateDisplay();


@@ -2963,6 +3048,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
 {
     wxASSERT( !IsVirtualList() );
 
 {
     wxASSERT( !IsVirtualList() );
 

+    if ( row == (unsigned)-1 )
+        return NULL;
+

     RowToTreeNodeJob job( row , -2, m_root );
     Walker( m_root , job );
     return job.GetResult();
     RowToTreeNodeJob job( row , -2, m_root );
     Walker( m_root , job );
     return job.GetResult();


@@ -2970,15 +3058,20 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {

+    wxDataViewItem item;

     if (IsVirtualList())
     {
     if (IsVirtualList())
     {

-        return wxDataViewItem( wxUIntToPtr(row+1) );
+        if ( row < GetRowCount() )
+            item = wxDataViewItem(wxUIntToPtr(row+1));

     }
     else
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);
     }
     else
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);

-        return node ? node->GetItem() : wxDataViewItem();
+        if ( node )
+            item = node->GetItem();

     }
     }

+
+    return item;

 }
 
 bool
 }
 
 bool


@@ -3037,44 +3130,44 @@ void wxDataViewMainWindow::Expand( unsigned int row )
     if (!node->HasChildren())
         return;
 
     if (!node->HasChildren())
         return;
 

-            if (!node->IsOpen())
-            {
-                if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
-                {
-                    // Vetoed by the event handler.
-                    return;
-                }
+    if (!node->IsOpen())
+    {
+        if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
+        {
+            // Vetoed by the event handler.
+            return;
+        }

 
 

-                node->ToggleOpen();
+        node->ToggleOpen();

 
 

-                // build the children of current node
-                if( node->GetChildNodes().empty() )
-                {
-                    SortPrepare();
-                    ::BuildTreeHelper(GetModel(), node->GetItem(), node);
-                }
+        // build the children of current node
+        if( node->GetChildNodes().empty() )
+        {
+            SortPrepare();
+            ::BuildTreeHelper(GetModel(), node->GetItem(), node);
+        }

 
 

-                // By expanding the node all row indices that are currently in the selection list
-                // and are greater than our node have become invalid. So we have to correct that now.
-                const unsigned rowAdjustment = node->GetSubTreeCount();
-                for(unsigned i=0; i<m_selection.size(); ++i)
-                {
-                    const unsigned testRow = m_selection[i];
-                    // all rows above us are not affected, so skip them
-                    if(testRow <= row)
-                        continue;
+        // By expanding the node all row indices that are currently in the selection list
+        // and are greater than our node have become invalid. So we have to correct that now.
+        const unsigned rowAdjustment = node->GetSubTreeCount();
+        for(unsigned i=0; i<m_selection.size(); ++i)
+        {
+            const unsigned testRow = m_selection[i];
+            // all rows above us are not affected, so skip them
+            if(testRow <= row)
+                continue;

 
 

-                    m_selection[i] += rowAdjustment;
-                }
+            m_selection[i] += rowAdjustment;
+        }

 
 

-                if(m_currentRow > row)
-                    ChangeCurrentRow(m_currentRow + rowAdjustment);
+        if(m_currentRow > row)
+            ChangeCurrentRow(m_currentRow + rowAdjustment);

 
 

-                m_count = -1;
-                UpdateDisplay();
-                // Send the expanded event
-                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
-            }
+        m_count = -1;
+        UpdateDisplay();
+        // Send the expanded event
+        SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+    }

 }
 
 void wxDataViewMainWindow::Collapse(unsigned int row)
 }
 
 void wxDataViewMainWindow::Collapse(unsigned int row)


@@ -3660,13 +3753,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_UP:
             break;
 
         case WXK_UP:

-            if ( m_currentRow > 0 )
-                OnVerticalNavigation( m_currentRow - 1, event );
+            OnVerticalNavigation( -1, event );

             break;
 
         case WXK_DOWN:
             break;
 
         case WXK_DOWN:

-            if ( m_currentRow + 1 < GetRowCount() )
-                OnVerticalNavigation( m_currentRow + 1, event );
+            OnVerticalNavigation( +1, event );

             break;
         // Add the process for tree expanding/collapsing
         case WXK_LEFT:
             break;
         // Add the process for tree expanding/collapsing
         case WXK_LEFT:


@@ -3678,37 +3769,19 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_END:
             break;
 
         case WXK_END:

-        {
-            if (!IsEmpty())
-                OnVerticalNavigation( GetRowCount() - 1, event );
+            OnVerticalNavigation( +(int)GetRowCount(), event );

             break;
             break;

-        }
+

         case WXK_HOME:
         case WXK_HOME:

-            if (!IsEmpty())
-                OnVerticalNavigation( 0, event );
+            OnVerticalNavigation( -(int)GetRowCount(), event );

             break;
 
         case WXK_PAGEUP:
             break;
 
         case WXK_PAGEUP:

-            {
-                int steps = pageSize - 1;
-                int index = m_currentRow - steps;
-                if (index < 0)
-                    index = 0;
-
-                OnVerticalNavigation( index, event );
-            }
+            OnVerticalNavigation( -(pageSize - 1), event );

             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN:

-            {
-                int steps = pageSize - 1;
-                unsigned int index = m_currentRow + steps;
-                unsigned int count = GetRowCount();
-                if ( index >= count )
-                    index = count - 1;
-
-                OnVerticalNavigation( index, event );
-            }
+            OnVerticalNavigation( +(pageSize - 1), event );

             break;
 
         default:
             break;
 
         default:


@@ -3716,16 +3789,24 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     }
 }
 
     }
 }
 

-void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event)
+void wxDataViewMainWindow::OnVerticalNavigation(int delta, const wxKeyEvent& event)

 {
 {

-    wxCHECK_RET( newCurrent < GetRowCount(),
-                wxT("invalid item index in OnVerticalNavigation()") );
-

     // if there is no selection, we cannot move it anywhere
     // if there is no selection, we cannot move it anywhere

-    if (!HasCurrentRow())
+    if (!HasCurrentRow() || IsEmpty())

         return;
 
         return;
 

+    int newRow = (int)m_currentRow + delta;
+
+    // let's keep the new row inside the allowed range
+    if ( newRow < 0 )
+        newRow = 0;
+
+    const int rowCount = (int)GetRowCount();
+    if ( newRow >= rowCount )
+        newRow = rowCount - 1;
+

     unsigned int oldCurrent = m_currentRow;
     unsigned int oldCurrent = m_currentRow;

+    unsigned int newCurrent = (unsigned int)newRow;

 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow


@@ -3777,6 +3858,8 @@ void wxDataViewMainWindow::OnLeftKey()
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);

+        if ( !node )
+            return;

 
         if ( TryAdvanceCurrentColumn(node, /*forward=*/false) )
             return;
 
         if ( TryAdvanceCurrentColumn(node, /*forward=*/false) )
             return;


@@ -3819,6 +3902,8 @@ void wxDataViewMainWindow::OnRightKey()
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);

+        if ( !node )
+            return;

 
         if ( node->HasChildren() )
         {
 
         if ( node->HasChildren() )
         {


@@ -3903,9 +3988,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
         return;
     }
 

-    // set the focus to ourself if any of the mouse buttons are pressed
-    if(event.ButtonDown() && !HasFocus())
-        SetFocus();
+    if(event.ButtonDown())
+    {
+        // Not skipping button down events would prevent the system from
+        // setting focus to this window as most (all?) of them do by default,
+        // so skip it to enable default handling.
+        event.Skip();
+    }

 
     int x = event.GetX();
     int y = event.GetY();
 
     int x = event.GetX();
     int y = event.GetY();


@@ -3949,30 +4038,30 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             le.SetItem( item );
             le.SetColumn( col->GetModelColumn() );
             le.SetDataViewColumn( col );
             le.SetItem( item );
             le.SetColumn( col->GetModelColumn() );
             le.SetDataViewColumn( col );

-
-            wxVariant value;
-            model->GetValue( value, item, col->GetModelColumn() );
-            le.SetValue(value);

         }
 
         parent->ProcessWindowEvent(le);
         return;
     }
 
         }
 
         parent->ProcessWindowEvent(le);
         return;
     }
 

-    if (!col)
+    // Check if we clicked outside the item area.
+    if ((current >= GetRowCount()) || !col)

     {
     {

+        // Follow Windows convention here: clicking either left or right (but
+        // not middle) button clears the existing selection.
+        if (m_owner && (event.LeftDown() || event.RightDown()))
+        {
+            if (!GetSelections().empty())
+            {
+                m_owner->UnselectAll();
+                SendSelectionChangedEvent(wxDataViewItem());
+            }
+        }

         event.Skip();
         return;
     }
 
     wxDataViewRenderer *cell = col->GetRenderer();
         event.Skip();
         return;
     }
 
     wxDataViewRenderer *cell = col->GetRenderer();

-    if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
-    {
-        // Unselect all if below the last row ?
-        event.Skip();
-        return;
-    }
-

     wxDataViewColumn* const
         expander = GetExpanderColumnOrFirstOne(GetOwner());
 
     wxDataViewColumn* const
         expander = GetExpanderColumnOrFirstOne(GetOwner());
 


@@ -4068,7 +4157,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
             wxDataViewDropSource drag( this, drag_item_row );
             drag.SetData( *obj );
 
             wxDataViewDropSource drag( this, drag_item_row );
             drag.SetData( *obj );

-            /* wxDragResult res = */ drag.DoDragDrop();
+            /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags());

             delete obj;
         }
         return;
             delete obj;
         }
         return;


@@ -4250,8 +4339,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_currentCol = col;
         m_currentColSetByKeyboard = false;
 
         m_currentCol = col;
         m_currentColSetByKeyboard = false;
 

+        // This flag is used to decide whether we should start editing the item
+        // label. We do it if the user clicks twice (but not double clicks,
+        // i.e. simulateClick is false) on the same item but not if the click
+        // was used for something else already, e.g. selecting the item (so it
+        // must have been already selected) or giving the focus to the control
+        // (so it must have had focus already).

         m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&
         m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&

-                        (current == oldCurrentRow)) && oldWasSelected;
+                        (current == oldCurrentRow)) && oldWasSelected &&
+                        HasFocus();

 
         // Call ActivateCell() after everything else as under GTK+
         if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) )
 
         // Call ActivateCell() after everything else as under GTK+
         if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) )


@@ -4379,6 +4475,7 @@ void wxDataViewCtrl::Init()
     m_sortingColumnIdx = wxNOT_FOUND;
 
     m_headerArea = NULL;
     m_sortingColumnIdx = wxNOT_FOUND;
 
     m_headerArea = NULL;

+    m_clientArea = NULL;

 
     m_colsDirty = false;
 }
 
     m_colsDirty = false;
 }


@@ -4492,18 +4589,53 @@ void wxDataViewCtrl::SetFocus()
         m_clientArea->SetFocus();
 }
 
         m_clientArea->SetFocus();
 }
 

+bool wxDataViewCtrl::SetFont(const wxFont & font)
+{
+    if (!wxControl::SetFont(font))
+        return false;
+
+    if (m_headerArea)
+        m_headerArea->SetFont(font);
+
+    if (m_clientArea)
+    {
+        m_clientArea->SetFont(font);
+        m_clientArea->SetRowHeight(m_clientArea->GetDefaultRowHeight());
+    }
+
+    if (m_headerArea || m_clientArea)
+    {
+        InvalidateColBestWidths();
+        Layout();
+    }
+
+    return true;
+}
+
+
+

 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 

-    m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
-
-    model->AddNotifier( m_notifier );
+    if (model)
+    {
+        m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
+        model->AddNotifier( m_notifier );
+    }
+    else if (m_notifier)
+    {
+        m_notifier->Cleared();
+        m_notifier = NULL;
+    }

 
     m_clientArea->DestroyTree();
 
 
     m_clientArea->DestroyTree();
 

-    m_clientArea->BuildTree(model);
+    if (model)
+    {
+        m_clientArea->BuildTree(model);
+    }

 
     m_clientArea->UpdateDisplay();
 
 
     m_clientArea->UpdateDisplay();
 


@@ -4530,7 +4662,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Append( col );
         return false;
 
     m_cols.Append( col );

-    m_colsBestWidths.push_back(0);
+    m_colsBestWidths.push_back(CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4541,7 +4673,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
         return false;
 
     m_cols.Insert( col );

-    m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin(), CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4552,7 +4684,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( pos, col );
         return false;
 
     m_cols.Insert( pos, col );

-    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4627,8 +4759,8 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
 
 unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 {
 
 unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 {

-    if ( m_colsBestWidths[idx] != 0 )
-        return m_colsBestWidths[idx];
+    if ( m_colsBestWidths[idx].width != 0 )
+        return m_colsBestWidths[idx].width;

 
     const int count = m_clientArea->GetRowCount();
     wxDataViewColumn *column = GetColumn(idx);
 
     const int count = m_clientArea->GetRowCount();
     wxDataViewColumn *column = GetColumn(idx);


@@ -4701,6 +4833,8 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
                                   GetModel(), column->GetModelColumn(),
                                   m_clientArea->GetRowHeight());
 
                                   GetModel(), column->GetModelColumn(),
                                   m_clientArea->GetRowHeight());
 

+    calculator.UpdateWithWidth(column->GetMinWidth());
+

     if ( m_headerArea )
         calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));
 
     if ( m_headerArea )
         calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));
 


@@ -4776,7 +4910,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
     if ( max_width > 0 )
         max_width += 2 * PADDING_RIGHTLEFT;
 
     if ( max_width > 0 )
         max_width += 2 * PADDING_RIGHTLEFT;
 

-    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx].width = max_width;

     return max_width;
 }
 
     return max_width;
 }
 


@@ -4821,12 +4955,14 @@ bool wxDataViewCtrl::ClearColumns()
 
 void wxDataViewCtrl::InvalidateColBestWidth(int idx)
 {
 
 void wxDataViewCtrl::InvalidateColBestWidth(int idx)
 {

-    m_colsBestWidths[idx] = 0;
+    m_colsBestWidths[idx].width = 0;
+    m_colsBestWidths[idx].dirty = true;

     m_colsDirty = true;
 }
 
 void wxDataViewCtrl::InvalidateColBestWidths()
 {
     m_colsDirty = true;
 }
 
 void wxDataViewCtrl::InvalidateColBestWidths()
 {

+    // mark all columns as dirty:

     m_colsBestWidths.clear();
     m_colsBestWidths.resize(m_cols.size());
     m_colsDirty = true;
     m_colsBestWidths.clear();
     m_colsBestWidths.resize(m_cols.size());
     m_colsDirty = true;


@@ -4834,14 +4970,27 @@ void wxDataViewCtrl::InvalidateColBestWidths()
 
 void wxDataViewCtrl::UpdateColWidths()
 {
 
 void wxDataViewCtrl::UpdateColWidths()
 {

+    m_colsDirty = false;
+

     if ( !m_headerArea )
         return;
 
     const unsigned len = m_colsBestWidths.size();
     for ( unsigned i = 0; i < len; i++ )
     {
     if ( !m_headerArea )
         return;
 
     const unsigned len = m_colsBestWidths.size();
     for ( unsigned i = 0; i < len; i++ )
     {

-        if ( m_colsBestWidths[i] == 0 )
+        // Note that we have to have an explicit 'dirty' flag here instead of
+        // checking if the width==0, as is done in GetBestColumnWidth().
+        //
+        // Testing width==0 wouldn't work correctly if some code called
+        // GetWidth() after col. width invalidation but before
+        // wxDataViewCtrl::UpdateColWidths() was called at idle time. This
+        // would result in the header's column width getting out of sync with
+        // the control itself.
+        if ( m_colsBestWidths[i].dirty )
+        {

             m_headerArea->UpdateColumn(i);
             m_headerArea->UpdateColumn(i);

+            m_colsBestWidths[i].dirty = false;
+        }

     }
 }
 
     }
 }
 


@@ -4850,10 +4999,7 @@ void wxDataViewCtrl::OnInternalIdle()
     wxDataViewCtrlBase::OnInternalIdle();
 
     if ( m_colsDirty )
     wxDataViewCtrlBase::OnInternalIdle();
 
     if ( m_colsDirty )

-    {
-        m_colsDirty = false;

         UpdateColWidths();
         UpdateColWidths();

-    }

 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const


@@ -5063,14 +5209,20 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
 
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)

+    {

         m_clientArea->Expand(row);
         m_clientArea->Expand(row);

+        InvalidateColBestWidths();
+    }

 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)

+    {

         m_clientArea->Collapse(row);
         m_clientArea->Collapse(row);

+        InvalidateColBestWidths();
+    }

 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const