#if wxUSE_DATAVIEWCTRL
+#include "wx/dataview.h"
+
#ifndef WX_PRECOMP
- #include "wx/object.h"
#include "wx/log.h"
#endif
-#include "wx/image.h"
-#include "wx/dataview.h"
-
-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
// ---------------------------------------------------------
// wxDataViewListModel
// ---------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
wxDataViewListModel::wxDataViewListModel()
{
- m_viewingColumns.DeleteContents( true );
m_notifiers.DeleteContents( true );
}
return ret;
}
-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )
{
bool ret = true;
return ret;
}
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )
{
bool ret = true;
return ret;
}
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )
{
bool ret = true;
return ret;
}
-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
{
bool ret = true;
return ret;
}
-bool wxDataViewListModel::RowsReordered( size_t *new_order )
+bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
{
bool ret = true;
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 )
-{
- wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
- while (node)
- {
- wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
-
- if (tmp->m_viewColumn == column)
- {
- m_viewingColumns.DeleteObject( tmp );
- return;
- }
-
- node = node->GetNext();
- }
-}
-
void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
{
m_notifiers.Append( notifier );
{
public:
wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
- { m_model = model; }
-
- virtual bool RowAppended() { return true; }
- virtual bool RowPrepended() { return true; }
- virtual bool RowInserted( size_t WXUNUSED(before) ) { return true; }
- virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; }
- virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; }
- virtual bool ValueChanged( size_t col, size_t row )
- { return m_model->ChildValueChanged( col, row); }
- virtual bool RowsReordered( size_t *WXUNUSED(new_order) ) { return true; }
- virtual bool Cleared() { return true; }
+ { m_model = model; }
+
+ virtual bool RowAppended()
+ { return m_model->ChildRowAppended(); }
+
+ virtual bool RowPrepended()
+ { return m_model->ChildRowPrepended(); }
+
+ virtual bool RowInserted( unsigned int before )
+ { return m_model->ChildRowInserted( before ); }
+
+ virtual bool RowDeleted( unsigned int row )
+ { return m_model->ChildRowDeleted( row ); }
+
+ virtual bool RowChanged( unsigned int row )
+ { return m_model->ChildRowChanged( row ); }
+
+ virtual bool ValueChanged( unsigned int col, unsigned int row )
+ { return m_model->ChildValueChanged( col, row); }
+
+ virtual bool RowsReordered( unsigned int *new_order )
+ { return m_model->ChildRowsReordered( new_order ); }
+
+ virtual bool Cleared()
+ { return m_model->ChildCleared(); }
wxDataViewSortedListModel *m_model;
};
// ---------------------------------------------------------
int wxCALLBACK wxDataViewListModelSortedDefaultCompare
- (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
+ (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
{
wxVariant value1,value2;
model->GetValue( value1, col, row1 );
return 0;
}
+int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
+ (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+{
+ return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
+}
+
static wxDataViewListModelCompare s_CmpFunc;
static wxDataViewListModel *s_CmpModel;
-static size_t s_CmpCol;
+static unsigned int s_CmpCol;
-int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
+int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
{
return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
}
// wxDataViewSortedListModel
// ---------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
-
wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
m_array( wxDataViewIntermediateCmp )
{
m_child = child;
- s_CmpCol = 0;
- s_CmpModel = child;
- s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+
+ m_ascending = true;
m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
m_child->AddNotifier( m_notifierOnChild );
+
+ m_child->IncRef();
Resort();
}
wxDataViewSortedListModel::~wxDataViewSortedListModel()
{
- m_child->RemoveNotifier( m_notifierOnChild );
+ DetachChild();
+}
+
+void wxDataViewSortedListModel::DetachChild()
+{
+ if (m_child)
+ {
+ m_child->RemoveNotifier( m_notifierOnChild );
+ m_child->DecRef();
+ }
+
+ m_child = NULL;
+}
+
+// FIXME
+void wxDataViewSortedListModel::InitStatics()
+{
+ s_CmpCol = 0;
+ s_CmpModel = m_child;
+ if (m_ascending)
+ s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+ else
+ s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
}
void wxDataViewSortedListModel::Resort()
{
+ InitStatics();
+
+ if (!m_child) return;
+
+ unsigned int n = m_child->GetRowCount();
+
+ unsigned int i;
+ if (n != m_array.GetCount())
+ {
+ // probably sorted for the first time -> no reordered
+ // -- just create index and leave
+ m_array.Clear();
+ for (i = 0; i < n; i++)
+ m_array.Add( i );
+ return;
+ }
+
+ unsigned int *old_array = new unsigned int[ n ];
+
+ for (i = 0; i < n; i++)
+ old_array[i] = m_array[ i ];
+
m_array.Clear();
- size_t n = m_child->GetNumberOfRows();
- size_t i;
for (i = 0; i < n; i++)
m_array.Add( i );
+
+ unsigned int *order = new unsigned int[ n ];
+
+ for (i = 0; i < n; i++)
+ {
+ unsigned int new_value = m_array[i];
+
+ unsigned int old_pos;
+ for (old_pos = 0; old_pos < n; old_pos++)
+ if (old_array[old_pos] == new_value)
+ break;
+ order[i] = old_pos;
+ }
+
+ delete [] old_array;
+
+ wxDataViewListModel::RowsReordered( order );
+
+ delete [] order;
}
#if 0
-static void Dump( wxDataViewListModel *model, size_t col )
+static void Dump( wxDataViewListModel *model, unsigned int col )
{
- size_t n = model->GetNumberOfRows();
- size_t i;
+ unsigned int n = model->GetRowCount();
+ unsigned int i;
for (i = 0; i < n; i++)
{
wxVariant variant;
}
#endif
-bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+bool wxDataViewSortedListModel::ChildRowAppended()
+{
+ // no need to fix up array
+
+ unsigned int len = m_array.GetCount();
+
+ unsigned int pos = m_array.Add( len );
+
+ if (pos == 0)
+ return wxDataViewListModel::RowPrepended();
+
+ if (pos == len)
+ return wxDataViewListModel::RowAppended();
+
+ return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowPrepended()
+{
+ // fix up array
+ unsigned int i;
+ unsigned int len = m_array.GetCount();
+ for (i = 0; i < len; i++)
+ {
+ unsigned int value = m_array[i];
+ m_array[i] = value+1;
+ }
+
+ unsigned int pos = m_array.Add( 0 );
+
+ if (pos == 0)
+ return wxDataViewListModel::RowPrepended();
+
+ if (pos == len)
+ return wxDataViewListModel::RowAppended();
+
+ return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+{
+ // fix up array
+ unsigned int i;
+ unsigned int len = m_array.GetCount();
+ for (i = 0; i < len; i++)
+ {
+ unsigned int value = m_array[i];
+ if (value >= before)
+ m_array[i] = value+1;
+ }
+
+ unsigned int pos = m_array.Add( before );
+
+ if (pos == 0)
+ return wxDataViewListModel::RowPrepended();
+
+ if (pos == len)
+ return wxDataViewListModel::RowAppended();
+
+ return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+{
+ unsigned int i;
+ unsigned int len = m_array.GetCount();
+ int pos = -1;
+ for (i = 0; i < len; i++)
+ {
+ unsigned int value = m_array[i];
+ if (value == row)
+ {
+ // delete later
+ pos = (int) i;
+ }
+ else
+ {
+ // Fix up array
+ if (value > row)
+ m_array[i] = value-1;
+ }
+ }
+
+ if (pos == -1)
+ return false; // we should probably assert
+
+ // remove
+ m_array.RemoveAt( (unsigned int) pos );
+
+ return wxDataViewListModel::RowDeleted( (unsigned int) pos);
+}
+
+bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row )
{
- size_t i;
- size_t len = m_array.GetCount();
+ unsigned int i;
+ unsigned int len = m_array.GetCount();
// Remove and readd sorted. Find out at which
// position it was and where it ended.
- size_t start_pos = 0,end_pos = 0;
+ unsigned int start_pos = 0,end_pos = 0;
+ for (i = 0; i < len; i++)
+ if (m_array[i] == row)
+ {
+ start_pos = i;
+ break;
+ }
+ m_array.RemoveAt( start_pos );
+ m_array.Add( row );
+
+ for (i = 0; i < len; i++)
+ if (m_array[i] == row)
+ {
+ end_pos = i;
+ break;
+ }
+
+ if (end_pos == start_pos)
+ return wxDataViewListModel::RowChanged( start_pos );
+
+ // Create an array where order[old] -> new_pos, so that
+ // if nothing changed order[0] -> 0 etc.
+ unsigned int *order = new unsigned int[ len ];
+ // Fill up initial values.
+ for (i = 0; i < len; i++)
+ order[i] = i;
+
+ if (start_pos < end_pos)
+ {
+ for (i = start_pos; i < end_pos; i++)
+ order[i] = order[i+1];
+ order[end_pos] = start_pos;
+ }
+ else
+ {
+ for (i = end_pos; i > start_pos; i--)
+ order[i] = order[i-1];
+ order[start_pos] = end_pos;
+ }
+
+ wxDataViewListModel::RowsReordered( order );
+
+ delete [] order;
+
+ return true;
+}
+
+bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
+{
+ unsigned int i;
+ unsigned int len = m_array.GetCount();
+
+ // Remove and readd sorted. Find out at which
+ // position it was and where it ended.
+ unsigned int start_pos = 0,end_pos = 0;
for (i = 0; i < len; i++)
if (m_array[i] == row)
{
// Create an array where order[old] -> new_pos, so that
// if nothing changed order[0] -> 0 etc.
- size_t *order = new size_t[ len ];
+ unsigned int *order = new unsigned int[ len ];
// Fill up initial values.
for (i = 0; i < len; i++)
order[i] = i;
return true;
}
-size_t wxDataViewSortedListModel::GetNumberOfRows()
+bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
+{
+ // Nothing needs to be done. If the sort criteria
+ // of this list don't change, the order of the
+ // items of the child list isn't relevant.
+ return true;
+}
+
+bool wxDataViewSortedListModel::ChildCleared()
+{
+ return wxDataViewListModel::Cleared();
+}
+
+unsigned int wxDataViewSortedListModel::GetRowCount() const
{
- return m_array.GetCount();
+ if (!m_child) return 0;
+
+ return m_child->GetRowCount();
}
-size_t wxDataViewSortedListModel::GetNumberOfCols()
+unsigned int wxDataViewSortedListModel::GetColumnCount() const
{
- return m_child->GetNumberOfCols();
+ if (!m_child) return 0;
+
+ return m_child->GetColumnCount();
}
-wxString wxDataViewSortedListModel::GetColType( size_t col )
+wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const
{
- return m_child->GetColType( col );
+ return m_child->GetColumnType( col );
}
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
{
- size_t child_row = m_array[row];
+ unsigned int child_row = m_array[row];
m_child->GetValue( variant, col, child_row );
}
-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row )
{
- size_t child_row = m_array[row];
+ unsigned int child_row = m_array[row];
bool ret = m_child->SetValue( variant, col, child_row );
- // Resort in ::ChildValueChanged() which gets reported back.
+ // Do nothing here as the change in the
+ // child model will be reported back.
return ret;
}
// you can only append
bool ret = m_child->RowAppended();
- // report RowInsrted
+ // Do nothing here as the change in the
+ // child model will be reported back.
return ret;
}
// you can only append
bool ret = m_child->RowAppended();
- // report RowInsrted
+ // Do nothing here as the change in the
+ // child model will be reported back.
return ret;
}
-bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
+bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
{
// you can only append
bool ret = m_child->RowAppended();
- // report different RowInsrted
+ // Do nothing here as the change in the
+ // child model will be reported back.
return ret;
}
-bool wxDataViewSortedListModel::RowDeleted( size_t row )
+bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
{
- size_t child_row = m_array[row];
+ unsigned int child_row = m_array[row];
bool ret = m_child->RowDeleted( child_row );
return ret;
}
-bool wxDataViewSortedListModel::RowChanged( size_t row )
+bool wxDataViewSortedListModel::RowChanged( unsigned int row )
{
- size_t child_row = m_array[row];
+ unsigned int child_row = m_array[row];
bool ret = m_child->RowChanged( child_row );
// Do nothing here as the change in the
return ret;
}
-bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
{
- size_t child_row = m_array[row];
+ unsigned int child_row = m_array[row];
bool ret = m_child->ValueChanged( col, child_row );
// Do nothing here as the change in the
return ret;
}
-bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
{
// We sort them ourselves.
{
bool ret = m_child->Cleared();
- wxDataViewListModel::Cleared();
+ // Do nothing here as the change in the
+ // child model will be reported back.
return ret;
}
// ---------------------------------------------------------
-// wxDataViewCellBase
+// wxDataViewRendererBase
// ---------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
+ wxDataViewCellMode WXUNUSED(mode),
+ int WXUNUSED(align) )
{
m_variantType = varianttype;
- m_mode = mode;
+ m_editorCtrl = NULL;
+ m_row = (unsigned int) -1;
+}
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+ return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+}
+
+bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+{
+ m_row = row; // remember for later
+
+ unsigned int col = GetOwner()->GetModelColumn();
+ wxVariant value;
+ GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row );
+
+ 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
+
+ return true;
+}
+
+void wxDataViewRendererBase::CancelEditing()
+{
+ wxPendingDelete.Append( m_editorCtrl );
+
+ GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+
+ // m_editorCtrl->PopEventHandler( true );
+}
+
+bool wxDataViewRendererBase::FinishEditing()
+{
+ wxVariant value;
+ 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, col, m_row );
+ GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
+
+ // m_editorCtrl->PopEventHandler( true );
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+// 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 )
+{
+ m_owner = owner;
+ m_editorCtrl = editorCtrl;
+
+ m_finished = false;
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
+{
+ if (m_focusOnIdle)
+ {
+ m_focusOnIdle = false;
+ if (wxWindow::FindFocus() != m_editorCtrl)
+ m_editorCtrl->SetFocus();
+ }
+
+ event.Skip();
+}
+
+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();
+ }
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
+{
+ if (!m_finished)
+ {
+ m_finished = true;
+ m_owner->FinishEditing();
+ }
+
+ event.Skip();
}
// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
- wxDataViewCell *cell,
- size_t model_column,
- int WXUNUSED(fixed_width),
- wxDataViewColumnSizing WXUNUSED(sizing),
- 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()
+wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
+ wxDataViewRenderer *renderer,
+ unsigned int model_column,
+ int WXUNUSED(width),
+ wxAlignment WXUNUSED(align),
+ int WXUNUSED(flags) )
{
- if (m_cell)
- delete m_cell;
+ m_renderer = renderer;
+ m_model_column = model_column;
+ m_bitmap = bitmap;
+ m_owner = NULL;
+ m_renderer->SetOwner( (wxDataViewColumn*) this );
+}
- if (GetOwner())
- {
- GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
- }
+wxDataViewColumnBase::~wxDataViewColumnBase()
+{
+ 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);
}
+// ---------------------------------------------------------
+// wxDataViewEventListModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+ wxDataViewEventListModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; }
+
+ bool SendEvent( wxEventType event_type, unsigned int row = 0, unsigned int col = 0 )
+ {
+ wxDataViewEvent event( event_type, m_ctrl->GetId() );
+ event.SetEventObject( m_ctrl );
+ event.SetModel( m_ctrl->GetModel() );
+ event.SetRow( row );
+ event.SetColumn( col );
+ m_ctrl->GetEventHandler()->ProcessEvent( event );
+ return true;
+ }
+
+ virtual bool RowAppended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED ); }
+ virtual bool RowPrepended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED ); }
+ virtual bool RowInserted( unsigned int before )
+ { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED, before ); }
+ virtual bool RowDeleted( unsigned int row )
+ { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED, row ); }
+ virtual bool RowChanged( unsigned int row )
+ { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED, row ); }
+ virtual bool ValueChanged( unsigned int col, unsigned int row )
+ { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, row, col ); }
+ virtual bool RowsReordered( unsigned int *new_order )
+ { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED ); }
+ virtual bool Cleared() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED ); }
+
+private:
+ wxDataViewCtrl *m_ctrl;
+};
+
+
// ---------------------------------------------------------
// wxDataViewCtrlBase
// ---------------------------------------------------------
{
m_model = NULL;
m_cols.DeleteContents( true );
+ m_eventNotifier = NULL;
}
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)
+ {
+ if (m_eventNotifier)
+ m_model->RemoveNotifier( m_eventNotifier );
+ m_eventNotifier = NULL;
+
+ m_model->DecRef();
+ m_model = NULL;
+ }
}
bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
{
+ if (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 wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
+ m_model->AddNotifier( m_eventNotifier );
+ }
return true;
}
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, 30 ) );
+ 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 wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
+ 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 wxString &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::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 )
{
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 WXUNUSED(pos) )
+bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
{
return false;
}
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_ROW_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_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_ROW_APPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+
#endif
projects / wxWidgets.git / blobdiff