X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/979f71a37ba49d818b97faeceb9bee48f5b3c480..6c8f8e7e25190645d7fc37ee8f8ee6059a204d44:/samples/dataview/dataview.cpp diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index c77bab02ae..be70dd56be 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -43,7 +43,7 @@ class MyTextModel: public wxDataViewListModel public: MyTextModel() { - size_t i; + unsigned int i; for (i = 0; i < 1000; i++) m_list.Add( wxT("Test") ); for (i = 0; i < 500; i++) @@ -59,13 +59,13 @@ public: } } - virtual size_t GetNumberOfRows() + virtual unsigned int GetNumberOfRows() { return 1000; } - virtual size_t GetNumberOfCols() + virtual unsigned int GetNumberOfCols() { return 7; } // as reported by wxVariant - virtual wxString GetColType( size_t col ) + virtual wxString GetColType( unsigned int col ) { if (col == 6) return wxT("datetime"); @@ -79,7 +79,7 @@ public: return wxT("string"); } - virtual void GetValue( wxVariant &variant, size_t col, size_t row ) + virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) { if (col == 6) { @@ -108,7 +108,7 @@ public: variant = tmp; } } - virtual bool SetValue( wxVariant &value, size_t col, size_t row ) + virtual bool SetValue( wxVariant &value, unsigned int col, unsigned int row ) { if (col == 6) { @@ -133,14 +133,14 @@ public: }; // ------------------------------------- -// MyCustomCell +// MyCustomRenderer // ------------------------------------- -class MyCustomCell: public wxDataViewCustomCell +class MyCustomRenderer: public wxDataViewCustomRenderer { public: - MyCustomCell() : - wxDataViewCustomCell( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE ) + MyCustomRenderer() : + wxDataViewCustomRenderer( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE ) { m_colour = wxT("black"); } @@ -167,8 +167,8 @@ public: } bool Activate( wxRect WXUNUSED(rect), wxDataViewListModel *WXUNUSED(model), - size_t WXUNUSED(col), - size_t WXUNUSED(row) ) + unsigned int WXUNUSED(col), + unsigned int WXUNUSED(row) ) { return false; } @@ -197,10 +197,10 @@ public: m_bitmap = wxBitmap( null_xpm ); } - virtual size_t GetNumberOfRows() { return m_list.GetCount(); } - virtual size_t GetNumberOfCols() { return 2; } - virtual wxString GetColType( size_t WXUNUSED(col) ) { return wxT("string"); } - virtual void GetValue( wxVariant &variant, size_t col, size_t row ) + virtual unsigned int GetNumberOfRows() { return m_list.GetCount(); } + virtual unsigned int GetNumberOfCols() { return 2; } + virtual wxString GetColType( unsigned int WXUNUSED(col) ) { return wxT("string"); } + virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) { if (col == 0) { @@ -216,7 +216,7 @@ public: tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); variant = tmp; } - virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) + virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row ) { if (col == 0) { @@ -245,7 +245,7 @@ public: RowInserted( 1 ); } - void DeleteRow( size_t index ) + void DeleteRow( unsigned int index ) { m_list.RemoveAt( index ); RowDeleted( index ); @@ -294,18 +294,26 @@ enum my_events ID_INSERT_ROW_LEFT, ID_DELETE_ROW_LEFT, ID_EDIT_ROW_LEFT, + + ID_SELECT, + ID_UNSELECT_ALL, ID_APPEND_ROW_RIGHT, ID_PREPEND_ROW_RIGHT, ID_INSERT_ROW_RIGHT, ID_DELETE_ROW_RIGHT, - ID_EDIT_ROW_RIGHT + ID_EDIT_ROW_RIGHT, + + ID_SORTED, + ID_UNSORTED, + ID_ACTIVATED }; class MySortingFrame: public wxFrame { public: MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h); + ~MySortingFrame(); public: void OnQuit(wxCommandEvent& event); @@ -323,11 +331,25 @@ public: void OnDeleteRowRight(wxCommandEvent& event); void OnEditRowRight(wxCommandEvent& event); + void OnSelect(wxCommandEvent& event); + void OnUnselectAll(wxCommandEvent& event); + + void OnSelectedUnsorted(wxDataViewEvent &event); + void OnSelectedSorted(wxDataViewEvent &event); + void OnActivatedUnsorted(wxDataViewEvent &event); + + void OnHeaderClickSorted(wxDataViewEvent &event); + void OnHeaderClickUnsorted(wxDataViewEvent &event); + private: wxDataViewCtrl* dataview_left; wxDataViewCtrl* dataview_right; + + wxLog *m_logOld; + wxTextCtrl *m_logWindow; - MyUnsortedTextModel *m_unsorted_model; + MyUnsortedTextModel *m_unsorted_model; + wxDataViewSortedListModel *m_sorted_model; DECLARE_EVENT_TABLE() }; @@ -346,7 +368,7 @@ bool MyApp::OnInit(void) MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340); frame->Show(true); - MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 350, 600, 300); + MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500); frame2->Show(true); SetTopWindow(frame); @@ -391,14 +413,14 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): dataview_left->AppendTextColumn( wxT("first"), 0 ); dataview_left->AppendTextColumn( wxT("second"), 1 ); - wxDataViewTextCell *text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 2 ); + wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); + wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 2 ); dataview_left->AppendColumn( column ); dataview_left->AppendToggleColumn( wxT("fourth"), 3 ); - MyCustomCell *custom_cell = new MyCustomCell; - column = new wxDataViewColumn( wxT("custom"), custom_cell, 4 ); + MyCustomRenderer *custom_renderer = new MyCustomRenderer; + column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4 ); dataview_left->AppendColumn( column ); dataview_left->AppendProgressColumn( wxT("progress"), 5 ); @@ -409,13 +431,13 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): dataview_right = new wxDataViewCtrl( panel, wxID_ANY ); dataview_right->AssociateModel( model ); - text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - column = new wxDataViewColumn( wxT("editable"), text_cell, 2 ); + text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); + column = new wxDataViewColumn( wxT("editable"), text_renderer, 2 ); dataview_right->AppendColumn( column ); dataview_right->AppendTextColumn( wxT("first"), 0 ); dataview_right->AppendTextColumn( wxT("second"), 1 ); - wxDataViewToggleCell *toggle_cell = new wxDataViewToggleCell( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE ); - column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3, 30 ); + wxDataViewToggleRenderer *toggle_renderer = new wxDataViewToggleRenderer( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE ); + column = new wxDataViewColumn( wxT("bool"), toggle_renderer, 3, 30 ); dataview_right->AppendColumn( column ); dataview_right->AppendDateColumn( wxT("date"), 6 ); @@ -451,11 +473,20 @@ BEGIN_EVENT_TABLE(MySortingFrame,wxFrame) EVT_BUTTON( ID_PREPEND_ROW_LEFT, MySortingFrame::OnPrependRowLeft ) EVT_BUTTON( ID_INSERT_ROW_LEFT, MySortingFrame::OnInsertRowLeft ) EVT_BUTTON( ID_DELETE_ROW_LEFT, MySortingFrame::OnDeleteRowLeft ) + EVT_BUTTON( ID_SELECT, MySortingFrame::OnSelect ) + EVT_BUTTON( ID_UNSELECT_ALL, MySortingFrame::OnUnselectAll ) + EVT_DATAVIEW_ROW_SELECTED( ID_SORTED, MySortingFrame::OnSelectedSorted ) + EVT_DATAVIEW_ROW_SELECTED( ID_UNSORTED, MySortingFrame::OnSelectedUnsorted ) + EVT_DATAVIEW_ROW_ACTIVATED( ID_UNSORTED, MySortingFrame::OnActivatedUnsorted ) + EVT_DATAVIEW_COLUMN_HEADER_CLICK( ID_SORTED, MySortingFrame::OnHeaderClickSorted ) + EVT_DATAVIEW_COLUMN_HEADER_CLICK( ID_UNSORTED, MySortingFrame::OnHeaderClickUnsorted ) END_EVENT_TABLE() MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) { + m_logOld = NULL; + SetIcon(wxICON(sample)); wxMenu *file_menu = new wxMenu; @@ -476,25 +507,24 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int // Left wxDataViewCtrl - dataview_left = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE ); + dataview_left = new wxDataViewCtrl( this, ID_UNSORTED, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE ); m_unsorted_model = new MyUnsortedTextModel; dataview_left->AssociateModel( m_unsorted_model ); - wxDataViewTextCell *text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 0 ); + wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); + wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 0 ); dataview_left->AppendColumn( column ); dataview_left->AppendTextColumn( wxT("second"), 1 ); - dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapCell, 2, 25 ) ); - dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapCell, 3, 25 ) ); + dataview_left->AppendColumn( new wxDataViewColumn( wxBitmap(null_xpm), new wxDataViewBitmapRenderer, 2, 25 ) ); + dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapRenderer, 3, 25 ) ); // Right wxDataViewCtrl using the sorting model - dataview_right = new wxDataViewCtrl( this, wxID_ANY ); + dataview_right = new wxDataViewCtrl( this, ID_SORTED ); - wxDataViewSortedListModel *sorted_model = - new wxDataViewSortedListModel( m_unsorted_model ); - dataview_right->AssociateModel( sorted_model ); - text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - column = new wxDataViewColumn( wxT("editable"), text_cell, 0, -1, wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE ); + m_sorted_model = new wxDataViewSortedListModel( m_unsorted_model ); + dataview_right->AssociateModel( m_sorted_model ); + text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); + column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE ); dataview_right->AppendColumn( column ); dataview_right->AppendTextColumn( wxT("second"), 1 ); @@ -514,6 +544,9 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int left_sizer->Add( new wxButton( this, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 ); left_sizer->Add( new wxButton( this, ID_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 ); left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 ); + left_sizer->Add( 5,5 ); + left_sizer->Add( new wxButton( this, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 ); + left_sizer->Add( new wxButton( this, ID_UNSELECT_ALL, wxT("Unselect all") ), 0, wxALL, 5 ); button_sizer->Add( left_sizer ); button_sizer->Add( 10, 10, 2 ); wxFlexGridSizer *right_sizer = new wxFlexGridSizer( 2 ); @@ -528,10 +561,70 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); main_sizer->Add( top_sizer, 1, wxGROW ); main_sizer->Add( button_sizer, 0, wxGROW ); + + m_logWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE | wxSUNKEN_BORDER); + main_sizer->Add( 20,20 ); + main_sizer->Add( m_logWindow, 1, wxGROW ); + + m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow)); SetSizer( main_sizer ); } +MySortingFrame::~MySortingFrame() +{ + delete wxLog::SetActiveTarget(m_logOld); +} + +void MySortingFrame::OnSelectedUnsorted(wxDataViewEvent &event) +{ + int row = event.GetRow(); + wxLogMessage( wxT("OnSelected from unsorted list, selected %d"), row ); + if (row >= 0) + wxLogMessage( wxT("wxDataViewCtrl::IsSelected( %d ): %d (as int)"), + row, (int) dataview_right->IsSelected( row ) ); +} + +void MySortingFrame::OnSelectedSorted(wxDataViewEvent &event) +{ + wxLogMessage( wxT("OnSelected from sorted list, selected %d"), (int) event.GetRow() ); +} + +void MySortingFrame::OnActivatedUnsorted(wxDataViewEvent &event) +{ + wxLogMessage( wxT("OnActivated from unsorted list, activated %d"), (int) event.GetRow() ); +} + +void MySortingFrame::OnHeaderClickSorted(wxDataViewEvent &event) +{ + wxDataViewColumn *col = event.GetDataViewColumn(); + wxLogMessage( wxT("OnHeaderClick from sorted list, column %s"), col->GetTitle().c_str() ); + + if (col->GetTitle() == wxT("editable")) + { + // this is the sorting column + if (col->IsSortOrderAscending()) + { + col->SetSortOrder( false ); + m_sorted_model->SetAscending( false ); + m_sorted_model->Resort(); + } + else + { + col->SetSortOrder( true ); + m_sorted_model->SetAscending( true ); + m_sorted_model->Resort(); + } + } +} + +void MySortingFrame::OnHeaderClickUnsorted(wxDataViewEvent &event) +{ + wxLogMessage( wxT("OnHeaderClick from unsorted list, column %s"), event.GetDataViewColumn()->GetTitle().c_str() ); +} + void MySortingFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { Close(true); @@ -545,6 +638,16 @@ void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) dialog.ShowModal(); } +void MySortingFrame::OnSelect(wxCommandEvent& WXUNUSED(event)) +{ + dataview_left->SetSelection( 2 ); +} + +void MySortingFrame::OnUnselectAll(wxCommandEvent& WXUNUSED(event)) +{ + dataview_left->ClearSelection(); +} + void MySortingFrame::OnAppendRowLeft(wxCommandEvent& WXUNUSED(event)) { wxTextEntryDialog dialog( this, wxT("Enter text to append") );