X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e94d0c1e66cc70f851a1b87f8a6ee19834572d25..fcdd53359135f790b85728c4254b97095a56dad8:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 27780cae7d..949ffa233f 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -18,13 +18,21 @@ #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" +#include "wx/spinctrl.h" +#include "wx/choice.h" + +#include "wx/weakref.h" +#include "wx/vector.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"); +const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) @@ -32,13 +40,19 @@ 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 // --------------------------------------------------------- // wxDataViewModelNotifier // --------------------------------------------------------- #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataViewModelNotifiers); +WX_DEFINE_LIST(wxDataViewModelNotifiers) bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) { @@ -46,7 +60,7 @@ bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wx size_t i; for (i = 0; i < count; i++) if (!ItemAdded( parent, items[i] )) return false; - + return true; } @@ -56,7 +70,7 @@ bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const size_t i; for (i = 0; i < count; i++) if (!ItemDeleted( parent, items[i] )) return false; - + return true; } @@ -66,7 +80,7 @@ bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items ) size_t i; for (i = 0; i < count; i++) if (!ItemChanged( items[i] )) return false; - + return true; } @@ -248,50 +262,62 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem wxString str1 = value1.GetString(); wxString str2 = value2.GetString(); int res = str1.Cmp( str2 ); - if (res) return res; - } else - if (value1.GetType() == wxT("long")) + if (res) + return res; + } + else if (value1.GetType() == wxT("long")) { long l1 = value1.GetLong(); long l2 = value2.GetLong(); long res = l1-l2; - if (res) return res; - } else - if (value1.GetType() == wxT("double")) + if (res) + return res; + } + else if (value1.GetType() == wxT("double")) { double d1 = value1.GetDouble(); double d2 = value2.GetDouble(); - if (d1 < d2) return 1; - if (d1 > d2) return -1; - } else - if (value1.GetType() == wxT("datetime")) + if (d1 < d2) + return 1; + if (d1 > d2) + return -1; + } + else if (value1.GetType() == wxT("datetime")) { wxDateTime dt1 = value1.GetDateTime(); wxDateTime dt2 = value2.GetDateTime(); - if (dt1.IsEarlierThan(dt2)) return 1; - if (dt2.IsEarlierThan(dt1)) return -11; + if (dt1.IsEarlierThan(dt2)) + return 1; + if (dt2.IsEarlierThan(dt1)) + return -11; } // items must be different - unsigned long litem1 = (unsigned long) item1.GetID(); - unsigned long litem2 = (unsigned long) item2.GetID(); - - if (!ascending) - return litem2-litem2; + wxUIntPtr id1 = wxPtrToUInt(item1.GetID()), + id2 = wxPtrToUInt(item2.GetID()); - return litem1-litem2; + return ascending ? id1 - id2 : id2 - id1; } // --------------------------------------------------------- // wxDataViewIndexListModel // --------------------------------------------------------- +static int my_sort( int *v1, int *v2 ) +{ + return *v2-*v1; +} + + wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) { + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; + // build initial index unsigned int i; for (i = 1; i < initial_size+1; i++) - m_hash.Add( (void*) i ); + m_hash.Add( wxUIntToPtr(i) ); m_lastIndex = initial_size + 1; } @@ -299,37 +325,79 @@ wxDataViewIndexListModel::~wxDataViewIndexListModel() { } +void wxDataViewIndexListModel::Reset( unsigned int new_size ) +{ + m_hash.Clear(); + + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; + + // build initial index + unsigned int i; + for (i = 1; i < new_size+1; i++) + m_hash.Add( wxUIntToPtr(i) ); + m_lastIndex = new_size + 1; + + wxDataViewModel::Cleared(); +} + void wxDataViewIndexListModel::RowPrepended() { + m_ordered = false; + unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, 0 ); - wxDataViewItem item( (void*) id ); + m_hash.Insert( wxUIntToPtr(id), 0 ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowInserted( unsigned int before ) { + m_ordered = false; + unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, before ); - wxDataViewItem item( (void*) id ); + m_hash.Insert( wxUIntToPtr(id), before ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowAppended() { unsigned int id = m_lastIndex++; - m_hash.Add( (void*) id ); - wxDataViewItem item( (void*) id ); + m_hash.Add( wxUIntToPtr(id) ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { + m_ordered = false; + wxDataViewItem item( m_hash[row] ); wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); m_hash.RemoveAt( row ); } +void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) +{ + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); + + m_ordered = false; + + wxDataViewItemArray array; + unsigned int i; + for (i = 0; i < rows.GetCount(); i++) + { + wxDataViewItem item( m_hash[rows[i]] ); + array.Add( item ); + } + wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); + + for (i = 0; i < sorted.GetCount(); i++) + m_hash.RemoveAt( sorted[i] ); +} + void wxDataViewIndexListModel::RowChanged( unsigned int row ) { wxDataViewModel::ItemChanged( GetItem(row) ); @@ -342,6 +410,12 @@ 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() ); } @@ -352,11 +426,27 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const return wxDataViewItem( m_hash[row] ); } +bool wxDataViewIndexListModel::HasDefaultCompare() const +{ + return !m_ordered; +} + int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int WXUNUSED(column), bool ascending) { + 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); @@ -375,6 +465,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); @@ -399,6 +494,150 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, return m_hash.GetCount(); } +// --------------------------------------------------------- +// wxDataViewVirtualListModel +// --------------------------------------------------------- + +#ifndef __WXMAC__ + +wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size ) +{ + m_lastIndex = initial_size-1; +} + +wxDataViewVirtualListModel::~wxDataViewVirtualListModel() +{ +} + +void wxDataViewVirtualListModel::Reset( unsigned int new_size ) +{ + m_lastIndex = new_size-1; + + wxDataViewModel::Cleared(); +} + +void wxDataViewVirtualListModel::RowPrepended() +{ + m_lastIndex++; + wxDataViewItem item( NULL ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowInserted( unsigned int before ) +{ + m_lastIndex++; + wxDataViewItem item( wxUIntToPtr(before) ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowAppended() +{ + m_lastIndex++; + wxDataViewItem item( wxUIntToPtr(m_lastIndex) ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) +{ + wxDataViewItem item( wxUIntToPtr(row) ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_lastIndex++; +} + +void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) +{ + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); + + 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 ); + + m_lastIndex -= rows.GetCount(); +} + +void wxDataViewVirtualListModel::RowChanged( unsigned int row ) +{ + wxDataViewModel::ItemChanged( GetItem(row) ); +} + +void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col ) +{ + wxDataViewModel::ValueChanged( GetItem(row), col ); +} + +unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const +{ + return wxPtrToUInt( item.GetID() ); +} + +wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const +{ + return wxDataViewItem( wxUIntToPtr(row) ); +} + +bool wxDataViewVirtualListModel::HasDefaultCompare() const +{ + return true; +} + +int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) +{ + unsigned int pos1 = wxPtrToUInt(item1.GetID()); + unsigned int pos2 = wxPtrToUInt(item2.GetID()); + + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; +} + +void wxDataViewVirtualListModel::GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const +{ + GetValue( variant, GetRow(item), col ); +} + +bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) +{ + return SetValue( variant, GetRow(item), col ); +} + +bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) +{ + return GetAttr( GetRow(item), col, attr ); +} + +wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const +{ + return wxDataViewItem(0); +} + +bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const +{ + // only the invisible root item has children + if (!item.IsOk()) + return true; + + return false; +} + +unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const +{ + return 0; // should we report an error ? +} + +#endif // __WXMAC__ + //----------------------------------------------------------------------------- // wxDataViewIconText //----------------------------------------------------------------------------- @@ -425,14 +664,30 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, int WXUNUSED(align) ) { m_variantType = varianttype; - m_editorCtrl = NULL; + m_owner = NULL; +} + +wxDataViewRendererBase::~wxDataViewRendererBase() +{ } const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); + return const_cast(this)->GetOwner()->GetOwner(); } +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_item = item; // remember for later @@ -442,6 +697,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); + (void) new wxKillRef( m_editorCtrl.get() ); wxDataViewEditorCtrlEvtHandler *handler = new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); @@ -466,22 +722,26 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::CancelEditing() { - wxPendingDelete.Append( m_editorCtrl ); + if (!m_editorCtrl) return; GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - // m_editorCtrl->PopEventHandler( true ); + m_editorCtrl->Hide(); + wxPendingDelete.Append( m_editorCtrl ); } bool wxDataViewRendererBase::FinishEditing() { + if (!m_editorCtrl) return true; + 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; @@ -489,8 +749,6 @@ bool wxDataViewRendererBase::FinishEditing() GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col ); GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col ); - // 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() ); @@ -509,6 +767,7 @@ BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) + EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter) END_EVENT_TABLE() wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( @@ -533,6 +792,12 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) event.Skip(); } +void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) +{ + m_finished = true; + m_owner->FinishEditing(); +} + void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) { switch ( event.m_keyCode ) @@ -543,10 +808,11 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) break; case WXK_ESCAPE: + { m_finished = true; m_owner->CancelEditing(); break; - + } default: event.Skip(); } @@ -567,63 +833,18 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) // wxDataViewColumnBase // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) - -wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags)) -{ - m_renderer = renderer; - m_model_column = model_column; - m_owner = NULL; - m_renderer->SetOwner( (wxDataViewColumn*) this ); - - // NOTE: the wxDataViewColumn's ctor must store the width, align, flags - // parameters inside the native control! -} - -wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags) ) +void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer, + unsigned int model_column) { m_renderer = renderer; m_model_column = model_column; - m_bitmap = bitmap; m_owner = NULL; m_renderer->SetOwner( (wxDataViewColumn*) this ); } wxDataViewColumnBase::~wxDataViewColumnBase() { - if (m_renderer) - delete m_renderer; -} - -int wxDataViewColumnBase::GetFlags() const -{ - int ret = 0; - - if (IsSortable()) - ret |= wxDATAVIEW_COL_SORTABLE; - if (IsResizeable()) - ret |= wxDATAVIEW_COL_RESIZABLE; - if (IsHidden()) - ret |= wxDATAVIEW_COL_HIDDEN; - - return ret; -} - -void wxDataViewColumnBase::SetFlags(int flags) -{ - SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); - SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); - SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); + delete m_renderer; } // --------------------------------------------------------- @@ -670,12 +891,41 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel() return m_model; } +const wxDataViewModel* wxDataViewCtrlBase::GetModel() const +{ + return m_model; +} + +void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) +{ + if (!m_model) return; + + if (!item.IsOk()) return; + + wxVector parentChain; + + // at first we get all the parents of the selected item + wxDataViewItem parent = m_model->GetParent(item); + while (parent.IsOk()) + { + parentChain.push_back(parent); + parent = m_model->GetParent(parent); + } + + // then we expand the parents, starting at the root + while (!parentChain.empty()) + { + Expand(parentChain.back()); + parentChain.pop_back(); + } +} + 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 ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -686,7 +936,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -698,7 +948,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int mode { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -709,7 +959,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -720,7 +970,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -731,7 +981,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -742,7 +992,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -753,7 +1003,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -764,7 +1014,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -775,7 +1025,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -786,7 +1036,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -797,69 +1047,343 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; } -bool -wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - col->SetOwner( (wxDataViewCtrl*) this ); - return true; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -// --------------------------------------------------------- -// 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) +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 ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} -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::PrependToggleColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ -//----------------------------------------------------------------------------- -// wxDataViewTreeStore -//----------------------------------------------------------------------------- + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} -wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( - wxDataViewTreeStoreNode *parent, - const wxString &text, const wxIcon &icon, wxClientData *data ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - m_parent = parent; - m_text = text; - m_icon = icon; - m_data = data; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode() +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|wxTE_PROCESS_ENTER, 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; +} + +// ------------------------------------- +// wxDataViewChoiceRenderer +// ------------------------------------- + +#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__) + +wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer(wxT("string"), mode, alignment ) +{ + m_choices = choices; +} + +wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + wxString s = value; + wxSize size = labelRect.GetSize(); +#ifdef __WXMAC__ + size = wxSize( wxMax(70,labelRect.width ), -1 ); +#endif + wxChoice *c = new wxChoice( parent, wxID_ANY, labelRect.GetTopLeft(), size, m_choices ); + c->SetStringSelection( value.GetString() ); + + return c; +} + +bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +{ + wxChoice *c = (wxChoice*) editor; + wxString s = c->GetStringSelection(); + value = s; + return true; +} + +bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + RenderText( m_data, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewChoiceRenderer::GetSize() const +{ + return wxSize(80,16); +} + +bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetString(); + return true; +} + +bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +#endif + +//----------------------------------------------------------------------------- +// 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); +WX_DEFINE_LIST(wxDataViewTreeStoreNodeList) -wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( - wxDataViewTreeStoreNode *parent, const wxString &text, +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); } @@ -879,19 +1403,19 @@ wxDataViewTreeStore::~wxDataViewTreeStore() delete m_root; } -wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, +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 = + + wxDataViewTreeStoreNode *node = new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Append( node ); - + // notify control ItemAdded( parent, node->GetItem() ); - + return node->GetItem(); } @@ -900,60 +1424,71 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, { wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *node = + + 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& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon, wxClientData *data ) +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, +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 = + + 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 ) +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 = + + 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& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon, const wxIcon &expanded, - wxClientData *data ) +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); } @@ -962,11 +1497,11 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u { 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); } @@ -974,21 +1509,21 @@ 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(); + 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 ); } @@ -997,7 +1532,7 @@ wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return wxEmptyString; - + return node->GetText(); } @@ -1005,9 +1540,9 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return; - + node->SetIcon( icon ); - + // notify control ValueChanged( item, 0 ); } @@ -1016,7 +1551,7 @@ const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) con { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return wxNullIcon; - + return node->GetIcon(); } @@ -1024,9 +1559,9 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - + node->SetExpandedIcon( icon ); - + // notify control ValueChanged( item, 0 ); } @@ -1035,7 +1570,7 @@ const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& it { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return wxNullIcon; - + return node->GetExpandedIcon(); } @@ -1043,9 +1578,9 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return; - + node->SetData( data ); - + // notify control? only sensible when sorting on client data // ValueChanged( item, 0 ); } @@ -1054,7 +1589,7 @@ wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) con { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return NULL; - + return node->GetData(); } @@ -1066,12 +1601,12 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& 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 ); } @@ -1080,7 +1615,7 @@ 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++) @@ -1088,9 +1623,9 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) wxDataViewTreeStoreNode* child = *iter; array.Add( child->GetItem() ); } - + node->GetChildren().clear(); - + // notify control ItemsDeleted( item, array ); } @@ -1100,34 +1635,46 @@ void wxDataViewTreeStore::DeleteAllItems() // TODO } -void wxDataViewTreeStore::GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const +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() ); - + + 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 col ) +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; } @@ -1135,13 +1682,13 @@ wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) cons { 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(); } @@ -1149,7 +1696,7 @@ bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return false; - + return node->IsContainer(); } @@ -1164,36 +1711,36 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat wxDataViewTreeStoreNode* child = *iter; children.Add( child->GetItem() ); } - + return node->GetChildren().GetCount(); } -int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, +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* parent1 = (wxDataViewTreeStoreContainerNode*) node1->GetParent(); - wxDataViewTreeStoreContainerNode* parent2 = + 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 ); } @@ -1201,7 +1748,7 @@ wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &it { if (!item.IsOk()) return m_root; - + return (wxDataViewTreeStoreNode*) item.GetID(); } @@ -1211,12 +1758,169 @@ wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const 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) + // automatically resize our only column to take the entire control width + if ( GetColumnCount() ) + { + wxSize size = GetClientSize(); + GetColumn(0)->SetWidth(size.x); + } #endif + event.Skip( true ); +} + +#endif // wxUSE_DATAVIEWCTRL