X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/605c2c4ac6ea7312c6e691caaa18f119fdf3020d..c11132ca80f6af13bf636abe53f77c8dfd7dab4e:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 7dfb742a16..f8f5154fa2 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -15,150 +15,361 @@ #pragma hdrstop #endif -#include "wx/object.h" +#if wxUSE_DATAVIEWCTRL + #include "wx/dataview.h" -#include "wx/log.h" -#include "wx/image.h" -// --------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif + +const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); + + +bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) +{ + return (left.GetID() == right.GetID() ); +} + + +// --------------------------------------------------------- // wxDataViewModel -// --------------------------------------------------------- +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject) +wxDataViewModel::wxDataViewModel() +{ + m_notifiers.DeleteContents( true ); + m_cmpFunc = NULL; +} -// --------------------------------------------------------- -// wxDataViewListModel -// --------------------------------------------------------- +bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + bool ret = true; + + wxList::compatibility_iterator node = m_notifiers.GetFirst(); + while (node) + { + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemAdded( parent, item )) + ret = false; + node = node->GetNext(); + } + + return ret; +} -IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel) +bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item ) +{ + bool ret = true; + + wxList::compatibility_iterator node = m_notifiers.GetFirst(); + while (node) + { + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemDeleted( item )) + ret = false; + node = node->GetNext(); + } + + return ret; +} -wxDataViewListModel::wxDataViewListModel() +bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) { - m_notifier = NULL; + bool ret = true; + + wxList::compatibility_iterator node = m_notifiers.GetFirst(); + while (node) + { + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ItemChanged( item )) + ret = false; + node = node->GetNext(); + } + + return ret; } -wxDataViewListModel::~wxDataViewListModel() +bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col ) { - if (m_notifier) - delete m_notifier; + bool ret = true; + + wxList::compatibility_iterator node = m_notifiers.GetFirst(); + while (node) + { + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->ValueChanged( item, col )) + ret = false; + node = node->GetNext(); + } + + return ret; } -bool wxDataViewListModel::RowAppended() +bool wxDataViewModel::Cleared() { - if (m_notifier) - return m_notifier->RowAppended(); - - return false; + bool ret = true; + + wxList::compatibility_iterator node = m_notifiers.GetFirst(); + while (node) + { + wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData(); + if (!notifier->Cleared()) + ret = false; + node = node->GetNext(); + } + + return ret; } -bool wxDataViewListModel::RowPrepended() +void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) { - if (m_notifier) - return m_notifier->RowPrepended(); - - return false; + m_notifiers.Append( notifier ); + notifier->SetOwner( this ); } -bool wxDataViewListModel::RowInserted( size_t before ) +void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) { - if (m_notifier) - return m_notifier->RowInserted( before ); - - return false; + m_notifiers.DeleteObject( notifier ); } -bool wxDataViewListModel::RowDeleted( size_t row ) +// --------------------------------------------------------- +// wxDataViewRendererBase +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject) + +wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, + wxDataViewCellMode WXUNUSED(mode), + int WXUNUSED(align) ) { - if (m_notifier) - return m_notifier->RowDeleted( row ); - - return false; + m_variantType = varianttype; + m_editorCtrl = NULL; } -bool wxDataViewListModel::RowChanged( size_t row ) +const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - if (m_notifier) - return m_notifier->RowChanged( row ); - - return false; + return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); } -bool wxDataViewListModel::ValueChanged( size_t col, size_t row ) +bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { - if (m_notifier) - return m_notifier->ValueChanged( col, row ); + 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 = + new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); - return false; + m_editorCtrl->PushEventHandler( handler ); + +#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) + handler->SetFocusOnIdle(); +#else + m_editorCtrl->SetFocus(); +#endif + + return true; } -bool wxDataViewListModel::Cleared() +void wxDataViewRendererBase::CancelEditing() { - if (m_notifier) - return m_notifier->Cleared(); - - return false; + wxPendingDelete.Append( m_editorCtrl ); + + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + + // m_editorCtrl->PopEventHandler( true ); } -void wxDataViewListModel::SetNotifier( wxDataViewListModelNotifier *notifier ) +bool wxDataViewRendererBase::FinishEditing() { - if (m_notifier) - delete m_notifier; + wxVariant value; + GetValueFromEditorCtrl( m_editorCtrl, value ); + + wxPendingDelete.Append( m_editorCtrl ); + + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + + if (!Validate(value)) + return false; - m_notifier = notifier; + 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; } -wxDataViewListModelNotifier* wxDataViewListModel::GetNotifier() +//----------------------------------------------------------------------------- +// 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_notifier; + m_owner = owner; + m_editorCtrl = editorCtrl; + + m_finished = false; } -// --------------------------------------------------------- -// wxDataViewCellBase -// --------------------------------------------------------- +void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) +{ + if (m_focusOnIdle) + { + m_focusOnIdle = false; + if (wxWindow::FindFocus() != m_editorCtrl) + m_editorCtrl->SetFocus(); + } + + event.Skip(); +} -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject) +void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) +{ + 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(); + } +} -wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode ) +void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) { - m_variantType = varianttype; - m_mode = mode; + if (!m_finished) + { + m_finished = true; + m_owner->FinishEditing(); + } + + event.Skip(); } - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewColumnBase -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) -wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags) +wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), + wxDataViewRenderer *renderer, + unsigned int model_column, + int WXUNUSED(width), + wxAlignment WXUNUSED(align), + int WXUNUSED(flags)) { - m_cell = cell; + m_renderer = renderer; m_model_column = model_column; - m_flags = flags; - m_title = title; m_owner = NULL; - m_cell->SetOwner( (wxDataViewColumn*) this ); + 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) ) +{ + m_renderer = renderer; + m_model_column = model_column; + m_bitmap = bitmap; + m_owner = NULL; + m_renderer->SetOwner( (wxDataViewColumn*) this ); } wxDataViewColumnBase::~wxDataViewColumnBase() { - if (m_cell) - delete m_cell; + if (m_renderer) + delete m_renderer; } -void wxDataViewColumnBase::SetTitle( const wxString &title ) +int wxDataViewColumnBase::GetFlags() const { - m_title = title; + int ret = 0; + + if (IsSortable()) + ret |= wxDATAVIEW_COL_SORTABLE; + if (IsResizeable()) + ret |= wxDATAVIEW_COL_RESIZABLE; + if (IsHidden()) + ret |= wxDATAVIEW_COL_HIDDEN; + + return ret; } -wxString wxDataViewColumnBase::GetTitle() +void wxDataViewColumnBase::SetFlags(int flags) { - return m_title; + SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); + SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); + 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 -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) @@ -166,37 +377,135 @@ wxDataViewCtrlBase::wxDataViewCtrlBase() { m_model = NULL; m_cols.DeleteContents( true ); + m_eventNotifier = NULL; + m_expander_column = 0; + m_indent = 8; } wxDataViewCtrlBase::~wxDataViewCtrlBase() { + // IMPORTANT: before calling DecRef() on our model (since it may + // result in a free() call), erase all columns (since + // they hold a pointer to our model) + m_cols.Clear(); + if (m_model) - delete m_model; + { + if (m_eventNotifier) + m_model->RemoveNotifier( m_eventNotifier ); + m_eventNotifier = NULL; + + m_model->DecRef(); + m_model = NULL; + } } -bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) { if (m_model) - delete m_model; + { + if (m_eventNotifier) + m_model->RemoveNotifier( m_eventNotifier ); + m_eventNotifier = NULL; + m_model->DecRef(); // discard old model, if any + } + + // add our own reference to the new model: m_model = model; - + if (m_model) + { + m_model->IncRef(); + m_eventNotifier = new wxDataViewEventModelNotifier( (wxDataViewCtrl*) this ); + m_model->AddNotifier( m_eventNotifier ); + } + return true; } -wxDataViewListModel* wxDataViewCtrlBase::GetModel() +wxDataViewModel* wxDataViewCtrlBase::GetModel() { return m_model; } -bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column ) +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 ), + 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 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 wxString &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::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::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 ), + 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 ), + 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 ), + 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 ), + 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 ), + 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 ), + model_column, width, align, flags ) ); } bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) @@ -206,12 +515,12 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) 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; } @@ -221,8 +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