X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad3867930cf4d331bb7c361413ee71f3be6295c7..b2b0bee6d822b05fea419e8bf24ab4009cb17ac4:/samples/dataview/dataview.cpp diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 5f9c879d28..8f075e7611 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -27,9 +27,7 @@ #include "wx/numdlg.h" #include "wx/dataview.h" #include "wx/spinctrl.h" - -#include "wx/ptr_shrd.h" -#include "wx/vector.h" +#include "wx/menu.h" #ifndef __WXMSW__ #include "../sample.xpm" @@ -177,7 +175,7 @@ public: // helper method for wxLog - wxString GetTitle( const wxDataViewItem &item ) + wxString GetTitle( const wxDataViewItem &item ) const { MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); if (!node) @@ -186,6 +184,15 @@ public: return node->m_title; } + int GetYear( const wxDataViewItem &item ) const + { + MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + if (!node) + return 2000; + + return node->m_year; + } + // helper methods to change the model void AddToClassical( const wxString &title, const wxString &artist, int year ) @@ -234,8 +241,8 @@ public: if (res) return res; // items must be different - unsigned long litem1 = (unsigned long) item1.GetID(); - unsigned long litem2 = (unsigned long) item2.GetID(); + wxUIntPtr litem1 = (wxUIntPtr) item1.GetID(); + wxUIntPtr litem2 = (wxUIntPtr) item2.GetID(); return litem1-litem2; } @@ -247,7 +254,7 @@ public: virtual unsigned int GetColumnCount() const { - return 3; + return 5; } virtual wxString GetColumnType( unsigned int col ) const @@ -267,9 +274,23 @@ 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: + // wxMac doesn't conceal the popularity progress renderer, return 0 for containers + if (IsContainer(item)) + variant = (long) 0; + else + variant = (long) 80; // all music is very 80% popular + break; + case 4: + // Make size of red square depend on year + if (GetYear(item) < 1900) + variant = (long) 35; + else + variant = (long) 25; + break; 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(); @@ -402,14 +423,14 @@ static int my_sort( int *v1, int *v2 ) return *v1-*v2; } -class MyListModel: public wxDataViewIndexListModel +class MyListModel: public wxDataViewVirtualListModel { public: MyListModel() : #ifdef __WXMAC__ - wxDataViewIndexListModel( 1000 + 100 ) + wxDataViewVirtualListModel( 1000 + 100 ) #else - wxDataViewIndexListModel( 100000 + 100 ) + wxDataViewVirtualListModel( 100000 + 100 ) #endif { #ifdef __WXMAC__ @@ -562,6 +583,57 @@ public: int m_virtualItems; }; +// ------------------------------------- +// MyCustomRenderer +// ------------------------------------- + +class MyCustomRenderer: public wxDataViewCustomRenderer +{ +public: + MyCustomRenderer( wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer( wxString("long"), mode, alignment ) + { m_height = 25; } + + virtual bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) ) + { + dc->SetBrush( *wxRED_BRUSH ); + dc->SetPen( *wxTRANSPARENT_PEN ); + dc->DrawRectangle( rect ); + return true; + } + + + virtual bool Activate( wxRect WXUNUSED(cell), + wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) + { + wxLogMessage( wxT("MyCustomRenderer Activate()") ); + return false; + } + + virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell), + wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) + { + wxLogMessage( wxT("MyCustomRenderer LeftClick( %d, %d )"), cursor.x, cursor.y ); + return false; + } + + virtual wxSize GetSize() const + { + return wxSize(60,m_height); + } + + virtual bool SetValue( const wxVariant &value ) + { + m_height = value; + return true; + } + + virtual bool GetValue( wxVariant &WXUNUSED(value) ) const { return true; } + +private: + long m_height; +}; + // ------------------------------------- // MyApp // ------------------------------------- @@ -645,7 +717,7 @@ bool MyApp::OnInit(void) // build the first frame MyFrame *frame = - new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 800, 540); + new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 1000, 540); frame->Show(true); SetTopWindow(frame); @@ -740,27 +812,37 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int // MyMusic m_musicCtrl = new wxDataViewCtrl( this, ID_MUSIC_CTRL, wxDefaultPosition, - wxDefaultSize, wxDV_MULTIPLE ); + wxDefaultSize, wxDV_MULTIPLE|wxDV_VARIABLE_LINE_HEIGHT ); m_music_model = new MyMusicModel; m_musicCtrl->AssociateModel( m_music_model.get() ); + wxDataViewTextRenderer *tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT ); + wxDataViewColumn *column0 = new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT, + wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + m_musicCtrl->AppendColumn( column0 ); #if 0 // Call this and sorting is enabled // immediatly upon start up. - wxDataViewColumn *col = m_musicCtrl->AppendTextColumn( wxT("Title"), 0, wxDATAVIEW_CELL_INERT, 200, - DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE); - col->SetSortOrder( true ); -#else - m_musicCtrl->AppendTextColumn(wxT("Title"),0,wxDATAVIEW_CELL_INERT,200,DEFAULT_ALIGN,wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE); + column0->SetSortOrder( true ); #endif - m_musicCtrl->AppendTextColumn( wxT("Artist"), 1, wxDATAVIEW_CELL_EDITABLE, 150, - DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE); + tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); + wxDataViewColumn *column1 = new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_RIGHT, + wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + m_musicCtrl->AppendColumn( column1 ); - wxDataViewSpinRenderer *sr = new wxDataViewSpinRenderer( 0, 2010 ); - wxDataViewColumn *column = new wxDataViewColumn( wxT("year"), sr, 2, -1, wxALIGN_CENTRE, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE); - m_musicCtrl->AppendColumn( column ); + wxDataViewSpinRenderer *sr = new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); + wxDataViewColumn *column2 = new wxDataViewColumn( wxT("year"), sr, 2, 80, wxALIGN_LEFT, + 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, 4, -1, wxALIGN_LEFT, + wxDATAVIEW_COL_RESIZABLE ); + m_musicCtrl->AppendColumn( column3 ); data_sizer->Add( m_musicCtrl, 3, wxGROW ); @@ -773,13 +855,18 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int m_list_model = new MyListModel; m_listCtrl->AssociateModel( m_list_model.get() ); - + +#if 1 m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 ); - m_listCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT, 60 ); - + m_listCtrl->AppendIconTextColumn(wxIcon(small1_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") ); +#else + m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE ); + m_listCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT ); +#endif + wxDataViewTextRendererAttr *ra = new wxDataViewTextRendererAttr; - column = new wxDataViewColumn(wxT("attributes"), ra, 2 ); - m_listCtrl->AppendColumn( column ); + wxDataViewColumn *column4 = new wxDataViewColumn(wxT("attributes"), ra, 2 ); + m_listCtrl->AppendColumn( column4 ); data_sizer->Add( m_listCtrl, 2, wxGROW ); @@ -823,7 +910,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int treectrl->AssociateModel( store ); store->DecRef(); - treectrl->AppendIconTextColumn(wxT("no label"), 0, wxDATAVIEW_CELL_INERT, -1 ); + treectrl->AppendIconTextColumn( wxT("no label"), 0, wxDATAVIEW_CELL_INERT, -1, (wxAlignment) 0, + wxDATAVIEW_COL_RESIZABLE ); bottom_sizer->Add( treectrl, 1 ); @@ -983,6 +1071,15 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event ) wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title.GetData()); + + wxMenu *menu = new wxMenu; + menu->Append( 1, wxT("entry 1") ); + menu->Append( 2, wxT("entry 2") ); + menu->Append( 3, wxT("entry 3") ); + + m_musicCtrl->PopupMenu( menu ); + +// wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),title.GetData(), event.GetValue().GetString()); } void MyFrame::OnHeaderClick( wxDataViewEvent &event )