From fbfecac9ab2e12186b728fe3d24629da4bf38c75 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 21 May 2008 09:42:52 +0000 Subject: [PATCH] Add test for progress renderer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dataview/dataview.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 93dde3d838..d9ebdd5912 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -245,7 +245,7 @@ public: virtual unsigned int GetColumnCount() const { - return 3; + return 4; } virtual wxString GetColumnType( unsigned int col ) const @@ -265,9 +265,10 @@ public: case 0: variant = node->m_title; break; case 1: variant = node->m_artist; break; case 2: variant = (long) node->m_year; break; + case 3: if (IsContainer(item)) variant = (long) 0; else variant = (long) 80; break; // popularity default: { - wxLogError( wxT("MyMusicModel::GetValue: wrong column" )); + wxLogError( wxT("MyMusicModel::GetValue: wrong column %d"), col ); // provoke a crash when mouse button down wxMouseState state = wxGetMouseState(); @@ -595,7 +596,7 @@ public: virtual wxSize GetSize() const { - return wxSize(60,40); + return wxSize(60,30); } virtual bool SetValue( const wxVariant &WXUNUSED(value) ) { return true; } @@ -805,6 +806,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); m_musicCtrl->AppendColumn( column2 ); + m_musicCtrl->AppendProgressColumn( wxT("popularity"), 3, wxDATAVIEW_CELL_INERT, 80 ); + MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT ); wxDataViewColumn *column3 = new wxDataViewColumn( wxT("custom"), cr, 2, -1, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE ); -- 2.45.2