const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
-// ---------------------------------------------------------
-// wxDataViewListModel
-// ---------------------------------------------------------
-
-wxDataViewListModel::wxDataViewListModel()
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
{
- m_notifiers.DeleteContents( true );
+ return (left.GetID() == right.GetID() );
}
-wxDataViewListModel::~wxDataViewListModel()
-{
-}
-bool wxDataViewListModel::RowAppended()
-{
- bool ret = true;
+// ---------------------------------------------------------
+// wxDataViewModel
+// ---------------------------------------------------------
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
- {
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowAppended())
- ret = false;
- node = node->GetNext();
- }
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxDataViewModelNotifiers);
- return ret;
-}
-
-bool wxDataViewListModel::RowPrepended()
+wxDataViewModel::wxDataViewModel()
{
- bool ret = true;
-
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
- {
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowPrepended())
- ret = false;
- node = node->GetNext();
- }
-
- return ret;
+ m_notifiers.DeleteContents( true );
+ m_sortingColumn = 0;
+ m_ascending = true;
}
-bool wxDataViewListModel::RowInserted( unsigned int before )
+bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
{
bool ret = true;
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowInserted(before))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemAdded( parent, item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowDeleted( unsigned int row )
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
{
bool ret = true;
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowDeleted( row ))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemDeleted( parent, item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowChanged( unsigned int row )
+bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )
{
bool ret = true;
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowChanged( row ))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemChanged( item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
+bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col )
{
bool ret = true;
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->ValueChanged( col, row ))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ValueChanged( item, col ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
+bool wxDataViewModel::Cleared()
{
bool ret = true;
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->RowsReordered( new_order ))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->Cleared())
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::Cleared()
+void wxDataViewModel::Resort()
{
- bool ret = true;
-
- wxList::compatibility_iterator node = m_notifiers.GetFirst();
- while (node)
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
{
- wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
- if (!notifier->Cleared())
- ret = false;
- node = node->GetNext();
+ wxDataViewModelNotifier* notifier = *iter;
+ notifier->Resort();
}
-
- return ret;
}
-void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
{
- m_notifiers.Append( notifier );
+ m_notifiers.push_back( notifier );
notifier->SetOwner( this );
}
-void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
{
m_notifiers.DeleteObject( notifier );
}
-// ---------------------------------------------------------
-// wxDataViewSortedListModelNotifier
-// ---------------------------------------------------------
-
-class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
-{
-public:
- wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
- { m_model = model; }
-
- ~wxDataViewSortedListModelNotifier()
- { m_model->DetachChild(); }
-
- virtual bool RowAppended()
- { return m_model->ChildRowAppended(); }
-
- virtual bool RowPrepended()
- { return m_model->ChildRowPrepended(); }
-
- virtual bool RowInserted( unsigned int before )
- { return m_model->ChildRowInserted( before ); }
-
- virtual bool RowDeleted( unsigned int row )
- { return m_model->ChildRowDeleted( row ); }
-
- virtual bool RowChanged( unsigned int row )
- { return m_model->ChildRowChanged( row ); }
-
- virtual bool ValueChanged( unsigned int col, unsigned int row )
- { return m_model->ChildValueChanged( col, row); }
-
- virtual bool RowsReordered( unsigned int *new_order )
- { return m_model->ChildRowsReordered( new_order ); }
-
- virtual bool Cleared()
- { return m_model->ChildCleared(); }
-
- wxDataViewSortedListModel *m_model;
-};
-
-// ---------------------------------------------------------
-// wxDataViewSortedListModel compare function
-// ---------------------------------------------------------
-
-int wxCALLBACK wxDataViewListModelSortedDefaultCompare
- (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
{
+ // sort branches before leaves
+ bool item1_is_container = IsContainer(item1);
+ bool item2_is_container = IsContainer(item2);
+
+ if (item1_is_container && !item2_is_container)
+ return 1;
+ if (item2_is_container && !item1_is_container)
+ return -1;
+
wxVariant value1,value2;
- model->GetValue( value1, col, row1 );
- model->GetValue( value2, col, row2 );
+ GetValue( value1, item1, m_sortingColumn );
+ GetValue( value2, item2, m_sortingColumn );
+
+ if (!m_ascending)
+ {
+ wxVariant temp = value1;
+ value1 = value2;
+ value2 = temp;
+ }
+
if (value1.GetType() == wxT("string"))
{
wxString str1 = value1.GetString();
wxString str2 = value2.GetString();
- return str1.Cmp( str2 );
- }
+ int res = str1.Cmp( str2 );
+ if (res) return res;
+ } else
if (value1.GetType() == wxT("long"))
{
long l1 = value1.GetLong();
long l2 = value2.GetLong();
- return l1-l2;
- }
+ long res = l1-l2;
+ if (res) return res;
+ } else
if (value1.GetType() == wxT("double"))
{
double d1 = value1.GetDouble();
double d2 = value2.GetDouble();
- if (d1 == d2) return 0;
if (d1 < d2) return 1;
- return -1;
- }
+ if (d1 > d2) return -1;
+ } else
if (value1.GetType() == wxT("datetime"))
{
wxDateTime dt1 = value1.GetDateTime();
wxDateTime dt2 = value2.GetDateTime();
- if (dt1.IsEqualTo(dt2)) return 0;
if (dt1.IsEarlierThan(dt2)) return 1;
- return -1;
+ if (dt2.IsEarlierThan(dt1)) return -11;
}
- return 0;
-}
-
-int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
- (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
-{
- return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
-}
-
-static wxDataViewListModelCompare s_CmpFunc;
-static wxDataViewListModel *s_CmpModel;
-static unsigned int s_CmpCol;
+ // items must be different
+ unsigned long litem1 = (unsigned long) item1.GetID();
+ unsigned long litem2 = (unsigned long) item2.GetID();
-int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
-{
- return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+ if (!m_ascending)
+ return litem2-litem1;
+ return litem1-litem2;
}
// ---------------------------------------------------------
-// wxDataViewSortedListModel
+// wxDataViewIndexListModel
// ---------------------------------------------------------
-wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
- m_array( wxDataViewIntermediateCmp )
-{
- m_child = child;
-
- m_ascending = true;
-
- m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
- m_child->AddNotifier( m_notifierOnChild );
-
- Resort();
-}
-
-wxDataViewSortedListModel::~wxDataViewSortedListModel()
-{
- if (m_child)
- m_child->RemoveNotifier( m_notifierOnChild );
-}
-
-void wxDataViewSortedListModel::DetachChild()
-{
- m_child = NULL;
-}
-
-// FIXME
-void wxDataViewSortedListModel::InitStatics()
-{
- s_CmpCol = 0;
- s_CmpModel = m_child;
- if (m_ascending)
- s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
- else
- s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
-}
-
-void wxDataViewSortedListModel::Resort()
-{
- InitStatics();
-
- m_array.Clear();
- unsigned int n = m_child->GetRowCount();
- unsigned int i;
- for (i = 0; i < n; i++)
- m_array.Add( i );
-
- // do we need the neworder?
- wxDataViewListModel::RowsReordered( NULL );
-}
-
-#if 0
-static void Dump( wxDataViewListModel *model, unsigned int col )
-{
- unsigned int n = model->GetRowCount();
- unsigned int i;
- for (i = 0; i < n; i++)
- {
- wxVariant variant;
- model->GetValue( variant, col, i );
- wxString tmp;
- tmp = variant.GetString();
- wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
- }
-}
-#endif
-
-bool wxDataViewSortedListModel::ChildRowAppended()
-{
- // no need to fix up array
-
- unsigned int len = m_array.GetCount();
-
- unsigned int pos = m_array.Add( len );
-
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
-
- if (pos == len)
- return wxDataViewListModel::RowAppended();
-
- return wxDataViewListModel::RowInserted( pos );
-}
-
-bool wxDataViewSortedListModel::ChildRowPrepended()
-{
- // fix up array
- unsigned int i;
- unsigned int len = m_array.GetCount();
- for (i = 0; i < len; i++)
- {
- unsigned int value = m_array[i];
- m_array[i] = value+1;
- }
-
- unsigned int pos = m_array.Add( 0 );
-
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
-
- if (pos == len)
- return wxDataViewListModel::RowAppended();
-
- return wxDataViewListModel::RowInserted( pos );
-}
-
-bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
{
- // fix up array
+ // build initial index
unsigned int i;
- unsigned int len = m_array.GetCount();
- for (i = 0; i < len; i++)
- {
- unsigned int value = m_array[i];
- if (value >= before)
- m_array[i] = value+1;
- }
-
- unsigned int pos = m_array.Add( before );
-
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
-
- if (pos == len)
- return wxDataViewListModel::RowAppended();
-
- return wxDataViewListModel::RowInserted( pos );
+ for (i = 1; i < initial_size+1; i++)
+ m_hash.Add( (void*) i );
+ m_lastIndex = initial_size + 1;
}
-bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+wxDataViewIndexListModel::~wxDataViewIndexListModel()
{
- unsigned int i;
- unsigned int len = m_array.GetCount();
- int pos = -1;
- for (i = 0; i < len; i++)
- {
- unsigned int value = m_array[i];
- if (value == row)
- {
- // delete later
- pos = (int) i;
- }
- else
- {
- // Fix up array
- if (value > row)
- m_array[i] = value-1;
- }
- }
-
- if (pos == -1)
- return false; // we should probably assert
-
- // remove
- m_array.RemoveAt( (unsigned int) pos );
-
- return wxDataViewListModel::RowDeleted( (unsigned int) pos);
}
-bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row )
+void wxDataViewIndexListModel::RowPrepended()
{
- unsigned int i;
- unsigned int len = m_array.GetCount();
-
- // Remove and readd sorted. Find out at which
- // position it was and where it ended.
- unsigned int start_pos = 0,end_pos = 0;
- for (i = 0; i < len; i++)
- if (m_array[i] == row)
- {
- start_pos = i;
- break;
- }
- m_array.RemoveAt( start_pos );
- m_array.Add( row );
-
- for (i = 0; i < len; i++)
- if (m_array[i] == row)
- {
- end_pos = i;
- break;
- }
-
- if (end_pos == start_pos)
- return wxDataViewListModel::RowChanged( start_pos );
-
- // Create an array where order[old] -> new_pos, so that
- // if nothing changed order[0] -> 0 etc.
- unsigned int *order = new unsigned int[ len ];
- // Fill up initial values.
- for (i = 0; i < len; i++)
- order[i] = i;
-
- if (start_pos < end_pos)
- {
- for (i = start_pos; i < end_pos; i++)
- order[i] = order[i+1];
- order[end_pos] = start_pos;
- }
- else
- {
- for (i = end_pos; i > start_pos; i--)
- order[i] = order[i-1];
- order[start_pos] = end_pos;
- }
-
- wxDataViewListModel::RowsReordered( order );
-
- delete [] order;
-
- return true;
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( (void*) id, 0 );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
}
-bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
+void wxDataViewIndexListModel::RowInserted( unsigned int before )
{
- unsigned int i;
- unsigned int len = m_array.GetCount();
-
- // Remove and readd sorted. Find out at which
- // position it was and where it ended.
- unsigned int start_pos = 0,end_pos = 0;
- for (i = 0; i < len; i++)
- if (m_array[i] == row)
- {
- start_pos = i;
- break;
- }
- m_array.RemoveAt( start_pos );
- m_array.Add( row );
-
- for (i = 0; i < len; i++)
- if (m_array[i] == row)
- {
- end_pos = i;
- break;
- }
-
- if (end_pos == start_pos)
- return wxDataViewListModel::ValueChanged( col, start_pos );
-
- // Create an array where order[old] -> new_pos, so that
- // if nothing changed order[0] -> 0 etc.
- unsigned int *order = new unsigned int[ len ];
- // Fill up initial values.
- for (i = 0; i < len; i++)
- order[i] = i;
-
- if (start_pos < end_pos)
- {
- for (i = start_pos; i < end_pos; i++)
- order[i] = order[i+1];
- order[end_pos] = start_pos;
- }
- else
- {
- for (i = end_pos; i > start_pos; i--)
- order[i] = order[i-1];
- order[start_pos] = end_pos;
- }
-
- wxDataViewListModel::RowsReordered( order );
-
- delete [] order;
-
- return true;
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( (void*) id, before );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
}
-bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
+void wxDataViewIndexListModel::RowAppended()
{
- // Nothing needs to be done. If the sort criteria
- // of this list don't change, the order of the
- // items of the child list isn't relevant.
- return true;
+ unsigned int id = m_lastIndex++;
+ m_hash.Add( (void*) id );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
}
-bool wxDataViewSortedListModel::ChildCleared()
+void wxDataViewIndexListModel::RowDeleted( unsigned int row )
{
- return wxDataViewListModel::Cleared();
+ wxDataViewItem item( m_hash[row] );
+ m_hash.RemoveAt( row );
+ wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
}
-unsigned int wxDataViewSortedListModel::GetRowCount() const
+void wxDataViewIndexListModel::RowChanged( unsigned int row )
{
- return m_array.GetCount();
+ wxDataViewModel::ItemChanged( GetItem(row) );
}
-unsigned int wxDataViewSortedListModel::GetColumnCount() const
+void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col )
{
- return m_child->GetColumnCount();
+ wxDataViewModel::ValueChanged( GetItem(row), col );
}
-wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const
+unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
{
- return m_child->GetColumnType( col );
+ // assert for not found
+ return (unsigned int) m_hash.Index( item.GetID() );
}
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
+wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
{
- unsigned int child_row = m_array[row];
- m_child->GetValue( variant, col, child_row );
+ return wxDataViewItem( m_hash[row] );
}
-bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row )
+int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->SetValue( variant, col, child_row );
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ return GetRow(item1) - GetRow(item2);
}
-bool wxDataViewSortedListModel::RowAppended()
+void wxDataViewIndexListModel::GetValue( wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col ) const
{
- // you can only append
- bool ret = m_child->RowAppended();
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
-}
-
-bool wxDataViewSortedListModel::RowPrepended()
-{
- // you can only append
- bool ret = m_child->RowAppended();
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
-}
-
-bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
-{
- // you can only append
- bool ret = m_child->RowAppended();
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ return GetValue( variant, GetRow(item), col );
}
-bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
+bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col )
{
- unsigned int child_row = m_array[row];
-
- bool ret = m_child->RowDeleted( child_row );
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ return SetValue( variant, GetRow(item), col );
}
-bool wxDataViewSortedListModel::RowChanged( unsigned int row )
+wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem &item ) const
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->RowChanged( child_row );
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ return wxDataViewItem(0);
}
-bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
+bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->ValueChanged( col, child_row );
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ // only the invisible root item has children
+ if (!item.IsOk())
+ return true;
+
+ return false;
}
-bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
+wxDataViewItem wxDataViewIndexListModel::GetFirstChild( const wxDataViewItem &parent ) const
{
- // We sort them ourselves.
-
- return false;
+ if (!parent.IsOk())
+ {
+ if (m_hash.GetCount() == 0)
+ return wxDataViewItem(0);
+
+ return wxDataViewItem( m_hash[0]);
+ }
+
+ return wxDataViewItem(0);
}
-bool wxDataViewSortedListModel::Cleared()
+wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &item ) const
{
- bool ret = m_child->Cleared();
-
- // Do nothing here as the change in the
- // child model will be reported back.
-
- return ret;
+ if (!item.IsOk())
+ return wxDataViewItem(0);
+
+ int pos = m_hash.Index( item.GetID() );
+ if ((pos == wxNOT_FOUND) || (pos == m_hash.GetCount()-1))
+ return wxDataViewItem(0);
+
+ return wxDataViewItem( m_hash[pos+1] );
}
// ---------------------------------------------------------
{
m_variantType = varianttype;
m_editorCtrl = NULL;
- m_row = (unsigned int) -1;
}
const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
}
-bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
{
- m_row = row; // remember for later
+ m_item = item; // remember for later
unsigned int col = GetOwner()->GetModelColumn();
wxVariant value;
- GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row );
+ GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
return false;
unsigned int col = GetOwner()->GetModelColumn();
- GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
- GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
+ GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
+ GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
// m_editorCtrl->PopEventHandler( true );
SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
}
-// ---------------------------------------------------------
-// wxDataViewEventListModelNotifier
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier
-{
-public:
- wxDataViewEventListModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; }
-
- bool SendEvent( wxEventType event_type, unsigned int row = 0, unsigned int col = 0 )
- {
- wxDataViewEvent event( event_type, m_ctrl->GetId() );
- event.SetEventObject( m_ctrl );
- event.SetModel( m_ctrl->GetModel() );
- event.SetRow( row );
- event.SetColumn( col );
- m_ctrl->GetEventHandler()->ProcessEvent( event );
- return true;
- }
-
- virtual bool RowAppended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED ); }
- virtual bool RowPrepended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED ); }
- virtual bool RowInserted( unsigned int before )
- { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED, before ); }
- virtual bool RowDeleted( unsigned int row )
- { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED, row ); }
- virtual bool RowChanged( unsigned int row )
- { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED, row ); }
- virtual bool ValueChanged( unsigned int col, unsigned int row )
- { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, row, col ); }
- virtual bool RowsReordered( unsigned int *new_order )
- { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED ); }
- virtual bool Cleared() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED ); }
-
-private:
- wxDataViewCtrl *m_ctrl;
-};
-
-
// ---------------------------------------------------------
// wxDataViewCtrlBase
// ---------------------------------------------------------
{
m_model = NULL;
m_cols.DeleteContents( true );
- m_eventNotifier = NULL;
+ m_expander_column = 0;
+ m_indent = 8;
}
wxDataViewCtrlBase::~wxDataViewCtrlBase()
if (m_model)
{
- if (m_eventNotifier)
- m_model->RemoveNotifier( m_eventNotifier );
- m_eventNotifier = NULL;
-
m_model->DecRef();
m_model = NULL;
}
}
-bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
+bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )
{
if (m_model)
{
- if (m_eventNotifier)
- m_model->RemoveNotifier( m_eventNotifier );
- m_eventNotifier = NULL;
-
m_model->DecRef(); // discard old model, if any
}
if (m_model)
{
m_model->IncRef();
- m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
- m_model->AddNotifier( m_eventNotifier );
}
return true;
}
-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()
{
return m_model;
}
IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
#endif
projects / wxWidgets.git / blobdiff