From: Robert Roebling Date: Thu, 5 Jul 2007 14:59:16 +0000 (+0000) Subject: The dataview sample compiles now, but doesn't work yet... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5debbdcf7b6c6e493aa5c475fd2744a22b2bf4f9?ds=inline The dataview sample compiles now, but doesn't work yet... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 085655fb16..2dd87b0c3c 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -125,7 +125,7 @@ public: protected: // the user should not delete this class directly: he should use DecRef() instead! - virtual ~wxDataViewModel(); + virtual ~wxDataViewModel() { } wxList m_notifiers; }; diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 0d488672aa..457c81f1d9 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -41,361 +41,181 @@ // ------------------------------------- -// MyTextModel +// MyMusicModel // ------------------------------------- -WX_DECLARE_OBJARRAY(wxDateTime,wxArrayDate); -#include -WX_DEFINE_OBJARRAY(wxArrayDate) +/* +Implement this data model + Title Artist Year +------------------------------------------------------------- +1: My Music: + 2: Pop music + 3: You are not alone Michael Jackson 1995 + 4: Take a bow Madonna 1994 + 5: Classical music + 6: Ninth Symphony Ludwig v. Beethoven 1824 + 7: German Requiem Johannes Brahms 1868 +*/ -class MyTextModel: public wxDataViewListModel + +class MyMusicModel: public wxDataViewModel { public: - MyTextModel() + MyMusicModel() {} + + virtual unsigned int GetColumnCount() const { - unsigned int i; - for (i = 0; i < 1000; i++) - m_list.Add( wxT("Test") ); - for (i = 0; i < 500; i++) - { m_bools.Add( 0 ); m_bools.Add( 1 ); } - for (i = 0; i < 500; i++) - { m_colours.Add( wxT("red") ); m_colours.Add( wxT("green") ); } - for (i = 0; i < 1000; i++) - { m_progress.Add( i/10 ); } - for (i = 0; i < 1000; i++) - { - wxDateTime date( wxDateTime::Now() ); - m_dates.Add( date ); - } + return 2; } - virtual unsigned int GetRowCount() const - { return 1000; } - virtual unsigned int GetColumnCount() const - { return 7; } - - // as reported by wxVariant virtual wxString GetColumnType( unsigned int col ) const - { - if (col == 6) - return wxT("datetime"); - - if (col == 5) - return wxT("long"); - - if (col == 3) - return wxT("bool"); - - return wxT("string"); - } + { + return "string"; + } - virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const + virtual void GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const + { + int ID = item.GetID(); + switch (ID) { - if (col == 6) - { - variant = (wxDateTime) m_dates[row]; - } else - if (col == 5) - { - variant = (long) m_progress[row]; - } else - if (col == 4) - { - variant = m_colours[row]; - } else - if (col == 3) + case 1: variant = "My Music"; break; + case 2: variant = "Pop music"; break; + case 5: variant = "Classical music"; break; + case 3: { - variant = (bool) (m_bools[row] != 0); - } else - if (col == 2) - { - variant = m_list[row]; + switch (col) + { + case 0: variant = "You are not alone"; break; + case 1: variant = "Michael Jackson"; break; + case 2: variant = "1995"; + } } - else + break; + case 4: { - wxString tmp; - tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); - variant = tmp; + switch (col) + { + case 0: variant = "Take a bow"; break; + case 1: variant = "Madonna"; break; + case 2: variant = "1994"; + } } - } - virtual bool SetValue( const wxVariant &value, unsigned int col, unsigned int row ) - { - if (col == 6) + break; + case 6: { - m_dates[row] = value.GetDateTime(); - } else - if (col == 3) - { - m_bools[row] = (int) value.GetBool(); - } else - if (col == 2) + switch (col) + { + case 0: variant = "Ninth symphony"; break; + case 1: variant = "Ludwig v. Beethoven"; break; + case 2: variant = "1824"; + } + } + break; + case 7: { - m_list[row] = value.GetString(); + switch (col) + { + case 0: variant = "German requiem"; break; + case 1: variant = "Johannes Brahms"; break; + case 2: variant = "1868"; + } } - return true; + break; } - - virtual void GetAttr( wxListItemAttr &attr, unsigned int col, unsigned int row ) - { - if (row == 4) - attr.SetBackgroundColour( *wxGREEN ); - } - - wxArrayString m_list; - wxArrayInt m_bools; - wxArrayString m_colours; - wxArrayInt m_progress; - wxArrayDate m_dates; -}; - -// ------------------------------------- -// MyTextRenderer -// ------------------------------------- - -class MyTextRenderer: public wxDataViewTextRenderer -{ -public: - MyTextRenderer( const wxString varianttype = wxT("string"), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ) - : wxDataViewTextRenderer( varianttype, mode ) { } - - virtual bool Validate( wxVariant &value ) - { - wxString str = value; - if (str.Length() > 10) - { - wxMessageDialog dlg( NULL, wxT("string too long") , wxT("Error") ); - dlg.ShowModal(); - return false; - } - - return true; - } -}; - - -// ------------------------------------- -// MyCustomRenderer -// ------------------------------------- - -class MyCustomRenderer: public wxDataViewCustomRenderer -{ -public: - MyCustomRenderer() : - wxDataViewCustomRenderer( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE ) - { - m_colour = wxT("black"); - } - bool SetValue( const wxVariant &value ) - { - m_colour = value.GetString(); - return true; + } - bool GetValue( wxVariant &value ) const + virtual bool SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) { - value = m_colour; + // readonly return true; } - bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) ) + virtual bool HasChildren( const wxDataViewItem &item ) const { - dc->SetPen( *wxBLACK_PEN ); - if (m_colour == wxT("red")) - dc->SetBrush( *wxRED_BRUSH ); - else if (m_colour == wxT("green")) - dc->SetBrush( *wxGREEN_BRUSH ); - else - dc->SetBrush( *wxBLACK_BRUSH ); - dc->DrawRectangle( rect ); - return true; + int ID = item.GetID(); + return ((ID == 1) || (ID == 2) || (ID == 5)); } - wxSize GetSize() const + + virtual int GetChildCount( const wxDataViewItem &item ) const { - return wxSize(20,8); + int ID = item.GetID(); + switch (ID) + { + case 1: return 2; + case 2: return 2; + case 5: return 2; + } + return 0; } - bool Activate( wxRect WXUNUSED(rect), - wxDataViewListModel *WXUNUSED(model), - unsigned int WXUNUSED(col), - unsigned int WXUNUSED(row) ) + virtual wxDataViewItem GetParent( const wxDataViewItem &child ) const { - return false; - } - -private: - wxString m_colour; -}; - -// ------------------------------------- -// MySpinCtrlInPlaceRenderer -// ------------------------------------- - -class MySpinCtrlInPlaceRenderer: public wxDataViewCustomRenderer -{ -public: - MySpinCtrlInPlaceRenderer() : - wxDataViewCustomRenderer( wxT("long"), wxDATAVIEW_CELL_EDITABLE ) { } - - - virtual bool HasEditorCtrl() - { - return true; - } - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) - { - long l = value; - return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, - labelRect.GetTopLeft(), labelRect.GetSize(), 0, 0, 100, l ); - } - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) - { - wxSpinCtrl *sc = (wxSpinCtrl*) editor; - long l = sc->GetValue(); - value = l; - return true; + int ID = child.GetID(); + switch (ID) + { + case 2: + case 5: return wxDataViewItem( 1 ); + case 3: + case 4: return wxDataViewItem( 2 ); + case 6: + case 7: return wxDataViewItem( 5 ); } - bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) ) - { - wxString str; - str.Printf( wxT("%d"), (int) m_data ); - dc->SetTextForeground( *wxBLACK ); - dc->DrawText( str, rect.x, rect.y ); - return true; - } - wxSize GetSize() const - { - return wxSize(80,16); + return wxDataViewItem(0); } - bool SetValue( const wxVariant &value ) + virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const { - m_data = value.GetLong(); - return true; - } - bool GetValue( wxVariant &value ) const - { - value = m_data; - return true; - } - - -private: - long m_data; -}; - -// ------------------------------------- -// MyUnsortedTextModel -// ------------------------------------- - -class MyUnsortedTextModel: public wxDataViewListModel -{ -public: - MyUnsortedTextModel() - { - m_list.Add( wxT("This") ); - m_list.Add( wxT("is") ); - m_list.Add( wxT("an") ); - m_list.Add( wxT("unsorted") ); - m_list.Add( wxT("list") ); - m_list.Add( wxT("of") ); - m_list.Add( wxT("words.") ); - - m_ilist.Add( 0 ); - m_ilist.Add( 1); - m_ilist.Add( 2 ); - m_ilist.Add( 3 ); - m_ilist.Add( 4 ); - m_ilist.Add( 5 ); - m_ilist.Add( 6 ); + int ID = parent.GetID(); + switch (ID) + { + case 1: return wxDataViewItem( 2 ); + case 2: return wxDataViewItem( 3 ); + case 5: return wxDataViewItem( 6 ); + } - m_bitmap = wxBitmap( null_xpm ); - } - - virtual unsigned int GetRowCount() const - { - return m_list.GetCount(); - } - - virtual unsigned int GetColumnCount() const - { - return 4; + return wxDataViewItem(0); } - - virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const - { - return wxT("string"); - } - - virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const + virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const { - if (col == 0) + int ID = item.GetID(); + switch (ID) { - variant = m_list[row]; - return; - } else - if ((col == 2) || (col == 3)) - { - variant << m_bitmap; - return; - } else - if (col == 4) - { - variant = (long) m_ilist[row]; - return; + case 2: return wxDataViewItem( 5 ); + case 3: return wxDataViewItem( 4 ); + case 6: return wxDataViewItem( 7 ); } - wxString tmp; - tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); - variant = tmp; + return wxDataViewItem(0); } - - virtual bool SetValue( const wxVariant &variant, unsigned int col, unsigned int row ) + virtual wxDataViewItem GetNthChild( const wxDataViewItem &parent, unsigned int n ) const { - if (col == 0) + int ID = parent.GetID(); + switch (ID) { - m_list[row] = variant.GetString(); - return true; - } else - if (col == 4) - { - m_ilist[row] = variant.GetLong(); - return true; + case 1: + { + if (n == 0) return wxDataViewItem( 2 ); + else if (n == 1) return wxDataViewItem( 5 ); + } + break; + case 2: + { + if (n == 0) return wxDataViewItem( 3 ); + else if (n == 1) return wxDataViewItem( 4 ); + } + break; + case 5: + { + if (n == 0) return wxDataViewItem( 6 ); + else if (n == 1) return wxDataViewItem( 7 ); + } + break; } - return false; - - } - - void AppendRow( const wxString &text ) - { - m_list.Add( text ); - m_ilist.Add( 0 ); - RowAppended(); - } - - void PrependRow( const wxString &text ) - { - m_list.Insert( text, 0 ); - m_ilist.Insert( 0, 0 ); - RowPrepended(); - } - - void InsertRowAt1( const wxString &text ) - { - m_list.Insert( text, 1 ); - m_ilist.Insert( 0, 1 ); - RowInserted( 1 ); - } - - void DeleteRow( unsigned int index ) - { - m_list.RemoveAt( index ); - m_ilist.RemoveAt( index ); - RowDeleted( index ); + + return wxDataViewItem(0); } - - wxArrayString m_list; - wxArrayInt m_ilist; - wxBitmap m_bitmap; }; // ------------------------------------- @@ -421,99 +241,11 @@ public: public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); - void OnNewSortingFrame(wxCommandEvent& event); - - void OnStyleChange(wxCommandEvent& event); - void OnColumnSetting(wxCommandEvent& event); private: - wxDataViewCtrl* dataview_left; - wxDataViewCtrl* dataview_right; - wxSplitterWindow *m_splitter; - wxPanel *m_panelLeft, *m_panelRight; - - // utilities: - - void CreateDataViewControls(); - - wxArrayInt GetFlaggedColumns(int flag); - wxAlignment ChooseAlign(const wxString &msg, bool onlyHorizontal); - void SetFlag(const wxArrayInt &idx, int flag); - void SetAlignment(const wxArrayInt &idx, bool header, wxAlignment align); - void SetWidth(const wxArrayInt &idx, bool minwidth, int width); - -private: - DECLARE_EVENT_TABLE() -}; - -// ------------------------------------- -// MySortingFrame -// ------------------------------------- - -enum my_events -{ - ID_APPEND_ROW_LEFT = 1000, - ID_PREPEND_ROW_LEFT, - 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_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); - void OnAbout(wxCommandEvent& event); - - void OnAppendRowLeft(wxCommandEvent& event); - void OnPrependRowLeft(wxCommandEvent& event); - void OnInsertRowLeft(wxCommandEvent& event); - void OnDeleteRowLeft(wxCommandEvent& event); - void OnEditRowLeft(wxCommandEvent& event); - - void OnAppendRowRight(wxCommandEvent& event); - void OnPrependRowRight(wxCommandEvent& event); - void OnInsertRowRight(wxCommandEvent& event); - 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); + wxDataViewCtrl* m_dataview; private: - wxDataViewCtrl* dataview_left; - wxDataViewCtrl* dataview_right; - - wxLog *m_logOld; - wxTextCtrl *m_logWindow; - - wxObjectDataPtr m_unsorted_model; - wxObjectDataPtr m_sorted_model; - DECLARE_EVENT_TABLE() }; @@ -551,41 +283,12 @@ enum { // file menu ID_ABOUT = wxID_ABOUT, - ID_NEW_SORT_FRAME = wxID_HIGHEST+1, ID_EXIT = wxID_EXIT, - - // dataviewctrl menu - ID_SINGLE_SEL_MODE = wxID_HIGHEST+2, - ID_MULTIPLE_SEL_MODE, - ID_NO_HEADER_MODE, - ID_HORIZ_RULES_MODE, - ID_VERT_RULES_MODE, - - ID_RESIZEABLE_COLUMNS, - ID_SORTABLE_COLUMNS, - ID_HIDDEN_COLUMNS, - - ID_CHOOSE_COLUMN_ALIGNMENT, - ID_CHOOSE_CONTENTS_ALIGNMENT, - - ID_SET_MINWIDTH, - ID_SET_WIDTH }; BEGIN_EVENT_TABLE(MyFrame, wxFrame) - - // file menu EVT_MENU( ID_ABOUT, MyFrame::OnAbout ) - EVT_MENU( ID_NEW_SORT_FRAME, MyFrame::OnNewSortingFrame ) EVT_MENU( ID_EXIT, MyFrame::OnQuit ) - - // dataviewctrl menu - EVT_COMMAND_RANGE( ID_SINGLE_SEL_MODE, ID_VERT_RULES_MODE, - wxEVT_COMMAND_MENU_SELECTED, MyFrame::OnStyleChange ) - - EVT_COMMAND_RANGE( ID_RESIZEABLE_COLUMNS, ID_SET_WIDTH, - wxEVT_COMMAND_MENU_SELECTED, MyFrame::OnColumnSetting ) - END_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): @@ -596,171 +299,28 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): // build the menus: wxMenu *file_menu = new wxMenu; - file_menu->Append(ID_NEW_SORT_FRAME, _T("&New sorting frame")); - file_menu->AppendSeparator(); - file_menu->Append(ID_ABOUT, _T("&About")); + file_menu->Append(ID_ABOUT, "&About"); file_menu->AppendSeparator(); - file_menu->Append(ID_EXIT, _T("E&xit")); - - wxMenu *data_menu = new wxMenu; - data_menu->AppendRadioItem(ID_SINGLE_SEL_MODE, _T("&Single selection mode")); - data_menu->AppendRadioItem(ID_MULTIPLE_SEL_MODE, _T("&Multiple selection mode")); - data_menu->AppendSeparator(); - data_menu->AppendCheckItem(ID_NO_HEADER_MODE, _T("No header mode")); - data_menu->AppendCheckItem(ID_HORIZ_RULES_MODE, _T("Horizontal rules")); - data_menu->AppendCheckItem(ID_VERT_RULES_MODE, _T("Vertical rules")); - data_menu->AppendSeparator(); - data_menu->Append(ID_RESIZEABLE_COLUMNS, _T("Set column(s) as resizeable...")); - data_menu->Append(ID_SORTABLE_COLUMNS, _T("Set column(s) as sortable...")); - data_menu->Append(ID_HIDDEN_COLUMNS, _T("Set column(s) as hidden...")); - data_menu->AppendSeparator(); - data_menu->Append(ID_CHOOSE_COLUMN_ALIGNMENT, _T("Set column(s) title alignment...")); - data_menu->Append(ID_CHOOSE_CONTENTS_ALIGNMENT, _T("Set column(s) contents alignment...")); - data_menu->AppendSeparator(); - data_menu->Append(ID_SET_MINWIDTH, _T("Set column(s) minimal width...")); - data_menu->Append(ID_SET_WIDTH, _T("Set column(s) width...")); + file_menu->Append(ID_EXIT, "E&xit"); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - menu_bar->Append(data_menu, _T("&DataViewCtrl")); + menu_bar->Append(file_menu, "&File"); SetMenuBar(menu_bar); CreateStatusBar(); + m_dataview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, + wxDefaultSize ); - // check the menus for the default wxDataViewCtrl style - data_menu->Check(ID_MULTIPLE_SEL_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_MULTIPLE) != 0); - data_menu->Check(ID_NO_HEADER_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_NO_HEADER) != 0); - data_menu->Check(ID_HORIZ_RULES_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_HORIZ_RULES) != 0); - data_menu->Check(ID_VERT_RULES_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_VERT_RULES) != 0); - - - // build the other controls: - - m_splitter = new wxSplitterWindow( this, wxID_ANY ); - m_splitter->SetSashGravity(0.5); - - m_panelLeft = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER ); - m_panelRight = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER ); - wxSizer *szLeft = new wxBoxSizer(wxVERTICAL); - wxSizer *szRight = new wxBoxSizer(wxVERTICAL); - - dataview_left = NULL; - dataview_right = NULL; - CreateDataViewControls(); - - // left panel - szLeft->Add( dataview_left, 1, wxGROW|wxALL, 5 ); - m_panelLeft->SetSizerAndFit(szLeft); - - // right panel - wxStaticText *stattext = - new wxStaticText(m_panelRight, wxID_ANY, - wxT("This is another wxDataViewCtrl using the same wxDataViewModel ") - wxT("of the wxDataViewCtrl on the left but, unlike it, this window ") - wxT("won't react to the style/column changes done through the ") - wxT("'DataViewCtrl' menu")); - stattext->Wrap(GetClientSize().GetWidth() / 2); - - szRight->Add( stattext, 0, wxALL, 5 ); - szRight->Add( dataview_right, 1, wxGROW|wxALL, 5 ); - m_panelRight->SetSizerAndFit(szRight); - - // split the two panels - m_splitter->SplitVertically(m_panelLeft, m_panelRight); - this->SetMinSize(m_splitter->GetBestSize()); -} - -void MyFrame::CreateDataViewControls() -{ - wxDataViewCtrl *old1 = NULL, *old2 = NULL; - - if (dataview_left) - old1 = dataview_left; - if (dataview_right) - old2 = dataview_right; - - // styles: - long style = 0; - if (GetMenuBar()->FindItem(ID_MULTIPLE_SEL_MODE)->IsChecked()) - style |= wxDV_MULTIPLE; - if (GetMenuBar()->FindItem(ID_NO_HEADER_MODE)->IsChecked()) - style |= wxDV_NO_HEADER; -#if 0 - if (GetMenuBar()->FindItem(ID_HORIZ_RULES_MODE)->IsChecked()) - style |= wxDV_HORIZ_RULES; - if (GetMenuBar()->FindItem(ID_VERT_RULES_MODE)->IsChecked()) - style |= wxDV_VERT_RULES; -#endif - + wxObjectDataPtr model(new MyMusicModel); + m_dataview->AssociateModel( model.get() ); - // Left wxDataViewCtrl - dataview_left = new wxDataViewCtrl( m_panelLeft, wxID_ANY, wxDefaultPosition, - wxDefaultSize, style ); - - - wxDataViewTextRenderer *text_renderer; - wxDataViewColumn *column; - - wxObjectDataPtr model(new MyTextModel); - dataview_left->AssociateModel( model.get() ); - - dataview_left->AppendTextColumn( wxT("First"), 0, wxDATAVIEW_CELL_INERT, -1, + m_dataview->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, -1, DEFAULT_ALIGN ); - dataview_left->AppendTextColumn( wxT("Second"), 1, wxDATAVIEW_CELL_INERT, -1, + m_dataview->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_INERT, -1, + DEFAULT_ALIGN ); + m_dataview->AppendTextColumn( "Year", 1, wxDATAVIEW_CELL_INERT, -1, DEFAULT_ALIGN ); - - text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - column = new wxDataViewColumn( wxT("editable"), text_renderer, 2, -1, DEFAULT_ALIGN ); - dataview_left->AppendColumn( column ); - - dataview_left->AppendToggleColumn( wxT("fourth"), 3, wxDATAVIEW_CELL_INERT, -1, - DEFAULT_ALIGN ); - - MyCustomRenderer *custom_renderer = new MyCustomRenderer; - column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4, -1, DEFAULT_ALIGN ); - dataview_left->AppendColumn( column ); - - dataview_left->AppendProgressColumn( wxT("progress"), 5, wxDATAVIEW_CELL_INERT, -1, - DEFAULT_ALIGN ); - - dataview_left->AppendDateColumn( wxT("date"), 6, wxDATAVIEW_CELL_INERT, -1, DEFAULT_ALIGN ); - - // Right wxDataViewCtrl using the same model - dataview_right = new wxDataViewCtrl( m_panelRight, wxID_ANY ); - dataview_right->AssociateModel( model.get() ); - - 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 ); - 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 ); - - - // layout the new dataview controls - if (old1) - { - m_panelLeft->GetSizer()->Replace(old1, dataview_left); - delete old1; - - m_panelLeft->Layout(); - } - - if (old2) - { - m_panelRight->GetSizer()->Replace(old2, dataview_right); - delete old2; - - m_panelRight->Layout(); - } } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) @@ -778,449 +338,3 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) wxAboutBox(info); } -void MyFrame::OnNewSortingFrame(wxCommandEvent& WXUNUSED(event) ) -{ - MySortingFrame *frame2 = - new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500); - frame2->Show(true); -} - -void MyFrame::OnStyleChange(wxCommandEvent& WXUNUSED(event) ) -{ - // recreate the wxDataViewCtrl: - CreateDataViewControls(); -} - -void MyFrame::OnColumnSetting(wxCommandEvent& event) -{ - wxArrayInt columns; - int flag = 0; - bool header = false, minwidth = false; - wxString msg; - - switch (event.GetId()) - { - case ID_RESIZEABLE_COLUMNS: - flag = wxDATAVIEW_COL_RESIZABLE; - columns = GetFlaggedColumns(flag); - break; - case ID_SORTABLE_COLUMNS: - flag = wxDATAVIEW_COL_SORTABLE; - columns = GetFlaggedColumns(flag); - break; - case ID_HIDDEN_COLUMNS: - flag = wxDATAVIEW_COL_HIDDEN; - columns = GetFlaggedColumns(flag); - break; - - case ID_CHOOSE_COLUMN_ALIGNMENT: - msg = wxT("Select the columns whose headers' alignment will be modified."); - header = true; - break; - case ID_CHOOSE_CONTENTS_ALIGNMENT: - msg = wxT("Select the columns whose contents' alignment will be modified."); - header = false; - break; - - case ID_SET_MINWIDTH: - msg = wxT("Please provide the new minimal width:"); - minwidth = true; - break; - case ID_SET_WIDTH: - msg = wxT("Please provide the new width:"); - minwidth = false; - break; - } - - // get column titles: - - wxArrayString choices; - for (size_t i=0; iGetColumnCount(); i++) - choices.Add(dataview_left->GetColumn(i)->GetTitle()); - - // ask the user - wxGetMultipleChoices( - columns, - wxT("Choose the columns to which apply the change."), - wxT("Choose the column"), - choices, - this); - - switch (event.GetId()) - { - case ID_RESIZEABLE_COLUMNS: - case ID_SORTABLE_COLUMNS: - case ID_HIDDEN_COLUMNS: - SetFlag(columns, flag); - break; - - case ID_CHOOSE_COLUMN_ALIGNMENT: - case ID_CHOOSE_CONTENTS_ALIGNMENT: - SetAlignment(columns, header, ChooseAlign(msg, header)); - break; - - case ID_SET_MINWIDTH: - case ID_SET_WIDTH: - { - int def = minwidth ? wxDVC_DEFAULT_MINWIDTH : wxDVC_DEFAULT_WIDTH; - - msg << wxT("\nNOTE: all non-selected columns will be reset to a width of ") - << def << wxT(" pixels."); - - long ret = - wxGetNumberFromUser(msg, wxT("New value:"), wxT("Modify width"), - def, 0, 300, this); - - if (ret != -1) - SetWidth(columns, minwidth, ret); - } - break; - } - - dataview_left->Refresh(); -} - -wxAlignment MyFrame::ChooseAlign(const wxString &msg, bool onlyHorizontal) -{ - const wxString choices[] = - { - wxT("Left"), - wxT("Center horizontally"), - wxT("Right"), - wxT("Top"), - wxT("Center vertically"), - wxT("Bottom"), - wxT("Center") - }; - - wxAlignment flags[] = - { - wxALIGN_LEFT, - wxALIGN_CENTER_HORIZONTAL, - wxALIGN_RIGHT, - wxALIGN_TOP, - wxALIGN_CENTER_VERTICAL, - wxALIGN_BOTTOM, - wxALIGN_CENTER - }; - - int n = WXSIZEOF(choices); - if (onlyHorizontal) - n = 3; // show only the first three choices - - int choice = wxGetSingleChoiceIndex( - msg + wxT("\nNOTE: _all_ non-selected column's alignment will be reset to wxALIGN_LEFT!"), - wxT("Alignment"), - n, choices, - this); - - if (choice == wxNOT_FOUND) - return wxALIGN_LEFT; - - return flags[choice]; -} - -void MyFrame::SetFlag(const wxArrayInt &idx, int toadd) -{ - for (size_t i=0; iGetColumnCount(); i++) - { - int current = dataview_left->GetColumn(i)->GetFlags(); - - if (idx.Index(i) != wxNOT_FOUND) - dataview_left->GetColumn(i)->SetFlags(current | toadd); - else - dataview_left->GetColumn(i)->SetFlags(current & ~toadd); - } -} - -wxArrayInt MyFrame::GetFlaggedColumns(int flag) -{ - wxArrayInt ret; - for (size_t i=0; iGetColumnCount(); i++) - if (dataview_left->GetColumn(i)->GetFlags() & flag) - ret.Add(i); - return ret; -} - -void MyFrame::SetAlignment(const wxArrayInt &idx, bool header, wxAlignment align) -{ - // set to DEFAULT_ALIGN all columns except those - // contained in 'idx' which are set to 'align' - - for (size_t i=0; iGetColumnCount(); i++) - { - wxAlignment toset = DEFAULT_ALIGN; - if (idx.Index(i) != wxNOT_FOUND) - toset = align; - - if (header) - dataview_left->GetColumn(i)->SetAlignment(toset); - else - dataview_left->GetColumn(i)->GetRenderer()->SetAlignment(toset); - } -} - -void MyFrame::SetWidth(const wxArrayInt &idx, bool minwidth, int width) -{ - // set to wxDVC_DEFAULT_WIDTH wide all columns except those - // contained in 'idx' which are set to 'width' - - for (size_t i=0; iGetColumnCount(); i++) - { - int toset = minwidth ? wxDVC_DEFAULT_MINWIDTH : wxDVC_DEFAULT_WIDTH; - if (idx.Index(i) != wxNOT_FOUND) - toset = width; - - if (minwidth) - dataview_left->GetColumn(i)->SetMinWidth(toset); - else - dataview_left->GetColumn(i)->SetWidth(toset); - } -} - - -// ------------------------------------- -// MySortingFrame -// ------------------------------------- - -BEGIN_EVENT_TABLE(MySortingFrame,wxFrame) - EVT_BUTTON( ID_APPEND_ROW_LEFT, MySortingFrame::OnAppendRowLeft ) - 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)); - CreateStatusBar(); - - wxPanel *main = new wxPanel(this); - - // Left wxDataViewCtrl - dataview_left = new wxDataViewCtrl( main, ID_UNSORTED, wxDefaultPosition, - wxDefaultSize, wxDV_MULTIPLE ); - - m_unsorted_model = new MyUnsortedTextModel; - dataview_left->AssociateModel( m_unsorted_model.get() ); - - wxDataViewTextRenderer *text_renderer = - new MyTextRenderer( 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( 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( main, ID_SORTED ); - - m_sorted_model = new wxDataViewSortedListModel( m_unsorted_model.get() ); - dataview_right->AssociateModel( m_sorted_model.get() ); - - text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, - wxALIGN_CENTER, - wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE ); - dataview_right->AppendColumn( column ); - - dataview_right->AppendTextColumn( wxT("second"), 1 ); - - MySpinCtrlInPlaceRenderer *sr = new MySpinCtrlInPlaceRenderer; - column = new wxDataViewColumn( wxT("spin"), sr, 4, -1, wxALIGN_CENTER ); - dataview_right->AppendColumn( column ); - - // layout dataview controls. - - wxBoxSizer *top_sizer = new wxBoxSizer( wxHORIZONTAL ); - top_sizer->Add( dataview_left, 1, wxGROW ); - top_sizer->Add(10,10); - top_sizer->Add( dataview_right, 1, wxGROW ); - - wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); - button_sizer->Add( 10, 10, 1 ); - wxFlexGridSizer *left_sizer = new wxFlexGridSizer( 2 ); - left_sizer->Add( new wxButton( main, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 ); - left_sizer->Add( new wxButton( main, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 ); - left_sizer->Add( new wxButton( main, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 ); - left_sizer->Add( new wxButton( main, ID_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 ); - left_sizer->Add( new wxButton( main, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 ); - left_sizer->Add( 5,5 ); - left_sizer->Add( new wxButton( main, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 ); - left_sizer->Add( new wxButton( main, 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 ); - right_sizer->Add( new wxButton( main, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 ); - right_sizer->Add( new wxButton( main, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 ); - right_sizer->Add( new wxButton( main, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 ); - right_sizer->Add( new wxButton( main, ID_DELETE_ROW_RIGHT, wxT("Delete second") ), 0, wxALL, 5 ); - right_sizer->Add( new wxButton( main, ID_EDIT_ROW_RIGHT, wxT("Edit") ), 0, wxALL, 5 ); - button_sizer->Add( right_sizer ); - button_sizer->Add( 10, 10, 1 ); - - wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); - main_sizer->Add( top_sizer, 1, wxGROW ); - main_sizer->Add( button_sizer, 0, wxGROW ); - - m_logWindow = new wxTextCtrl(main, 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)); - - main->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); -} - -void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) -{ - wxMessageDialog dialog(this, _T("This demonstrates the dataview control sorting"), - _T("About DataView"), wxOK); - - 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") ); - if (dialog.ShowModal() == wxID_OK) - { - wxString value = dialog.GetValue(); - if (!value.empty()) - m_unsorted_model->AppendRow( value ); - } -} - -void MySortingFrame::OnPrependRowLeft(wxCommandEvent& WXUNUSED(event)) -{ - wxTextEntryDialog dialog( this, wxT("Enter text to prepend") ); - if (dialog.ShowModal() == wxID_OK) - { - wxString value = dialog.GetValue(); - if (!value.empty()) - m_unsorted_model->PrependRow( value ); - } -} - -void MySortingFrame::OnInsertRowLeft(wxCommandEvent& WXUNUSED(event)) -{ - wxTextEntryDialog dialog( this, wxT("Enter text to insert before second") ); - if (dialog.ShowModal() == wxID_OK) - { - wxString value = dialog.GetValue(); - if (!value.empty()) - m_unsorted_model->InsertRowAt1( value ); - } -} - -void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& WXUNUSED(event)) -{ - m_unsorted_model->DeleteRow( 1 ); -} - -void MySortingFrame::OnEditRowLeft(wxCommandEvent& WXUNUSED(event)) -{ -} - -void MySortingFrame::OnAppendRowRight(wxCommandEvent& WXUNUSED(event)) -{ -} - -void MySortingFrame::OnPrependRowRight(wxCommandEvent& WXUNUSED(event)) -{ -} - -void MySortingFrame::OnInsertRowRight(wxCommandEvent& WXUNUSED(event)) -{ -} - -void MySortingFrame::OnDeleteRowRight(wxCommandEvent& WXUNUSED(event)) -{ -} - -void MySortingFrame::OnEditRowRight(wxCommandEvent& WXUNUSED(event)) -{ -} -