#if wxUSE_DATAVIEWCTRL
#include "wx/dataview.h"
+#include "wx/spinctrl.h"
+
+#include "wx/weakref.h"
#ifndef WX_PRECOMP
+ #include "wx/dc.h"
+ #include "wx/settings.h"
#include "wx/log.h"
+ #include "wx/icon.h"
+ #include "wx/crt.h"
#endif
const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
+{
+ return (left.GetID() == right.GetID() );
+}
+
+#ifdef __WXDEBUG__
+void wxDataViewItem::Print(const wxString& text) const
+{
+ wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id));
+}
+#endif
+
// ---------------------------------------------------------
-// wxDataViewListModel
+// wxDataViewModelNotifier
// ---------------------------------------------------------
-wxDataViewListModel::wxDataViewListModel()
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataViewModelNotifiers)
+
+bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
{
- m_notifiers.DeleteContents( true );
+ size_t count = items.GetCount();
+ size_t i;
+ for (i = 0; i < count; i++)
+ if (!ItemAdded( parent, items[i] )) return false;
+
+ return true;
+}
+
+bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items )
+{
+ size_t count = items.GetCount();
+ size_t i;
+ for (i = 0; i < count; i++)
+ if (!ItemDeleted( parent, items[i] )) return false;
+
+ return true;
+}
+
+bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items )
+{
+ size_t count = items.GetCount();
+ size_t i;
+ for (i = 0; i < count; i++)
+ if (!ItemChanged( items[i] )) return false;
+
+ return true;
}
-wxDataViewListModel::~wxDataViewListModel()
+// ---------------------------------------------------------
+// wxDataViewModel
+// ---------------------------------------------------------
+
+wxDataViewModel::wxDataViewModel()
{
+ m_notifiers.DeleteContents( true );
}
-bool wxDataViewListModel::RowAppended()
+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->RowAppended())
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemAdded( parent, item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowPrepended()
+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->RowPrepended())
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemDeleted( parent, item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowInserted( unsigned int before )
+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->RowInserted(before))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ItemChanged( item ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowDeleted( unsigned int row )
+bool wxDataViewModel::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
{
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->ItemsAdded( parent, items ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowChanged( unsigned int row )
+bool wxDataViewModel::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items )
{
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->ItemsDeleted( parent, items ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
+bool wxDataViewModel::ItemsChanged( const wxDataViewItemArray &items )
{
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->ItemsChanged( items ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
+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->RowsReordered( new_order ))
+ wxDataViewModelNotifier* notifier = *iter;
+ if (!notifier->ValueChanged( item, col ))
ret = false;
- node = node->GetNext();
}
return ret;
}
-bool wxDataViewListModel::Cleared()
+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();
+ wxDataViewModelNotifier* notifier = *iter;
if (!notifier->Cleared())
ret = false;
- node = node->GetNext();
}
return ret;
}
-void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::Resort()
+{
+ wxDataViewModelNotifiers::iterator iter;
+ for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+ {
+ wxDataViewModelNotifier* notifier = *iter;
+ notifier->Resort();
+ }
+}
+
+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
+int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+ unsigned int column, bool ascending )
{
-public:
- wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
- { m_model = model; }
-
- 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); }
+ // sort branches before leaves
+ bool item1_is_container = IsContainer(item1);
+ bool item2_is_container = IsContainer(item2);
- virtual bool RowsReordered( unsigned int *new_order )
- { return m_model->ChildRowsReordered( new_order ); }
-
- virtual bool Cleared()
- { return m_model->ChildCleared(); }
+ if (item1_is_container && !item2_is_container)
+ return 1;
+ if (item2_is_container && !item1_is_container)
+ return -1;
- wxDataViewSortedListModel *m_model;
-};
+ wxVariant value1,value2;
+ GetValue( value1, item1, column );
+ GetValue( value2, item2, column );
-// ---------------------------------------------------------
-// wxDataViewSortedListModel compare function
-// ---------------------------------------------------------
+ if (!ascending)
+ {
+ wxVariant temp = value1;
+ value1 = value2;
+ value2 = temp;
+ }
-int wxCALLBACK wxDataViewListModelSortedDefaultCompare
- (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
-{
- wxVariant value1,value2;
- model->GetValue( value1, col, row1 );
- model->GetValue( value2, col, row2 );
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;
}
- if (value1.GetType() == wxT("long"))
+ 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;
}
- if (value1.GetType() == wxT("double"))
+ 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;
+ if (d1 > d2)
+ return -1;
}
- if (value1.GetType() == wxT("datetime"))
+ 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 (dt1.IsEarlierThan(dt2))
+ return 1;
+ if (dt2.IsEarlierThan(dt1))
+ return -11;
}
- return 0;
-}
+ // items must be different
+ wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
+ id2 = wxPtrToUInt(item2.GetID());
-int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
- (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
-{
- return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
+ return ascending ? id1 - id2 : id2 - id1;
}
-static wxDataViewListModelCompare s_CmpFunc;
-static wxDataViewListModel *s_CmpModel;
-static unsigned int s_CmpCol;
+// ---------------------------------------------------------
+// wxDataViewIndexListModel
+// ---------------------------------------------------------
-int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
+static int my_sort( int *v1, int *v2 )
{
- return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+ return *v2-*v1;
}
-// ---------------------------------------------------------
-// wxDataViewSortedListModel
-// ---------------------------------------------------------
-wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
- m_array( wxDataViewIntermediateCmp )
+wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
{
- m_child = child;
-
- m_ascending = true;
+ // IDs are ordered until an item gets deleted or inserted
+ m_ordered = true;
- m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
- m_child->AddNotifier( m_notifierOnChild );
-
- m_child->IncRef();
-
- Resort();
+ // build initial index
+ unsigned int i;
+ for (i = 1; i < initial_size+1; i++)
+ m_hash.Add( wxUIntToPtr(i) );
+ m_lastIndex = initial_size + 1;
}
-wxDataViewSortedListModel::~wxDataViewSortedListModel()
+wxDataViewIndexListModel::~wxDataViewIndexListModel()
{
- DetachChild();
}
-void wxDataViewSortedListModel::DetachChild()
+void wxDataViewIndexListModel::Reset( unsigned int new_size )
{
- if (m_child)
- {
- m_child->RemoveNotifier( m_notifierOnChild );
- m_child->DecRef();
- }
-
- m_child = NULL;
-}
+ m_hash.Clear();
-// FIXME
-void wxDataViewSortedListModel::InitStatics()
-{
- s_CmpCol = 0;
- s_CmpModel = m_child;
- if (m_ascending)
- s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
- else
- s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
-}
+ // IDs are ordered until an item gets deleted or inserted
+ m_ordered = true;
-void wxDataViewSortedListModel::Resort()
-{
- InitStatics();
-
- if (!m_child) return;
-
- unsigned int n = m_child->GetRowCount();
-
+ // build initial index
unsigned int i;
- if (n != m_array.GetCount())
- {
- // probably sorted for the first time -> no reordered
- // -- just create index and leave
- m_array.Clear();
- for (i = 0; i < n; i++)
- m_array.Add( i );
- return;
- }
-
- unsigned int *old_array = new unsigned int[ n ];
-
- for (i = 0; i < n; i++)
- old_array[i] = m_array[ i ];
-
- m_array.Clear();
- for (i = 0; i < n; i++)
- m_array.Add( i );
-
- unsigned int *order = new unsigned int[ n ];
-
- for (i = 0; i < n; i++)
- {
- unsigned int new_value = m_array[i];
-
- unsigned int old_pos;
- for (old_pos = 0; old_pos < n; old_pos++)
- if (old_array[old_pos] == new_value)
- break;
- order[i] = old_pos;
- }
-
- delete [] old_array;
-
- wxDataViewListModel::RowsReordered( order );
+ for (i = 1; i < new_size+1; i++)
+ m_hash.Add( wxUIntToPtr(i) );
+ m_lastIndex = new_size + 1;
- delete [] order;
+ wxDataViewModel::Cleared();
}
-#if 0
-static void Dump( wxDataViewListModel *model, unsigned int col )
+void wxDataViewIndexListModel::RowPrepended()
{
- 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() );
- }
+ m_ordered = false;
+
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( wxUIntToPtr(id), 0 );
+ wxDataViewItem item( wxUIntToPtr(id) );
+ ItemAdded( wxDataViewItem(0), item );
}
-#endif
-bool wxDataViewSortedListModel::ChildRowAppended()
+void wxDataViewIndexListModel::RowInserted( unsigned int before )
{
- // no need to fix up array
+ m_ordered = false;
- unsigned int len = m_array.GetCount();
-
- unsigned int pos = m_array.Add( len );
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( wxUIntToPtr(id), before );
+ wxDataViewItem item( wxUIntToPtr(id) );
+ ItemAdded( wxDataViewItem(0), item );
+}
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
+void wxDataViewIndexListModel::RowAppended()
+{
+ unsigned int id = m_lastIndex++;
+ m_hash.Add( wxUIntToPtr(id) );
+ wxDataViewItem item( wxUIntToPtr(id) );
+ ItemAdded( wxDataViewItem(0), item );
+}
- if (pos == len)
- return wxDataViewListModel::RowAppended();
+void wxDataViewIndexListModel::RowDeleted( unsigned int row )
+{
+ m_ordered = false;
- return wxDataViewListModel::RowInserted( pos );
+ wxDataViewItem item( m_hash[row] );
+ wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+ m_hash.RemoveAt( row );
}
-bool wxDataViewSortedListModel::ChildRowPrepended()
+void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
{
- // fix up array
+ wxArrayInt sorted = rows;
+ sorted.Sort( my_sort );
+
+ m_ordered = false;
+
+ wxDataViewItemArray array;
unsigned int i;
- unsigned int len = m_array.GetCount();
- for (i = 0; i < len; i++)
+ for (i = 0; i < rows.GetCount(); i++)
{
- unsigned int value = m_array[i];
- m_array[i] = value+1;
+ wxDataViewItem item( m_hash[rows[i]] );
+ array.Add( item );
}
+ wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
- unsigned int pos = m_array.Add( 0 );
-
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
+ for (i = 0; i < sorted.GetCount(); i++)
+ m_hash.RemoveAt( sorted[i] );
+}
- if (pos == len)
- return wxDataViewListModel::RowAppended();
+void wxDataViewIndexListModel::RowChanged( unsigned int row )
+{
+ wxDataViewModel::ItemChanged( GetItem(row) );
+}
- return wxDataViewListModel::RowInserted( pos );
+void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col )
+{
+ wxDataViewModel::ValueChanged( GetItem(row), col );
}
-bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
{
- // fix up array
- unsigned int i;
- unsigned int len = m_array.GetCount();
- for (i = 0; i < len; i++)
+ if (m_ordered)
{
- unsigned int value = m_array[i];
- if (value >= before)
- m_array[i] = value+1;
+ unsigned int pos = wxPtrToUInt( item.GetID() );
+ return pos-1;
}
- unsigned int pos = m_array.Add( before );
-
- if (pos == 0)
- return wxDataViewListModel::RowPrepended();
+ // assert for not found
+ return (unsigned int) m_hash.Index( item.GetID() );
+}
- if (pos == len)
- return wxDataViewListModel::RowAppended();
+wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
+{
+ wxASSERT( row < m_hash.GetCount() );
+ return wxDataViewItem( m_hash[row] );
+}
- return wxDataViewListModel::RowInserted( pos );
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{
+ return !m_ordered;
}
-bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
+ const wxDataViewItem& item2,
+ unsigned int WXUNUSED(column),
+ bool ascending)
{
- unsigned int i;
- unsigned int len = m_array.GetCount();
- int pos = -1;
- for (i = 0; i < len; i++)
+ if (m_ordered)
{
- unsigned int value = m_array[i];
- if (value == row)
- {
- // delete later
- pos = (int) i;
- }
+ unsigned int pos1 = wxPtrToUInt(item1.GetID());
+ unsigned int pos2 = wxPtrToUInt(item2.GetID());
+
+ if (ascending)
+ return pos1 - pos2;
else
- {
- // Fix up array
- if (value > row)
- m_array[i] = value-1;
- }
+ return pos2 - pos1;
}
- if (pos == -1)
- return false; // we should probably assert
+ if (ascending)
+ return GetRow(item1) - GetRow(item2);
- // remove
- m_array.RemoveAt( (unsigned int) pos );
-
- return wxDataViewListModel::RowDeleted( (unsigned int) pos);
+ return GetRow(item2) - GetRow(item1);
}
-bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row )
+void wxDataViewIndexListModel::GetValue( wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col ) const
{
- 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 );
+ GetValue( variant, GetRow(item), col );
+}
- // 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;
+bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col )
+{
+ return SetValue( variant, GetRow(item), col );
+}
- 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;
- }
+bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+ return GetAttr( GetRow(item), col, attr );
+}
- wxDataViewListModel::RowsReordered( order );
+wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+{
+ return wxDataViewItem(0);
+}
- delete [] order;
+bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
+{
+ // only the invisible root item has children
+ if (!item.IsOk())
+ return true;
- return true;
+ return false;
}
-bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
+unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
{
- 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 (item.IsOk())
+ return 0;
- if (end_pos == start_pos)
- return wxDataViewListModel::ValueChanged( col, start_pos );
+ children = m_hash;
- // 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;
- }
+ return m_hash.GetCount();
+}
- wxDataViewListModel::RowsReordered( order );
+// ---------------------------------------------------------
+// wxDataViewVirtualListModel
+// ---------------------------------------------------------
- delete [] order;
+#ifndef __WXMAC__
- return true;
+wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size )
+{
+ m_lastIndex = initial_size-1;
}
-bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
+wxDataViewVirtualListModel::~wxDataViewVirtualListModel()
{
- // 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;
}
-bool wxDataViewSortedListModel::ChildCleared()
+void wxDataViewVirtualListModel::Reset( unsigned int new_size )
{
- return wxDataViewListModel::Cleared();
+ m_lastIndex = new_size-1;
+
+ wxDataViewModel::Cleared();
}
-unsigned int wxDataViewSortedListModel::GetRowCount() const
+void wxDataViewVirtualListModel::RowPrepended()
{
- if (!m_child) return 0;
-
- return m_child->GetRowCount();
+ m_lastIndex++;
+ wxDataViewItem item( NULL );
+ ItemAdded( wxDataViewItem(0), item );
}
-unsigned int wxDataViewSortedListModel::GetColumnCount() const
+void wxDataViewVirtualListModel::RowInserted( unsigned int before )
{
- if (!m_child) return 0;
-
- return m_child->GetColumnCount();
+ m_lastIndex++;
+ wxDataViewItem item( wxUIntToPtr(before) );
+ ItemAdded( wxDataViewItem(0), item );
}
-wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const
+void wxDataViewVirtualListModel::RowAppended()
{
- return m_child->GetColumnType( col );
+ m_lastIndex++;
+ wxDataViewItem item( wxUIntToPtr(m_lastIndex) );
+ ItemAdded( wxDataViewItem(0), item );
}
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
+void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
{
- unsigned int child_row = m_array[row];
- m_child->GetValue( variant, col, child_row );
+ wxDataViewItem item( wxUIntToPtr(row) );
+ wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+ m_lastIndex++;
}
-bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row )
+void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows )
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->SetValue( variant, col, child_row );
+ wxArrayInt sorted = rows;
+ sorted.Sort( my_sort );
- // Do nothing here as the change in the
- // child model will be reported back.
+ wxDataViewItemArray array;
+ unsigned int i;
+ for (i = 0; i < sorted.GetCount(); i++)
+ {
+ wxDataViewItem item( wxUIntToPtr(sorted[i]) );
+ array.Add( item );
+ }
+ wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
- return ret;
+ m_lastIndex -= rows.GetCount();
}
-bool wxDataViewSortedListModel::RowAppended()
+void wxDataViewVirtualListModel::RowChanged( unsigned int row )
{
- // 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;
+ wxDataViewModel::ItemChanged( GetItem(row) );
}
-bool wxDataViewSortedListModel::RowPrepended()
+void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col )
{
- // 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;
+ wxDataViewModel::ValueChanged( GetItem(row), col );
}
-bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
+unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) 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;
+ return wxPtrToUInt( item.GetID() );
}
-bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
+wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const
{
- 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 wxDataViewItem( wxUIntToPtr(row) );
+}
- return ret;
+bool wxDataViewVirtualListModel::HasDefaultCompare() const
+{
+ return true;
}
-bool wxDataViewSortedListModel::RowChanged( unsigned int row )
+int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
+ const wxDataViewItem& item2,
+ unsigned int WXUNUSED(column),
+ bool ascending)
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->RowChanged( child_row );
+ unsigned int pos1 = wxPtrToUInt(item1.GetID());
+ unsigned int pos2 = wxPtrToUInt(item2.GetID());
- // Do nothing here as the change in the
- // child model will be reported back.
+ if (ascending)
+ return pos1 - pos2;
+ else
+ return pos2 - pos1;
+}
- return ret;
+void wxDataViewVirtualListModel::GetValue( wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col ) const
+{
+ GetValue( variant, GetRow(item), col );
}
-bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
+bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant,
+ const wxDataViewItem &item, unsigned int col )
{
- unsigned int child_row = m_array[row];
- bool ret = m_child->ValueChanged( col, child_row );
+ return SetValue( variant, GetRow(item), col );
+}
- // Do nothing here as the change in the
- // child model will be reported back.
+bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+ return GetAttr( GetRow(item), col, attr );
+}
- return ret;
+wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+{
+ return wxDataViewItem(0);
}
-bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
+bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const
{
- // We sort them ourselves.
+ // only the invisible root item has children
+ if (!item.IsOk())
+ return true;
return false;
}
-bool wxDataViewSortedListModel::Cleared()
+unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const
{
- bool ret = m_child->Cleared();
+ return 0; // should we report an error ?
+}
- // Do nothing here as the change in the
- // child model will be reported back.
+#endif // __WXMAC__
- return ret;
+//-----------------------------------------------------------------------------
+// wxDataViewIconText
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
+
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
+
+bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
+{
+ if (one.GetText() != two.GetText()) return false;
+ if (one.IsSameAs(two)) return false;
+ return true;
}
// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
-wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
wxDataViewCellMode WXUNUSED(mode),
int WXUNUSED(align) )
{
m_variantType = varianttype;
- m_editorCtrl = NULL;
- m_row = (unsigned int) -1;
+ m_owner = NULL;
+}
+
+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
}
const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
}
-bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+class wxKillRef: public wxWindowRef
+{
+public:
+ wxKillRef( wxWindow *win ) : wxWindowRef( win ) { }
+ virtual void OnObjectDestroy()
+ {
+ get()->PopEventHandler( true );
+ m_pobj = NULL;
+ delete this;
+ }
+};
+
+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 );
-
- wxDataViewEditorCtrlEvtHandler *handler =
+ (void) new wxKillRef( m_editorCtrl.get() );
+
+ wxDataViewEditorCtrlEvtHandler *handler =
new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
-
+
m_editorCtrl->PushEventHandler( handler );
-
+
#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
handler->SetFocusOnIdle();
#else
m_editorCtrl->SetFocus();
#endif
+ // Now we should send Editing Started event
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() );
+ event.SetDataViewColumn( GetOwner() );
+ event.SetModel( GetOwner()->GetOwner()->GetModel() );
+ event.SetItem( item );
+ GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
return true;
}
void wxDataViewRendererBase::CancelEditing()
{
- wxPendingDelete.Append( m_editorCtrl );
-
GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
-
- // m_editorCtrl->PopEventHandler( true );
+
+ m_editorCtrl->Hide();
+ wxPendingDelete.Append( m_editorCtrl );
}
bool wxDataViewRendererBase::FinishEditing()
wxVariant value;
GetValueFromEditorCtrl( m_editorCtrl, value );
- wxPendingDelete.Append( m_editorCtrl );
-
GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
-
+
+ m_editorCtrl->Hide();
+ wxPendingDelete.Append( m_editorCtrl );
+
if (!Validate(value))
return false;
-
+
unsigned int col = GetOwner()->GetModelColumn();
- GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
- GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
-
- // m_editorCtrl->PopEventHandler( true );
-
+ GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
+ GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
+
+ // Now we should send Editing Done event
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
+ event.SetDataViewColumn( GetOwner() );
+ event.SetModel( GetOwner()->GetOwner()->GetModel() );
+ event.SetItem( m_item );
+ GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
return true;
}
if (wxWindow::FindFocus() != m_editorCtrl)
m_editorCtrl->SetFocus();
}
-
+
event.Skip();
}
unsigned int model_column,
int WXUNUSED(width),
wxAlignment WXUNUSED(align),
- int WXUNUSED(flags))
+ int WXUNUSED(flags))
{
m_renderer = renderer;
m_model_column = model_column;
unsigned int model_column,
int WXUNUSED(width),
wxAlignment WXUNUSED(align),
- int WXUNUSED(flags) )
+ int WXUNUSED(flags) )
{
m_renderer = renderer;
m_model_column = model_column;
SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
+ SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 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
// ---------------------------------------------------------
wxDataViewCtrlBase::wxDataViewCtrlBase()
{
m_model = NULL;
- m_cols.DeleteContents( true );
- m_eventNotifier = NULL;
+ m_expander_column = 0;
+ m_indent = 8;
}
wxDataViewCtrlBase::~wxDataViewCtrlBase()
{
- // IMPORTANT: before calling DecRef() on our model (since it may
- // result in a free() call), erase all columns (since
- // they hold a pointer to our model)
- m_cols.Clear();
-
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
}
m_model = model;
if (m_model)
{
- m_model->IncRef();
- m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
- m_model->AddNotifier( m_eventNotifier );
+ m_model->IncRef();
}
return true;
}
-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()
{
return m_model;
}
-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
- wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
- model_column, width, align, flags ) );
+ return m_model;
}
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
- model_column, width, align, flags ) );
+
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label,
- new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
- model_column, width, align, flags ) );
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- m_cols.Append( (wxObject*) col );
- col->SetOwner( (wxDataViewCtrl*) this );
- return true;
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-unsigned int wxDataViewCtrlBase::GetColumnCount() const
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return m_cols.GetCount();
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return false;
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+ model_column, width, align, flags );
+ AppendColumn( ret );
+ return ret;
}
-bool wxDataViewCtrlBase::ClearColumns()
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return false;
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
}
-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return (wxDataViewColumn*) m_cols[ pos ];
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
}
-// ---------------------------------------------------------
-// wxDataViewEvent
-// ---------------------------------------------------------
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_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)
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
-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_VALUE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+ wxDataViewColumn *ret = new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+ model_column, width, align, flags );
+ PrependColumn( ret );
+ return ret;
+}
+
+bool
+wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+{
+ col->SetOwner( (wxDataViewCtrl*) this );
+ return true;
+}
+
+bool
+wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col )
+{
+ col->SetOwner( (wxDataViewCtrl*) this );
+ return true;
+}
+
+bool
+wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col )
+{
+ col->SetOwner( (wxDataViewCtrl*) this );
+ return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU)
+
+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_COLUMN_REORDERED)
+
+
+// -------------------------------------
+// wxDataViewSpinRenderer
+// -------------------------------------
+
+wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
+ wxDataViewCustomRenderer(wxT("long"), mode, alignment )
+{
+ m_min = min;
+ m_max = max;
+}
+
+wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+ long l = value;
+ wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+ size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+ wxString str;
+ str.Printf( wxT("%d"), (int) l );
+ wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
+ labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l );
+#ifdef __WXMAC__
+ size = sc->GetSize();
+ wxPoint pt = sc->GetPosition();
+ sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
+#endif
+
+ return sc;
+}
+
+bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+ wxSpinCtrl *sc = (wxSpinCtrl*) editor;
+ long l = sc->GetValue();
+ value = l;
+ return true;
+}
+
+bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
+{
+ wxString str;
+ str.Printf(wxT("%d"), (int) m_data );
+ RenderText( str, 0, rect, dc, state );
+ return true;
+}
+
+wxSize wxDataViewSpinRenderer::GetSize() const
+{
+ return wxSize(80,16);
+}
+
+bool wxDataViewSpinRenderer::SetValue( const wxVariant &value )
+{
+ m_data = value.GetLong();
+ return true;
+}
+
+bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
+{
+ value = m_data;
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewTreeStore
+//-----------------------------------------------------------------------------
+
+wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
+ wxDataViewTreeStoreNode *parent,
+ const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+ m_parent = parent;
+ m_text = text;
+ m_icon = icon;
+ m_data = data;
+}
+
+wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode()
+{
+ if (m_data)
+ delete m_data;
+}
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
+
+wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
+ wxDataViewTreeStoreNode *parent, const wxString &text,
+ const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) :
+ wxDataViewTreeStoreNode( parent, text, icon, data )
+{
+ m_iconExpanded = expanded;
+ m_isExpanded = false;
+ m_children.DeleteContents(true);
+}
+
+wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+
+wxDataViewTreeStore::wxDataViewTreeStore()
+{
+ m_root = new wxDataViewTreeStoreContainerNode( NULL, wxEmptyString );
+}
+
+wxDataViewTreeStore::~wxDataViewTreeStore()
+{
+ delete m_root;
+}
+
+wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
+ const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+ if (!parent_node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreNode *node =
+ new wxDataViewTreeStoreNode( parent_node, text, icon, data );
+ parent_node->GetChildren().Append( node );
+
+ // notify control
+ ItemAdded( parent, node->GetItem() );
+
+ return node->GetItem();
+}
+
+wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent,
+ const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+ if (!parent_node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreNode *node =
+ new wxDataViewTreeStoreNode( parent_node, text, icon, data );
+ parent_node->GetChildren().Insert( node );
+
+ // notify control
+ ItemAdded( parent, node->GetItem() );
+
+ return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::InsertItem(const wxDataViewItem& WXUNUSED(parent),
+ const wxDataViewItem& WXUNUSED(previous),
+ const wxString& WXUNUSED(text),
+ const wxIcon& WXUNUSED(icon),
+ wxClientData * WXUNUSED(data))
+{
+ return wxDataViewItem(0);
+}
+
+wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent,
+ const wxString &text, const wxIcon &icon, const wxIcon &expanded,
+ wxClientData *data )
+{
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+ if (!parent_node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreContainerNode *node =
+ new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
+ parent_node->GetChildren().Insert( node );
+
+ // notify control
+ ItemAdded( parent, node->GetItem() );
+
+ return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent,
+ const wxString &text,
+ const wxIcon& icon,
+ const wxIcon& expanded,
+ wxClientData * data)
+{
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+ if (!parent_node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreContainerNode *node =
+ new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
+ parent_node->GetChildren().Append( node );
+
+ // notify control
+ ItemAdded( parent, node->GetItem() );
+
+ return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::InsertContainer(const wxDataViewItem& WXUNUSED(parent),
+ const wxDataViewItem& WXUNUSED(previous),
+ const wxString& WXUNUSED(text),
+ const wxIcon& WXUNUSED(icon),
+ const wxIcon& WXUNUSED(expanded),
+ wxClientData * WXUNUSED(data))
+{
+ return wxDataViewItem(0);
+}
+
+wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
+{
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+ if (!parent_node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
+ if (node)
+ return node->GetData();
+
+ return wxDataViewItem(0);
+}
+
+int wxDataViewTreeStore::GetChildCount( const wxDataViewItem& parent ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( parent );
+ if (!node) return -1;
+
+ if (!node->IsContainer())
+ return 0;
+
+ wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node;
+ return (int) container_node->GetChildren().GetCount();
+}
+
+void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text )
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return;
+
+ node->SetText( text );
+
+ // notify control
+ ValueChanged( item, 0 );
+}
+
+wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return wxEmptyString;
+
+ return node->GetText();
+}
+
+void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon )
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return;
+
+ node->SetIcon( icon );
+
+ // notify control
+ ValueChanged( item, 0 );
+}
+
+const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return wxNullIcon;
+
+ return node->GetIcon();
+}
+
+void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon )
+{
+ wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+ if (!node) return;
+
+ node->SetExpandedIcon( icon );
+
+ // notify control
+ ValueChanged( item, 0 );
+}
+
+const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const
+{
+ wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+ if (!node) return wxNullIcon;
+
+ return node->GetExpandedIcon();
+}
+
+void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData *data )
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return;
+
+ node->SetData( data );
+
+ // notify control? only sensible when sorting on client data
+ // ValueChanged( item, 0 );
+}
+
+wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return NULL;
+
+ return node->GetData();
+}
+
+void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item )
+{
+ if (!item.IsOk()) return;
+
+ wxDataViewItem parent_item = GetParent( item );
+
+ wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item );
+ if (!parent_node) return;
+
+ wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+ if (!node) return;
+
+ parent_node->GetChildren().DeleteObject( node );
+
+ // notify control
+ ItemDeleted( parent_item, item );
+}
+
+void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
+{
+ wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+ if (!node) return;
+
+ wxDataViewItemArray array;
+ wxDataViewTreeStoreNodeList::iterator iter;
+ for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+ {
+ wxDataViewTreeStoreNode* child = *iter;
+ array.Add( child->GetItem() );
+ }
+
+ node->GetChildren().clear();
+
+ // notify control
+ ItemsDeleted( item, array );
+}
+
+void wxDataViewTreeStore::DeleteAllItems()
+{
+ // TODO
+}
+
+void
+wxDataViewTreeStore::GetValue(wxVariant &variant,
+ const wxDataViewItem &item,
+ unsigned int WXUNUSED(col)) const
+{
+ // if (col != 0) return;
+
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return;
+
+ wxIcon icon( node->GetIcon());
+ if (node->IsContainer())
+ {
+ wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node;
+ if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
+ icon = container->GetExpandedIcon();
+ }
+
+ wxDataViewIconText data( node->GetText(), icon );
+
+ variant << data;
+}
+
+bool
+wxDataViewTreeStore::SetValue(const wxVariant& variant,
+ const wxDataViewItem& item,
+ unsigned int WXUNUSED(col))
+{
+ // if (col != 0) return false;
+
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return false;
+
+ wxDataViewIconText data;
+
+ data << variant;
+
+ node->SetText( data.GetText() );
+ node->SetIcon( data.GetIcon() );
+
+ return true;
+}
+
+wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return wxDataViewItem(0);
+
+ wxDataViewTreeStoreNode *parent = node->GetParent();
+ if (!parent) return wxDataViewItem(0);
+
+ if (parent == m_root)
+ return wxDataViewItem(0);
+
+ return parent->GetItem();
+}
+
+bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return false;
+
+ return node->IsContainer();
+}
+
+unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
+{
+ wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+ if (!node) return 0;
+
+ wxDataViewTreeStoreNodeList::iterator iter;
+ for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+ {
+ wxDataViewTreeStoreNode* child = *iter;
+ children.Add( child->GetItem() );
+ }
+
+ return node->GetChildren().GetCount();
+}
+
+int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+ unsigned int WXUNUSED(column), bool WXUNUSED(ascending) )
+{
+ wxDataViewTreeStoreNode *node1 = FindNode( item1 );
+ wxDataViewTreeStoreNode *node2 = FindNode( item2 );
+
+ if (!node1 || !node2)
+ return 0;
+
+ wxDataViewTreeStoreContainerNode* parent1 =
+ (wxDataViewTreeStoreContainerNode*) node1->GetParent();
+ wxDataViewTreeStoreContainerNode* parent2 =
+ (wxDataViewTreeStoreContainerNode*) node2->GetParent();
+
+ if (parent1 != parent2)
+ {
+ wxLogError( wxT("Comparing items with different parent.") );
+ return 0;
+ }
+
+ if (node1->IsContainer() && !!node2->IsContainer())
+ return 1;
+
+ if (node2->IsContainer() && !!node1->IsContainer())
+ return -1;
+
+ return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 );
+}
+
+wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const
+{
+ if (!item.IsOk())
+ return m_root;
+
+ return (wxDataViewTreeStoreNode*) item.GetID();
+}
+
+wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const wxDataViewItem &item ) const
+{
+ if (!item.IsOk())
+ return (wxDataViewTreeStoreContainerNode*) m_root;
+
+ wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID();
+
+ if (!node->IsContainer())
+ return NULL;
+
+ return (wxDataViewTreeStoreContainerNode*) node;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewTreeCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl)
+
+BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
+ EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded)
+ EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed)
+ EVT_SIZE( wxDataViewTreeCtrl::OnSize )
+END_EVENT_TABLE()
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl()
+{
+ m_imageList = NULL;
+}
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+ m_imageList = NULL;
+ Create( parent, id, pos, size, style, validator );
+
+ wxDataViewTreeStore *store = new wxDataViewTreeStore;
+ AssociateModel( store );
+ store->DecRef();
+
+ AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
+}
+
+wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
+{
+ if (m_imageList)
+ delete m_imageList;
+}
+
+bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+ return wxDataViewCtrl::Create( parent, id, pos, size, style, validator );
+}
+
+void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
+{
+ if (m_imageList)
+ delete m_imageList;
+
+ m_imageList = imagelist;
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->AppendItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->PrependItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->InsertItem( parent, previous, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->PrependContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->AppendContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
+}
+
+void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
+{
+ if (m_imageList) return;
+
+ wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+ if (!container) return;
+
+ container->SetExpanded( true );
+ GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
+{
+ if (m_imageList) return;
+
+ wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+ if (!container) return;
+
+ container->SetExpanded( false );
+ GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
+{
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+ wxSize size = GetClientSize();
+ wxDataViewColumn *col = GetColumn( 0 );
+ if (col)
+ col->SetWidth( size.x );
+#endif
+ event.Skip( true );
+}
+
+#endif // wxUSE_DATAVIEWCTRL
-#endif
projects / wxWidgets.git / blobdiff