Removed wxDataViewViewColumn since it is redundant.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,7 +32,6 @@ const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
|
||||
|
||||
wxDataViewListModel::wxDataViewListModel()
|
||||
{
|
||||
m_viewingColumns.DeleteContents( true );
|
||||
m_notifiers.DeleteContents( true );
|
||||
}
|
||||
|
||||
@@ -168,28 +167,6 @@ bool wxDataViewListModel::Cleared()
|
||||
return ret;
|
||||
}
|
||||
|
||||
void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
|
||||
{
|
||||
m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
|
||||
}
|
||||
|
||||
void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
|
||||
{
|
||||
wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
|
||||
while (node)
|
||||
{
|
||||
wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
|
||||
|
||||
if (tmp->m_viewColumn == column)
|
||||
{
|
||||
m_viewingColumns.DeleteObject( tmp );
|
||||
return;
|
||||
}
|
||||
|
||||
node = node->GetNext();
|
||||
}
|
||||
}
|
||||
|
||||
void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
|
||||
{
|
||||
m_notifiers.Append( notifier );
|
||||
@@ -872,11 +849,6 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
|
||||
{
|
||||
if (m_renderer)
|
||||
delete m_renderer;
|
||||
|
||||
if (GetOwner())
|
||||
{
|
||||
GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
|
||||
}
|
||||
}
|
||||
|
||||
int wxDataViewColumnBase::GetFlags() const
|
||||
@@ -1029,7 +1001,6 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
|
||||
{
|
||||
m_cols.Append( (wxObject*) col );
|
||||
col->SetOwner( (wxDataViewCtrl*) this );
|
||||
m_model->AddViewingColumn( col, col->GetModelColumn() );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user