X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c534e69669840e016d9e109356d8839302bb95db..628f87da565360ec2fce102c9b46341cf42cd3d3:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 11b4e3af1e..1572f8c75f 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -36,40 +36,39 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) // wxDataViewModel // --------------------------------------------------------- +#include +WX_DEFINE_LIST(wxDataViewModelNotifiers); + wxDataViewModel::wxDataViewModel() { m_notifiers.DeleteContents( true ); - m_sortingColumn = 0; - m_ascending = true; } bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; if (!notifier->ItemAdded( parent, item )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item ) +bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); - if (!notifier->ItemDeleted( item )) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemDeleted( parent, item )) ret = false; - node = node->GetNext(); } return ret; @@ -79,13 +78,12 @@ bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; if (!notifier->ItemChanged( item )) ret = false; - node = node->GetNext(); } return ret; @@ -95,13 +93,12 @@ bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; if (!notifier->ValueChanged( item, col )) ret = false; - node = node->GetNext(); } return ret; @@ -111,13 +108,12 @@ bool wxDataViewModel::Cleared() { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; if (!notifier->Cleared()) ret = false; - node = node->GetNext(); } return ret; @@ -125,18 +121,17 @@ bool wxDataViewModel::Cleared() void wxDataViewModel::Resort() { - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; notifier->Resort(); - node = node->GetNext(); } } void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) { - m_notifiers.Append( notifier ); + m_notifiers.push_back( notifier ); notifier->SetOwner( this ); } @@ -145,28 +140,29 @@ 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); bool item2_is_container = IsContainer(item2); - + if (item1_is_container && !item2_is_container) return 1; if (item2_is_container && !item1_is_container) return -1; - + wxVariant value1,value2; - 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; value2 = temp; } - + if (value1.GetType() == wxT("string")) { wxString str1 = value1.GetString(); @@ -197,11 +193,12 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem } // items must be different - unsigned long litem1 = (unsigned long) item1.GetID(); - unsigned long litem2 = (unsigned long) item2.GetID(); + unsigned long litem1 = (unsigned long) item1.GetID(); + unsigned long litem2 = (unsigned long) item2.GetID(); + + if (!ascending) + return litem2-litem2; - if (!m_ascending) - return litem2-litem1; return litem1-litem2; } @@ -249,8 +246,8 @@ void wxDataViewIndexListModel::RowAppended() void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { wxDataViewItem item( m_hash[row] ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); m_hash.RemoveAt( row ); - wxDataViewModel::ItemDeleted( item ); } void wxDataViewIndexListModel::RowChanged( unsigned int row ) @@ -274,24 +271,28 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const return wxDataViewItem( m_hash[row] ); } -int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 ) +int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ) { - return GetRow(item1) - GetRow(item2); + if (ascending) + return GetRow(item1) - GetRow(item2); + + return GetRow(item2) - GetRow(item1); } -void wxDataViewIndexListModel::GetValue( wxVariant &variant, +void wxDataViewIndexListModel::GetValue( wxVariant &variant, const wxDataViewItem &item, unsigned int col ) const { - return GetValue( variant, GetRow(item), col ); + GetValue( variant, GetRow(item), col ); } -bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, +bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, const wxDataViewItem &item, unsigned int col ) { return SetValue( variant, GetRow(item), col ); } -wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem &item ) const +wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const { return wxDataViewItem(0); } @@ -301,7 +302,7 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const // only the invisible root item has children if (!item.IsOk()) return true; - + return false; } @@ -311,10 +312,10 @@ wxDataViewItem wxDataViewIndexListModel::GetFirstChild( const wxDataViewItem &pa { if (m_hash.GetCount() == 0) return wxDataViewItem(0); - + return wxDataViewItem( m_hash[0]); } - + return wxDataViewItem(0); } @@ -322,11 +323,11 @@ wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &i { if (!item.IsOk()) return wxDataViewItem(0); - + int pos = m_hash.Index( item.GetID() ); - if ((pos == wxNOT_FOUND) || (pos == m_hash.GetCount()-1)) + if ((pos == wxNOT_FOUND) || (pos == (int) (m_hash.GetCount()-1))) return wxDataViewItem(0); - + return wxDataViewItem( m_hash[pos+1] ); } @@ -336,7 +337,7 @@ wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &i IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject) -wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, +wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewCellMode WXUNUSED(mode), int WXUNUSED(align) ) { @@ -352,18 +353,18 @@ const wxDataViewCtrl* wxDataViewRendererBase::GetView() const bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { m_item = item; // remember for later - + unsigned int col = GetOwner()->GetModelColumn(); wxVariant value; GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); - + m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); - - wxDataViewEditorCtrlEvtHandler *handler = + + wxDataViewEditorCtrlEvtHandler *handler = new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); - + m_editorCtrl->PushEventHandler( handler ); - + #if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) handler->SetFocusOnIdle(); #else @@ -376,9 +377,9 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::CancelEditing() { wxPendingDelete.Append( m_editorCtrl ); - + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - + // m_editorCtrl->PopEventHandler( true ); } @@ -388,18 +389,18 @@ bool wxDataViewRendererBase::FinishEditing() GetValueFromEditorCtrl( m_editorCtrl, value ); 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; } @@ -431,7 +432,7 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) if (wxWindow::FindFocus() != m_editorCtrl) m_editorCtrl->SetFocus(); } - + event.Skip(); } @@ -476,7 +477,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), unsigned int model_column, int WXUNUSED(width), wxAlignment WXUNUSED(align), - int WXUNUSED(flags)) + int WXUNUSED(flags)) { m_renderer = renderer; m_model_column = model_column; @@ -492,7 +493,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, unsigned int model_column, int WXUNUSED(width), wxAlignment WXUNUSED(align), - int WXUNUSED(flags) ) + int WXUNUSED(flags) ) { m_renderer = renderer; m_model_column = model_column; @@ -528,42 +529,6 @@ void wxDataViewColumnBase::SetFlags(int flags) SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); } -// --------------------------------------------------------- -// wxDataViewEventModelNotifier -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewEventModelNotifier: public wxDataViewModelNotifier -{ -public: - wxDataViewEventModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; } - - 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; - } - - 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) ); } - -private: - wxDataViewCtrl *m_ctrl; -}; - - // --------------------------------------------------------- // wxDataViewCtrlBase // --------------------------------------------------------- @@ -574,24 +539,19 @@ wxDataViewCtrlBase::wxDataViewCtrlBase() { m_model = NULL; m_cols.DeleteContents( true ); - m_eventNotifier = NULL; m_expander_column = 0; m_indent = 8; } wxDataViewCtrlBase::~wxDataViewCtrlBase() { - // IMPORTANT: before calling DecRef() on our model (since it may + // 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; } @@ -601,10 +561,6 @@ bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) { if (m_model) { - if (m_eventNotifier) - m_model->RemoveNotifier( m_eventNotifier ); - m_eventNotifier = NULL; - m_model->DecRef(); // discard old model, if any } @@ -612,9 +568,7 @@ bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) m_model = model; if (m_model) { - m_model->IncRef(); - m_eventNotifier = new wxDataViewEventModelNotifier( (wxDataViewCtrl*) this ); - m_model->AddNotifier( m_eventNotifier ); + m_model->IncRef(); } return true; @@ -628,80 +582,80 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel() bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), model_column, width, align, flags ) ); } 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 ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), model_column, width, align, flags ) ); } 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 ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &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 ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + return AppendColumn( new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), model_column, width, align, flags ) ); } @@ -739,7 +693,12 @@ 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_ITEM_DESELECTED) 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_COLUMN_HEADER_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)