X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/008b5a66f722a01e5bad9a4a4e6bfd1bf78ac3c7..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 6d8ec76d7e..1094b1ebca 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -79,7 +79,7 @@ bool wxDataViewListModel::RowPrepended() return ret; } -bool wxDataViewListModel::RowInserted( size_t before ) +bool wxDataViewListModel::RowInserted( unsigned int before ) { bool ret = true; @@ -95,7 +95,7 @@ bool wxDataViewListModel::RowInserted( size_t before ) return ret; } -bool wxDataViewListModel::RowDeleted( size_t row ) +bool wxDataViewListModel::RowDeleted( unsigned int row ) { bool ret = true; @@ -111,7 +111,7 @@ bool wxDataViewListModel::RowDeleted( size_t row ) return ret; } -bool wxDataViewListModel::RowChanged( size_t row ) +bool wxDataViewListModel::RowChanged( unsigned int row ) { bool ret = true; @@ -127,7 +127,7 @@ bool wxDataViewListModel::RowChanged( size_t row ) return ret; } -bool wxDataViewListModel::ValueChanged( size_t col, size_t row ) +bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row ) { bool ret = true; @@ -143,7 +143,7 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row ) return ret; } -bool wxDataViewListModel::RowsReordered( size_t *new_order ) +bool wxDataViewListModel::RowsReordered( unsigned int *new_order ) { bool ret = true; @@ -175,7 +175,7 @@ bool wxDataViewListModel::Cleared() return ret; } -void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column ) +void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column ) { m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) ); } @@ -224,19 +224,19 @@ public: virtual bool RowPrepended() { return m_model->ChildRowPrepended(); } - virtual bool RowInserted( size_t before ) + virtual bool RowInserted( unsigned int before ) { return m_model->ChildRowInserted( before ); } - virtual bool RowDeleted( size_t row ) + virtual bool RowDeleted( unsigned int row ) { return m_model->ChildRowDeleted( row ); } - virtual bool RowChanged( size_t row ) + virtual bool RowChanged( unsigned int row ) { return m_model->ChildRowChanged( row ); } - virtual bool ValueChanged( size_t col, size_t row ) + virtual bool ValueChanged( unsigned int col, unsigned int row ) { return m_model->ChildValueChanged( col, row); } - virtual bool RowsReordered( size_t *new_order ) + virtual bool RowsReordered( unsigned int *new_order ) { return m_model->ChildRowsReordered( new_order ); } virtual bool Cleared() @@ -250,7 +250,7 @@ public: // --------------------------------------------------------- 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 ); @@ -287,11 +287,17 @@ int wxCALLBACK wxDataViewListModelSortedDefaultCompare 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 ); } @@ -306,9 +312,8 @@ 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 ); @@ -321,20 +326,33 @@ 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(); - size_t n = m_child->GetNumberOfRows(); - size_t i; + 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, size_t col ) +static void Dump( wxDataViewListModel *model, unsigned int col ) { - size_t n = model->GetNumberOfRows(); - size_t i; + unsigned int n = model->GetNumberOfRows(); + unsigned int i; for (i = 0; i < n; i++) { wxVariant variant; @@ -350,9 +368,9 @@ bool wxDataViewSortedListModel::ChildRowAppended() { // no need to fix up array - size_t len = m_array.GetCount(); + unsigned int len = m_array.GetCount(); - size_t pos = m_array.Add( len ); + unsigned int pos = m_array.Add( len ); if (pos == 0) return wxDataViewListModel::RowPrepended(); @@ -366,15 +384,15 @@ bool wxDataViewSortedListModel::ChildRowAppended() bool wxDataViewSortedListModel::ChildRowPrepended() { // fix up array - size_t i; - size_t len = m_array.GetCount(); + unsigned int i; + unsigned int len = m_array.GetCount(); for (i = 0; i < len; i++) { - size_t value = m_array[i]; + unsigned int value = m_array[i]; m_array[i] = value+1; } - size_t pos = m_array.Add( 0 ); + unsigned int pos = m_array.Add( 0 ); if (pos == 0) return wxDataViewListModel::RowPrepended(); @@ -385,19 +403,19 @@ bool wxDataViewSortedListModel::ChildRowPrepended() return wxDataViewListModel::RowInserted( pos ); } -bool wxDataViewSortedListModel::ChildRowInserted( size_t before ) +bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before ) { // fix up array - size_t i; - size_t len = m_array.GetCount(); + unsigned int i; + unsigned int len = m_array.GetCount(); for (i = 0; i < len; i++) { - size_t value = m_array[i]; + unsigned int value = m_array[i]; if (value >= before) m_array[i] = value+1; } - size_t pos = m_array.Add( before ); + unsigned int pos = m_array.Add( before ); if (pos == 0) return wxDataViewListModel::RowPrepended(); @@ -408,14 +426,14 @@ bool wxDataViewSortedListModel::ChildRowInserted( size_t before ) return wxDataViewListModel::RowInserted( pos ); } -bool wxDataViewSortedListModel::ChildRowDeleted( size_t row ) +bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row ) { - size_t i; - size_t len = m_array.GetCount(); + unsigned int i; + unsigned int len = m_array.GetCount(); int pos = -1; for (i = 0; i < len; i++) { - size_t value = m_array[i]; + unsigned int value = m_array[i]; if (value == row) { // delete later @@ -433,19 +451,19 @@ bool wxDataViewSortedListModel::ChildRowDeleted( size_t row ) return false; // we should probably assert // remove - m_array.RemoveAt( (size_t) pos ); + m_array.RemoveAt( (unsigned int) pos ); - return wxDataViewListModel::RowDeleted( (size_t) pos); + return wxDataViewListModel::RowDeleted( (unsigned int) pos); } -bool wxDataViewSortedListModel::ChildRowChanged( size_t row ) +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) { @@ -467,7 +485,7 @@ bool wxDataViewSortedListModel::ChildRowChanged( size_t 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; @@ -492,14 +510,14 @@ bool wxDataViewSortedListModel::ChildRowChanged( size_t row ) return true; } -bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row ) +bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, 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) { @@ -521,7 +539,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t 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; @@ -546,7 +564,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row ) return true; } -bool wxDataViewSortedListModel::ChildRowsReordered( size_t *WXUNUSED(new_order) ) +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 @@ -559,30 +577,30 @@ bool wxDataViewSortedListModel::ChildCleared() return wxDataViewListModel::Cleared(); } -size_t wxDataViewSortedListModel::GetNumberOfRows() +unsigned int wxDataViewSortedListModel::GetNumberOfRows() { return m_array.GetCount(); } -size_t wxDataViewSortedListModel::GetNumberOfCols() +unsigned int wxDataViewSortedListModel::GetNumberOfCols() { return m_child->GetNumberOfCols(); } -wxString wxDataViewSortedListModel::GetColType( size_t col ) +wxString wxDataViewSortedListModel::GetColType( unsigned int col ) { return m_child->GetColType( col ); } -void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row ) +void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) { - 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( 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 ); // Do nothing here as the change in the @@ -613,7 +631,7 @@ bool wxDataViewSortedListModel::RowPrepended() 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(); @@ -624,9 +642,9 @@ bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) ) 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 ); @@ -636,9 +654,9 @@ bool wxDataViewSortedListModel::RowDeleted( size_t 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 @@ -647,9 +665,9 @@ bool wxDataViewSortedListModel::RowChanged( size_t row ) 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 @@ -658,7 +676,7 @@ bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row ) return ret; } -bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) ) +bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) ) { // We sort them ourselves. @@ -676,12 +694,12 @@ bool wxDataViewSortedListModel::Cleared() } // --------------------------------------------------------- -// 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 mode ) { m_variantType = varianttype; m_mode = mode; @@ -694,23 +712,37 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title, - wxDataViewCell *cell, - size_t model_column, + 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()) { @@ -728,6 +760,16 @@ wxString wxDataViewColumnBase::GetTitle() return m_title; } +void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap ) +{ + m_bitmap = bitmap; +} + +const wxBitmap &wxDataViewColumnBase::GetBitmap() +{ + return m_bitmap; +} + // --------------------------------------------------------- // wxDataViewCtrlBase // --------------------------------------------------------- @@ -756,24 +798,74 @@ wxDataViewListModel* 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 ) { - 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, 30 ) ); + 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, 70 ) ); + 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 ) @@ -784,12 +876,12 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) return true; } -size_t wxDataViewCtrlBase::GetNumberOfColumns() +unsigned int wxDataViewCtrlBase::GetNumberOfColumns() { return m_cols.GetCount(); } -bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) ) +bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) ) { return false; } @@ -799,9 +891,21 @@ 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_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