#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"
-// ---------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+
+// ---------------------------------------------------------
// wxDataViewModel
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxDataViewListModel
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
wxDataViewListModel::wxDataViewListModel()
{
- m_notifier = NULL;
+ m_viewingColumns.DeleteContents( true );
+ m_notifiers.DeleteContents( true );
}
wxDataViewListModel::~wxDataViewListModel()
{
- if (m_notifier)
- delete m_notifier;
}
bool wxDataViewListModel::RowAppended()
{
- if (m_notifier)
- return m_notifier->RowAppended();
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowAppended())
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
bool wxDataViewListModel::RowPrepended()
{
- if (m_notifier)
- return m_notifier->RowPrepended();
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowPrepended())
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )
{
- if (m_notifier)
- return m_notifier->RowInserted( before );
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowInserted(before))
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )
{
- if (m_notifier)
- return m_notifier->RowDeleted( row );
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowDeleted( row ))
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )
{
- if (m_notifier)
- return m_notifier->RowChanged( row );
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowChanged( row ))
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
{
- if (m_notifier)
- return m_notifier->ValueChanged( col, row );
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->ValueChanged( col, row ))
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
+}
+
+bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
+{
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowsReordered( new_order ))
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
}
bool wxDataViewListModel::Cleared()
{
- if (m_notifier)
- return m_notifier->Cleared();
-
- return false;
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->Cleared())
+ ret = false;
+ node = node->GetNext();
+ }
+
+ return ret;
+}
+
+void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int 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 );
+ notifier->SetOwner( this );
+}
+
+void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+{
+ m_notifiers.DeleteObject( notifier );
+}
+
+// ---------------------------------------------------------
+// wxDataViewSortedListModelNotifier
+// ---------------------------------------------------------
+
+class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+ wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
+ { 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;
+};
+
+// ---------------------------------------------------------
+// wxDataViewSortedListModel compare function
+// ---------------------------------------------------------
+
+int wxCALLBACK wxDataViewListModelSortedDefaultCompare
+ (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+{
+ wxVariant value1,value2;
+ model->GetValue( value1, col, row1 );
+ model->GetValue( value2, 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;
+ }
+
+ 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 unsigned int s_CmpCol;
+
+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;
+
+ m_ascending = true;
+
+ m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+ m_child->AddNotifier( m_notifierOnChild );
+
+ Resort();
+}
+
+wxDataViewSortedListModel::~wxDataViewSortedListModel()
+{
+ m_child->RemoveNotifier( m_notifierOnChild );
+}
+
+// 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();
+
+ m_array.Clear();
+ unsigned int n = m_child->GetNumberOfRows();
+ unsigned int i;
+ for (i = 0; i < n; i++)
+ m_array.Add( i );
+}
+
+#if 0
+static void Dump( wxDataViewListModel *model, unsigned int col )
+{
+ unsigned int n = model->GetNumberOfRows();
+ unsigned int i;
+ for (i = 0; i < n; i++)
+ {
+ wxVariant variant;
+ model->GetValue( variant, col, i );
+ wxString tmp;
+ tmp = variant.GetString();
+ wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
+ }
+}
+#endif
+
+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 )
+{
+ 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)
+ {
+ 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)
+ {
+ 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::ValueChanged( col, 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::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::GetNumberOfRows()
+{
+ return m_array.GetCount();
+}
+
+unsigned int wxDataViewSortedListModel::GetNumberOfCols()
+{
+ return m_child->GetNumberOfCols();
+}
+
+wxString wxDataViewSortedListModel::GetColType( unsigned int col )
+{
+ return m_child->GetColType( col );
+}
+
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row )
+{
+ unsigned int child_row = m_array[row];
+ m_child->GetValue( variant, col, child_row );
+}
+
+bool wxDataViewSortedListModel::SetValue( wxVariant &variant, unsigned int col, unsigned int row )
+{
+ unsigned int child_row = m_array[row];
+ bool ret = m_child->SetValue( variant, col, child_row );
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+bool wxDataViewSortedListModel::RowAppended()
+{
+ // you can only append
+ bool ret = m_child->RowAppended();
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+bool wxDataViewSortedListModel::RowPrepended()
+{
+ // you can only append
+ bool ret = m_child->RowAppended();
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
+{
+ // you can only append
+ bool ret = m_child->RowAppended();
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
+{
+ unsigned int child_row = m_array[row];
+
+ bool ret = m_child->RowDeleted( child_row );
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+bool wxDataViewSortedListModel::RowChanged( unsigned int row )
+{
+ unsigned int child_row = m_array[row];
+ bool ret = m_child->RowChanged( child_row );
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
}
-void wxDataViewListModel::SetNotifier( wxDataViewListModelNotifier *notifier )
+bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
{
- if (m_notifier)
- delete m_notifier;
-
- m_notifier = notifier;
+ unsigned int child_row = m_array[row];
+ bool ret = m_child->ValueChanged( col, child_row );
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
}
-wxDataViewListModelNotifier* wxDataViewListModel::GetNotifier()
+bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
{
- return m_notifier;
+ // We sort them ourselves.
+
+ return false;
}
-// ---------------------------------------------------------
-// wxDataViewCellBase
-// ---------------------------------------------------------
+bool wxDataViewSortedListModel::Cleared()
+{
+ bool ret = m_child->Cleared();
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
+ return ret;
+}
+
+// ---------------------------------------------------------
+// wxDataViewRendererBase
+// ---------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewCellMode mode )
{
m_variantType = varianttype;
m_mode = mode;
}
-
-// ---------------------------------------------------------
+
+// ---------------------------------------------------------
// wxDataViewColumnBase
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags)
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
+ wxDataViewRenderer *renderer,
+ unsigned int model_column,
+ int WXUNUSED(width),
+ int 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 );
+}
+
+wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
+ wxDataViewRenderer *renderer,
+ unsigned int model_column,
+ int WXUNUSED(width),
+ int flags )
+{
+ m_renderer = renderer;
+ m_model_column = model_column;
+ m_flags = flags;
+ 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;
+
+ if (GetOwner())
+ {
+ GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
+ }
}
void wxDataViewColumnBase::SetTitle( const wxString &title )
return m_title;
}
-// ---------------------------------------------------------
+void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap )
+{
+ m_bitmap = bitmap;
+}
+
+const wxBitmap &wxDataViewColumnBase::GetBitmap()
+{
+ return m_bitmap;
+}
+
+// ---------------------------------------------------------
// wxDataViewCtrlBase
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
wxDataViewCtrlBase::~wxDataViewCtrlBase()
{
- if (m_model)
- delete m_model;
}
bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
{
- if (m_model)
- delete m_model;
-
m_model = model;
-
+
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 )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );
}
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
}
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
}
-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+ wxDataViewCellMode mode, int width )
+{
+ return AppendColumn( new wxDataViewColumn( label,
+ new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );
}
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::GetNumberOfColumns()
{
return m_cols.GetCount();
}
-bool wxDataViewCtrlBase::DeleteColumn( size_t 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)
+
+
#endif
projects / wxWidgets.git / blobdiff