From: Václav Slavík Date: Sun, 21 Aug 2011 09:07:06 +0000 (+0000) Subject: Rename wxDataViewCtrl::InvalidateColBestWidth* to UpdateColBestWidth*. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9489ebf0f1dcec639d23321b39a61dbc6c312432 Rename wxDataViewCtrl::InvalidateColBestWidth* to UpdateColBestWidth*. The new names make it more clear that the functions don't just set an invalidated flag, but that they actually do some recalculations. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 6e728635de..51c0e59077 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -224,8 +224,8 @@ private: virtual wxDataViewItem DoGetCurrentItem() const; virtual void DoSetCurrentItem(const wxDataViewItem& item); - void InvalidateColBestWidths(); - void InvalidateColBestWidth(int idx); + void UpdateColBestWidths(); + void UpdateColBestWidth(int idx); wxDataViewColumnList m_cols; // cached column best widths or 0 if not computed, values are for diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 38ccff89df..650060a5a7 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2003,7 +2003,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData m_count = -1; } - GetOwner()->InvalidateColBestWidths(); + GetOwner()->UpdateColBestWidths(); UpdateDisplay(); return true; @@ -2126,7 +2126,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, if( m_currentRow > GetRowCount() ) ChangeCurrentRow(m_count - 1); - GetOwner()->InvalidateColBestWidths(); + GetOwner()->UpdateColBestWidths(); UpdateDisplay(); return true; @@ -2137,7 +2137,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) SortPrepare(); g_model->Resort(); - GetOwner()->InvalidateColBestWidths(); + GetOwner()->UpdateColBestWidths(); // Send event wxWindow *parent = GetParent(); @@ -2178,7 +2178,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i SortPrepare(); g_model->Resort(); - GetOwner()->InvalidateColBestWidth(view_column); + GetOwner()->UpdateColBestWidth(view_column); // Send event wxWindow *parent = GetParent(); @@ -2201,7 +2201,7 @@ bool wxDataViewMainWindow::Cleared() SortPrepare(); BuildTree( GetOwner()->GetModel() ); - GetOwner()->InvalidateColBestWidths(); + GetOwner()->UpdateColBestWidths(); UpdateDisplay(); return true; @@ -4400,7 +4400,7 @@ bool wxDataViewCtrl::ClearColumns() return true; } -void wxDataViewCtrl::InvalidateColBestWidth(int idx) +void wxDataViewCtrl::UpdateColBestWidth(int idx) { m_colsBestWidths[idx] = 0; @@ -4408,7 +4408,7 @@ void wxDataViewCtrl::InvalidateColBestWidth(int idx) m_headerArea->UpdateColumn(idx); } -void wxDataViewCtrl::InvalidateColBestWidths() +void wxDataViewCtrl::UpdateColBestWidths() { m_colsBestWidths.clear(); m_colsBestWidths.resize(m_cols.size());