X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/241cb04bd821f0810ef5dfdfd4b085a506f98402..c11132ca80f6af13bf636abe53f77c8dfd7dab4e:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 28191f6789..f8f5154fa2 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -15,470 +15,512 @@ #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_DATAVIEWCTRL -#include "wx/object.h" #include "wx/dataview.h" -#include "wx/log.h" -#include "wx/image.h" - -// --------------------------------------------------------- -// wxDataViewModel -// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject) +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif -// --------------------------------------------------------- -// wxDataViewListModel -// --------------------------------------------------------- +const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); -IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel) -wxDataViewListModel::wxDataViewListModel() +bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) { - m_viewingColumns.DeleteContents( true ); - m_notifiers.DeleteContents( true ); + return (left.GetID() == right.GetID() ); } -wxDataViewListModel::~wxDataViewListModel() -{ -} -bool wxDataViewListModel::RowAppended() -{ - bool ret = true; - - wxNode *node = m_notifiers.GetFirst(); - while (node) - { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowAppended()) - ret = false; - node = node->GetNext(); - } - - return ret; -} +// --------------------------------------------------------- +// wxDataViewModel +// --------------------------------------------------------- -bool wxDataViewListModel::RowPrepended() +wxDataViewModel::wxDataViewModel() { - bool ret = true; - - wxNode *node = m_notifiers.GetFirst(); - while (node) - { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowPrepended()) - ret = false; - node = node->GetNext(); - } - - return ret; + m_notifiers.DeleteContents( true ); + m_cmpFunc = NULL; } -bool wxDataViewListModel::RowInserted( size_t before ) +bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { bool ret = true; - wxNode *node = m_notifiers.GetFirst(); + wxList::compatibility_iterator node = m_notifiers.GetFirst(); while (node) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowInserted(before)) + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemAdded( parent, item )) ret = false; node = node->GetNext(); } - + return ret; } -bool wxDataViewListModel::RowDeleted( size_t row ) +bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item ) { bool ret = true; - wxNode *node = m_notifiers.GetFirst(); + wxList::compatibility_iterator node = m_notifiers.GetFirst(); while (node) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowDeleted( row )) + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemDeleted( item )) ret = false; node = node->GetNext(); } - + return ret; } -bool wxDataViewListModel::RowChanged( size_t row ) +bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) { bool ret = true; - wxNode *node = m_notifiers.GetFirst(); + wxList::compatibility_iterator node = m_notifiers.GetFirst(); while (node) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowChanged( row )) + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemChanged( item )) ret = false; node = node->GetNext(); } - + return ret; } -bool wxDataViewListModel::ValueChanged( size_t col, size_t row ) +bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col ) { bool ret = true; - wxNode *node = m_notifiers.GetFirst(); + wxList::compatibility_iterator node = m_notifiers.GetFirst(); while (node) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->ValueChanged( col, row )) + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ValueChanged( item, col )) ret = false; node = node->GetNext(); } - + return ret; } -bool wxDataViewListModel::Cleared() +bool wxDataViewModel::Cleared() { bool ret = true; - wxNode *node = m_notifiers.GetFirst(); + wxList::compatibility_iterator node = m_notifiers.GetFirst(); while (node) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); if (!notifier->Cleared()) ret = false; node = node->GetNext(); } - - return ret; -} -void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column ) -{ - m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) ); -} - -void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column ) -{ - wxNode *node = m_viewingColumns.GetFirst(); - while (node) - { - wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData(); - - if (tmp->m_viewColumn == column) - { - m_viewingColumns.DeleteObject( tmp ); - return; - } - - node = node->GetNext(); - } + return ret; } -void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier ) +void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) { m_notifiers.Append( notifier ); notifier->SetOwner( this ); } -void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier ) +void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) { m_notifiers.DeleteObject( notifier ); } -// --------------------------------------------------------- -// wxDataViewSortedListModel -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewRendererBase +// --------------------------------------------------------- -int wxCALLBACK wxDataViewListModelSortedDefaultCompare - (size_t row1, size_t row2, size_t col, wxDataViewListModel* model ) -{ - wxVariant value1 = model->GetValue( col, row1 ); - wxVariant value2 = model->GetValue( col, row2 ); - if (value1.GetType() == wxT("string")) - { - wxString str1 = value1.GetString(); - wxString str2 = value2.GetString(); - return str1.Cmp( str2 ); - } - if (value1.GetType() == wxT("long")) - { - long l1 = value1.GetLong(); - long l2 = value2.GetLong(); - return l1-l2; - } - 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 (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; - } +IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject) - return 0; +wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, + wxDataViewCellMode WXUNUSED(mode), + int WXUNUSED(align) ) +{ + m_variantType = varianttype; + m_editorCtrl = NULL; } -static wxDataViewListModelCompare s_CmpFunc; -static wxDataViewListModel *s_CmpModel; -static size_t s_CmpCol; - -int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 ) +const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel ); + return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); } - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel) - -wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) : - m_array( wxDataViewIntermediateCmp ) +bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { - m_child = child; - s_CmpCol = 0; - s_CmpModel = child; - s_CmpFunc = wxDataViewListModelSortedDefaultCompare; + m_item = item; // remember for later + + unsigned int col = GetOwner()->GetModelColumn(); + wxVariant value; + GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); - Resort(); -} + m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); + + 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 -wxDataViewSortedListModel::~wxDataViewSortedListModel() -{ + return true; } -void wxDataViewSortedListModel::Resort() +void wxDataViewRendererBase::CancelEditing() { - m_array.Clear(); - size_t n = m_child->GetNumberOfRows(); - size_t i; - for (i = 0; i < n; i++) - m_array.Add( i ); + wxPendingDelete.Append( m_editorCtrl ); + + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + + // m_editorCtrl->PopEventHandler( true ); } -size_t wxDataViewSortedListModel::GetNumberOfRows() +bool wxDataViewRendererBase::FinishEditing() { - return m_child->GetNumberOfRows(); -} + wxVariant value; + GetValueFromEditorCtrl( m_editorCtrl, value ); -size_t wxDataViewSortedListModel::GetNumberOfCols() -{ - return m_child->GetNumberOfCols(); + wxPendingDelete.Append( m_editorCtrl ); + + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + + if (!Validate(value)) + return false; + + unsigned int col = GetOwner()->GetModelColumn(); + GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col ); + GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col ); + + // m_editorCtrl->PopEventHandler( true ); + + return true; } -wxString wxDataViewSortedListModel::GetColType( size_t col ) +//----------------------------------------------------------------------------- +// wxDataViewEditorCtrlEvtHandler +//----------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) + EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) + EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) + EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) +END_EVENT_TABLE() + +wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( + wxControl *editorCtrl, + wxDataViewRenderer *owner ) { - return m_child->GetColType( col ); + m_owner = owner; + m_editorCtrl = editorCtrl; + + m_finished = false; } -wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row ) +void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) { - size_t child_row = m_array[row]; - return m_child->GetValue( col, child_row ); + if (m_focusOnIdle) + { + m_focusOnIdle = false; + if (wxWindow::FindFocus() != m_editorCtrl) + m_editorCtrl->SetFocus(); + } + + event.Skip(); } -bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row ) +void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) { - size_t child_row = m_array[row]; - bool ret = m_child->SetValue( variant, col, child_row ); - // resort in ::ValueChanged() - return ret; + switch ( event.m_keyCode ) + { + case WXK_RETURN: + m_finished = true; + m_owner->FinishEditing(); + break; + + case WXK_ESCAPE: + m_finished = true; + m_owner->CancelEditing(); + break; + + default: + event.Skip(); + } } -bool wxDataViewSortedListModel::RowAppended() +void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) { - // you can only append - bool ret = m_child->RowAppended(); - - // report RowInsrted - - return ret; + if (!m_finished) + { + m_finished = true; + m_owner->FinishEditing(); + } + + event.Skip(); } -bool wxDataViewSortedListModel::RowPrepended() +// --------------------------------------------------------- +// 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)) { - // you can only append - bool ret = m_child->RowAppended(); - - // report RowInsrted - - return ret; + 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! } -bool wxDataViewSortedListModel::RowInserted( size_t before ) +wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, + wxDataViewRenderer *renderer, + unsigned int model_column, + int WXUNUSED(width), + wxAlignment WXUNUSED(align), + int WXUNUSED(flags) ) { - // you can only append - bool ret = m_child->RowAppended(); - - // report different RowInsrted - - return ret; + m_renderer = renderer; + m_model_column = model_column; + m_bitmap = bitmap; + m_owner = NULL; + m_renderer->SetOwner( (wxDataViewColumn*) this ); } -bool wxDataViewSortedListModel::RowDeleted( size_t row ) +wxDataViewColumnBase::~wxDataViewColumnBase() { - size_t child_row = m_array[row]; - - bool ret = m_child->RowDeleted( child_row ); - - wxDataViewListModel::RowDeleted( row ); - - return ret; + if (m_renderer) + delete m_renderer; } -bool wxDataViewSortedListModel::RowChanged( size_t row ) +int wxDataViewColumnBase::GetFlags() const { - size_t child_row = m_array[row]; - bool ret = m_child->RowChanged( child_row ); - - // report delete old pos, inserted new pos - + int ret = 0; + + if (IsSortable()) + ret |= wxDATAVIEW_COL_SORTABLE; + if (IsResizeable()) + ret |= wxDATAVIEW_COL_RESIZABLE; + if (IsHidden()) + ret |= wxDATAVIEW_COL_HIDDEN; + return ret; } -bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row ) +void wxDataViewColumnBase::SetFlags(int flags) { - size_t child_row = m_array[row]; - bool ret = m_child->ValueChanged( col, child_row ); - - // Do nothing if not the sorted col.. - // report delete old pos, inserted new pos - - return ret; + SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); + SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); + SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); } -bool wxDataViewSortedListModel::Cleared() +// --------------------------------------------------------- +// wxDataViewEventModelNotifier +// --------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxDataViewEventModelNotifier: public wxDataViewModelNotifier { - bool ret = m_child->Cleared(); - - wxDataViewListModel::Cleared(); +public: + wxDataViewEventModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; } - return ret; -} + bool SendEvent( wxEventType event_type, const wxDataViewItem &item, unsigned int col = 0 ) + { + wxDataViewEvent event( event_type, m_ctrl->GetId() ); + event.SetEventObject( m_ctrl ); + event.SetModel( m_ctrl->GetModel() ); + event.SetItem( item ); + event.SetColumn( col ); + m_ctrl->GetEventHandler()->ProcessEvent( event ); + return true; + } -// --------------------------------------------------------- -// wxDataViewCellBase -// --------------------------------------------------------- + virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) + { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, item ); } + virtual bool ItemDeleted( const wxDataViewItem &item ) + { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item ); } + virtual bool ItemChanged( const wxDataViewItem &item ) + { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, item ); } + virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) + { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, item, col ); } + virtual bool Cleared() + { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, wxDataViewItem(0) ); } -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject) +private: + wxDataViewCtrl *m_ctrl; +}; -wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode ) + +// --------------------------------------------------------- +// wxDataViewCtrlBase +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) + +wxDataViewCtrlBase::wxDataViewCtrlBase() { - m_variantType = varianttype; - m_mode = mode; + m_model = NULL; + m_cols.DeleteContents( true ); + m_eventNotifier = NULL; + m_expander_column = 0; + m_indent = 8; } - -// --------------------------------------------------------- -// wxDataViewColumnBase -// --------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) -wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags) +wxDataViewCtrlBase::~wxDataViewCtrlBase() { - m_cell = cell; - m_model_column = model_column; - m_flags = flags; - m_title = title; - m_owner = NULL; - m_cell->SetOwner( (wxDataViewColumn*) this ); + // 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; + } } -wxDataViewColumnBase::~wxDataViewColumnBase() +bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) { - if (m_cell) - delete m_cell; + if (m_model) + { + if (m_eventNotifier) + m_model->RemoveNotifier( m_eventNotifier ); + m_eventNotifier = NULL; - if (GetOwner()) + m_model->DecRef(); // discard old model, if any + } + + // add our own reference to the new model: + m_model = model; + if (m_model) { - GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this ); + m_model->IncRef(); + m_eventNotifier = new wxDataViewEventModelNotifier( (wxDataViewCtrl*) this ); + m_model->AddNotifier( m_eventNotifier ); } + + return true; } -void wxDataViewColumnBase::SetTitle( const wxString &title ) +wxDataViewModel* wxDataViewCtrlBase::GetModel() { - m_title = title; + return m_model; } -wxString wxDataViewColumnBase::GetTitle() +bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return m_title; + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ) ); } -// --------------------------------------------------------- -// wxDataViewCtrlBase -// --------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) +bool wxDataViewCtrlBase::AppendToggleColumn( 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 ) ); +} -wxDataViewCtrlBase::wxDataViewCtrlBase() +bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - m_model = NULL; - m_cols.DeleteContents( true ); + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ) ); } -wxDataViewCtrlBase::~wxDataViewCtrlBase() +bool wxDataViewCtrlBase::AppendDateColumn( 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 ) ); } -bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - m_model = model; - - return true; + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ) ); } -wxDataViewListModel* wxDataViewCtrlBase::GetModel() +bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return m_model; + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ) ); } -bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column ) +bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) ); + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ) ); } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column ) +bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) ); + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ) ); } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column ) +bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) ); + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + model_column, width, align, flags ) ); } -bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column ) +bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) ); + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) { m_cols.Append( (wxObject*) col ); col->SetOwner( (wxDataViewCtrl*) this ); - m_model->AddViewingColumn( col, col->GetModelColumn() ); return true; } -size_t wxDataViewCtrlBase::GetNumberOfColumns() +unsigned int wxDataViewCtrlBase::GetColumnCount() const { return m_cols.GetCount(); } -bool wxDataViewCtrlBase::DeleteColumn( size_t pos ) +bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) ) { return false; } @@ -488,9 +530,27 @@ bool wxDataViewCtrlBase::ClearColumns() return false; } -wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos ) +wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos ) { return (wxDataViewColumn*) m_cols[ pos ]; } +// --------------------------------------------------------- +// wxDataViewEvent +// --------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_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