X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3f00f59938d4801a95afa1cd638b8f15c481ee3..180b5b4827d08f1ac13bbb5eca03f775ab35a0b1:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index d021c5ba92..fca5b24257 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -19,8 +19,14 @@ #include "wx/dataview.h" +#include "wx/spinctrl.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"); @@ -31,19 +37,57 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) return (left.GetID() == right.GetID() ); } +#ifdef __WXDEBUG__ +void wxDataViewItem::Print(const wxString& text) const +{ + wxPrintf("item %s: %l\n", text, (long)m_id); +} +#endif // --------------------------------------------------------- -// wxDataViewModel +// wxDataViewModelNotifier // --------------------------------------------------------- -#include -WX_DEFINE_LIST(wxDataViewModelNotifiers); +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxDataViewModelNotifiers) + +bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) +{ + 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; +} + +// --------------------------------------------------------- +// wxDataViewModel +// --------------------------------------------------------- wxDataViewModel::wxDataViewModel() { m_notifiers.DeleteContents( true ); - m_sortingColumn = 0; - m_ascending = true; } bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) @@ -91,6 +135,51 @@ bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) return ret; } +bool wxDataViewModel::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) +{ + bool ret = true; + + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsAdded( parent, items )) + ret = false; + } + + return ret; +} + +bool wxDataViewModel::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ) +{ + bool ret = true; + + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsDeleted( parent, items )) + ret = false; + } + + return ret; +} + +bool wxDataViewModel::ItemsChanged( const wxDataViewItemArray &items ) +{ + bool ret = true; + + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsChanged( items )) + ret = false; + } + + return ret; +} + bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col ) { bool ret = true; @@ -142,7 +231,8 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) m_notifiers.DeleteObject( notifier ); } -int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 ) +int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ) { // sort branches before leaves bool item1_is_container = IsContainer(item1); @@ -154,10 +244,10 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem return -1; wxVariant value1,value2; - GetValue( value1, item1, m_sortingColumn ); - GetValue( value2, item2, m_sortingColumn ); + GetValue( value1, item1, column ); + GetValue( value2, item2, column ); - if (!m_ascending) + if (!ascending) { wxVariant temp = value1; value1 = value2; @@ -197,8 +287,9 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem unsigned long litem1 = (unsigned long) item1.GetID(); unsigned long litem2 = (unsigned long) item2.GetID(); - if (!m_ascending) - return litem2-litem1; + if (!ascending) + return litem2-litem2; + return litem1-litem2; } @@ -208,6 +299,8 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) { + m_ordered = true; + // build initial index unsigned int i; for (i = 1; i < initial_size+1; i++) @@ -221,6 +314,8 @@ wxDataViewIndexListModel::~wxDataViewIndexListModel() void wxDataViewIndexListModel::RowPrepended() { + m_ordered = false; + unsigned int id = m_lastIndex++; m_hash.Insert( (void*) id, 0 ); wxDataViewItem item( (void*) id ); @@ -229,6 +324,8 @@ void wxDataViewIndexListModel::RowPrepended() void wxDataViewIndexListModel::RowInserted( unsigned int before ) { + m_ordered = false; + unsigned int id = m_lastIndex++; m_hash.Insert( (void*) id, before ); wxDataViewItem item( (void*) id ); @@ -262,18 +359,47 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const { + if (m_ordered) + { + unsigned int pos = wxPtrToUInt(item.GetID()); + return pos-1; + } + // assert for not found return (unsigned int) m_hash.Index( item.GetID() ); } wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const { + wxASSERT( row < m_hash.GetCount() ); return wxDataViewItem( m_hash[row] ); } -int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 ) +bool wxDataViewIndexListModel::HasDefaultCompare() const +{ + return !m_ordered; +} + +int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) { - return GetRow(item1) - GetRow(item2); + if (m_ordered) + { + unsigned int pos1 = wxPtrToUInt(item1.GetID()); + unsigned int pos2 = wxPtrToUInt(item2.GetID()); + + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; + } + + if (ascending) + return GetRow(item1) - GetRow(item2); + + return GetRow(item2) - GetRow(item1); } void wxDataViewIndexListModel::GetValue( wxVariant &variant, @@ -288,6 +414,11 @@ bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, return SetValue( variant, GetRow(item), col ); } +bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) +{ + return GetAttr( GetRow(item), col, attr ); +} + wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const { return wxDataViewItem(0); @@ -302,29 +433,29 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const return false; } -wxDataViewItem wxDataViewIndexListModel::GetFirstChild( const wxDataViewItem &parent ) const +unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { - if (!parent.IsOk()) - { - if (m_hash.GetCount() == 0) - return wxDataViewItem(0); + if (item.IsOk()) + return 0; - return wxDataViewItem( m_hash[0]); - } + children = m_hash; - return wxDataViewItem(0); + return m_hash.GetCount(); } -wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &item ) const -{ - if (!item.IsOk()) - return wxDataViewItem(0); +//----------------------------------------------------------------------------- +// wxDataViewIconText +//----------------------------------------------------------------------------- - int pos = m_hash.Index( item.GetID() ); - if ((pos == wxNOT_FOUND) || (pos == (int) (m_hash.GetCount()-1))) - return wxDataViewItem(0); +IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject) + +IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) - return wxDataViewItem( m_hash[pos+1] ); +bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two) +{ + if (one.GetText() != two.GetText()) return false; + if (one.IsSameAs(two)) return false; + return true; } // --------------------------------------------------------- @@ -367,6 +498,13 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la 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; } @@ -397,6 +535,13 @@ bool wxDataViewRendererBase::FinishEditing() // m_editorCtrl->PopEventHandler( true ); + // 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; } @@ -534,18 +679,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) wxDataViewCtrlBase::wxDataViewCtrlBase() { m_model = NULL; - m_cols.DeleteContents( true ); 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) { m_model->DecRef(); @@ -575,111 +714,284 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel() return m_model; } -bool wxDataViewCtrlBase::AppendTextColumn( 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 ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( 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, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( 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, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( 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, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendTextColumn( 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, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( 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, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &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, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, + wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), - model_column, width, align, flags ) ); + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependTextColumn( 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 wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -unsigned int wxDataViewCtrlBase::GetColumnCount() const +wxDataViewColumn * +wxDataViewCtrlBase::PrependIconTextColumn( 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 wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::ClearColumns() +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + 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, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return (wxDataViewColumn*) m_cols[ pos ]; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + 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; } // --------------------------------------------------------- @@ -688,16 +1000,474 @@ wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos ) IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED) +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_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_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_CLEARED) -#endif +// ------------------------------------- +// wxDataViewSpinRenderer +// ------------------------------------- + +wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer( "long", mode, alignment ) +{ + m_min = min; + m_max = max; +} + +wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + long l = value; + return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, + labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l ); +} + +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( "%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_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; + + wxDataViewIconText data( node->GetText(), node->GetIcon() ); + + 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; +} + +#endif // wxUSE_DATAVIEWCTRL +