Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxDataViewCtrl::InvalidateColBestWidth* to UpdateColBestWidth*.

Browse Source 
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
This commit is contained in:
Václav Slavík
2011-08-21 09:07:06 +00:00
parent ac0981084b
commit 9489ebf0f1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/dataview.h
View File

@@ -224,8 +224,8 @@ private:
virtual wxDataViewItem DoGetCurrentItem() const; virtual wxDataViewItem DoGetCurrentItem() const;
virtual void DoSetCurrentItem(const wxDataViewItem& item); virtual void DoSetCurrentItem(const wxDataViewItem& item);
void InvalidateColBestWidths(); void UpdateColBestWidths();
void InvalidateColBestWidth(int idx); void UpdateColBestWidth(int idx);
wxDataViewColumnList m_cols; wxDataViewColumnList m_cols;
// cached column best widths or 0 if not computed, values are for // cached column best widths or 0 if not computed, values are for

14
src/generic/datavgen.cpp
View File

@@ -2003,7 +2003,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
m_count = -1; m_count = -1;
} }
GetOwner()->InvalidateColBestWidths(); GetOwner()->UpdateColBestWidths();
UpdateDisplay(); UpdateDisplay();
return true; return true;
@@ -2126,7 +2126,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
if( m_currentRow > GetRowCount() ) if( m_currentRow > GetRowCount() )
ChangeCurrentRow(m_count - 1); ChangeCurrentRow(m_count - 1);
GetOwner()->InvalidateColBestWidths(); GetOwner()->UpdateColBestWidths();
UpdateDisplay(); UpdateDisplay();
return true; return true;
@@ -2137,7 +2137,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
SortPrepare(); SortPrepare();
g_model->Resort(); g_model->Resort();
GetOwner()->InvalidateColBestWidths(); GetOwner()->UpdateColBestWidths();
// Send event // Send event
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
@@ -2178,7 +2178,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
SortPrepare(); SortPrepare();
g_model->Resort(); g_model->Resort();
GetOwner()->InvalidateColBestWidth(view_column); GetOwner()->UpdateColBestWidth(view_column);
// Send event // Send event
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
@@ -2201,7 +2201,7 @@ bool wxDataViewMainWindow::Cleared()
SortPrepare(); SortPrepare();
BuildTree( GetOwner()->GetModel() ); BuildTree( GetOwner()->GetModel() );
GetOwner()->InvalidateColBestWidths(); GetOwner()->UpdateColBestWidths();
UpdateDisplay(); UpdateDisplay();
return true; return true;
@@ -4400,7 +4400,7 @@ bool wxDataViewCtrl::ClearColumns()
return true; return true;
} }
void wxDataViewCtrl::InvalidateColBestWidth(int idx) void wxDataViewCtrl::UpdateColBestWidth(int idx)
{ {
m_colsBestWidths[idx] = 0; m_colsBestWidths[idx] = 0;
@@ -4408,7 +4408,7 @@ void wxDataViewCtrl::InvalidateColBestWidth(int idx)
m_headerArea->UpdateColumn(idx); m_headerArea->UpdateColumn(idx);
} }
void wxDataViewCtrl::InvalidateColBestWidths() void wxDataViewCtrl::UpdateColBestWidths()
{ {
m_colsBestWidths.clear(); m_colsBestWidths.clear();
m_colsBestWidths.resize(m_cols.size()); m_colsBestWidths.resize(m_cols.size());