X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9c13e704341ab94ea4484329b7883ef99ad6812..b2b0bee6d822b05fea419e8bf24ab4009cb17ac4:/samples/dataview/dataview.cpp diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 0f5fc5de16..8f075e7611 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -27,6 +27,7 @@ #include "wx/numdlg.h" #include "wx/dataview.h" #include "wx/spinctrl.h" +#include "wx/menu.h" #ifndef __WXMSW__ #include "../sample.xpm" @@ -34,68 +35,38 @@ #include "null.xpm" - -#define DEFAULT_ALIGN wxALIGN_LEFT -#define DATAVIEW_DEFAULT_STYLE (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES) - - -// ------------------------------------- -// 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, -1, 2010, l ); - } - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) - { - wxSpinCtrl *sc = (wxSpinCtrl*) editor; - long l = sc->GetValue(); - value = l; - return true; - } - - 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); - } - bool SetValue( const wxVariant &value ) - { - m_data = value.GetLong(); - return true; - } - bool GetValue( wxVariant &value ) const - { - value = m_data; - return true; - } - -private: - long m_data; +/* XPM */ +static const char *small1_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 6 1", +". c Black", +"o c #FFFFFF", +"X c #000080", +"O c #FFFF00", +" c None", +"+ c #FF0000", +/* pixels */ +" ", +" ", +" ", +" ....... ", +" .XXXXX. ", +" .oXXXX. ", +" .oXXX.......", +".....oXXX.OOOOO.", +".+++.XXXX.oOOOO.", +".o++......oOOOO.", +".o++++. .oOOOO.", +".o++++. .OOOOO.", +".+++++. .......", +"....... ", +" ", +" " }; +#define DEFAULT_ALIGN wxALIGN_LEFT +#define DATAVIEW_DEFAULT_STYLE (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES) // ------------------------------------- // MyMusicModel @@ -181,21 +152,46 @@ public: MyMusicModel() { - m_root = new MyMusicModelNode( NULL, "My Music" ); - m_pop = new MyMusicModelNode( m_root, "Pop music" ); + m_root = new MyMusicModelNode( NULL, wxT("My Music" )); + m_pop = new MyMusicModelNode( m_root, wxT("Pop music") ); m_root->Append( m_pop ); m_pop->Append( new MyMusicModelNode( m_pop, - "You are not alone", "Michael Jackson", 1995 ) ); + wxT("You are not alone"), wxT("Michael Jackson"), 1995 ) ); m_pop->Append( new MyMusicModelNode( m_pop, - "Take a bow", "Madonna", 1994 ) ); - m_classical = new MyMusicModelNode( m_root, "Classical music" ); + wxT("Take a bow"), wxT("Madonna"), 1994 ) ); + m_classical = new MyMusicModelNode( m_root, wxT("Classical music") ); m_root->Append( m_classical ); m_classical->Append( new MyMusicModelNode( m_classical, - "Ninth symphony", "Ludwig van Beethoven", 1824 ) ); + wxT("Ninth symphony"), wxT("Ludwig van Beethoven"), 1824 ) ); m_classical->Append( new MyMusicModelNode( m_classical, - "German Requiem", "Johannes Brahms", 1868 ) ); + wxT("German Requiem"), wxT("Johannes Brahms"), 1868 ) ); m_classicalMusicIsKnownToControl = false; } + + ~MyMusicModel() + { + delete m_root; + } + + // helper method for wxLog + + wxString GetTitle( const wxDataViewItem &item ) const + { + MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + if (!node) + return wxEmptyString; + + 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 @@ -245,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; } @@ -258,15 +254,15 @@ public: virtual unsigned int GetColumnCount() const { - return 3; + return 5; } virtual wxString GetColumnType( unsigned int col ) const { if (col == 2) - return "long"; + return wxT("long"); - return "string"; + return wxT("string"); } virtual void GetValue( wxVariant &variant, @@ -278,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( "MyMusicModel::GetValue: wrong column" ); + wxLogError( wxT("MyMusicModel::GetValue: wrong column %d"), col ); // provoke a crash when mouse button down wxMouseState state = wxGetMouseState(); @@ -299,11 +309,12 @@ public: MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); switch (col) { - case 0: node->m_title = variant.GetString(); break; - case 1: node->m_artist = variant.GetString(); break; - case 2: node->m_year = variant.GetLong(); break; - default: wxLogError( "MyMusicModel::SetValue: wrong column" ); + case 0: node->m_title = variant.GetString(); return true; + case 1: node->m_artist = variant.GetString(); return true; + case 2: node->m_year = variant.GetLong(); return true; + default: wxLogError( wxT("MyMusicModel::SetValue: wrong column") ); } + return false; } virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const @@ -332,47 +343,67 @@ public: return node->IsContainer(); } - virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const + virtual unsigned int GetChildren( const wxDataViewItem &parent, wxDataViewItemArray &array ) const { MyMusicModelNode *node = (MyMusicModelNode*) parent.GetID(); if (!node) - return wxDataViewItem( (void*) m_root ); + { + array.Add( wxDataViewItem( (void*) m_root ) ); + return 1; + } - if (node->GetChildCount() == 0) - return wxDataViewItem( 0 ); - if (node == m_classical) { MyMusicModel *model = (MyMusicModel*)(const MyMusicModel*) this; model->m_classicalMusicIsKnownToControl = true; } - MyMusicModelNode *first_child = node->GetChildren().Item( 0 ); - return wxDataViewItem( (void*) first_child ); + if (node->GetChildCount() == 0) + { + return 0; + } + + unsigned int count = node->GetChildren().GetCount(); + unsigned int pos; + for (pos = 0; pos < count; pos++) + { + MyMusicModelNode *child = node->GetChildren().Item( pos ); + array.Add( wxDataViewItem( (void*) child ) ); + } + return count; } - virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + // DnD + + virtual bool IsDraggable( const wxDataViewItem &item ) + { + // only drag items + return (!IsContainer(item)); + } - // "MyMusic" has no siblings in our model - if (node == m_root) - return wxDataViewItem(0); - - MyMusicModelNode *parent = node->GetParent(); - int pos = parent->GetChildren().Index( node ); + virtual size_t GetDragDataSize( const wxDataViewItem &item, const wxDataFormat &WXUNUSED(format) ) + { + wxPrintf( "GetDragDataSize\n" ); - // Something went wrong - if (pos == wxNOT_FOUND) - return wxDataViewItem(0); - - // No more children - if (pos == parent->GetChildCount()-1) - return wxDataViewItem(0); + MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + wxString data; + data += node->m_title; data += wxT(" "); + data += node->m_artist; + return strlen( data.utf8_str() ) + 1; + } + virtual bool GetDragData( const wxDataViewItem &item, const wxDataFormat &WXUNUSED(format), + void* dest, size_t WXUNUSED(size) ) + { + wxPrintf( "GetDragData\n" ); - node = parent->GetChildren().Item( pos+1 ); - return wxDataViewItem( (void*) node ); - } + MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + wxString data; + data += node->m_title; data += wxT(" "); + data += node->m_artist; + wxCharBuffer buffer( data.utf8_str() ); + memcpy( dest, buffer, strlen(buffer)+1 ); + return true; + } private: MyMusicModelNode* m_root; @@ -381,17 +412,38 @@ private: bool m_classicalMusicIsKnownToControl; }; -class MyListModel: public wxDataViewIndexListModel + +static int my_sort_reverse( int *v1, int *v2 ) +{ + return *v2-*v1; +} + +static int my_sort( int *v1, int *v2 ) +{ + return *v1-*v2; +} + +class MyListModel: public wxDataViewVirtualListModel { public: MyListModel() : - wxDataViewIndexListModel( 100 ) +#ifdef __WXMAC__ + wxDataViewVirtualListModel( 1000 + 100 ) +#else + wxDataViewVirtualListModel( 100000 + 100 ) +#endif { +#ifdef __WXMAC__ + m_virtualItems = 1000; +#else + m_virtualItems = 100000; +#endif + unsigned int i; for (i = 0; i < 100; i++) { wxString str; - str.Printf( "row number %d", i ); + str.Printf( wxT("row number %d"), i ); m_array.Add( str ); } @@ -409,9 +461,43 @@ public: void DeleteItem( const wxDataViewItem &item ) { unsigned int row = GetRow( item ); + if (row >= m_array.GetCount()) + return; + m_array.RemoveAt( row ); RowDeleted( row ); } + + void DeleteItems( const wxDataViewItemArray &items ) + { + wxArrayInt rows; + unsigned int i; + for (i = 0; i < items.GetCount(); i++) + { + unsigned int row = GetRow( items[i] ); + if (row < m_array.GetCount()) + rows.Add( row ); + } + + // Sort in descending order so that the last + // row will be deleted first. Otherwise the + // remaining indeces would all be wrong. + rows.Sort( my_sort_reverse ); + for (i = 0; i < rows.GetCount(); i++) + m_array.RemoveAt( rows[i] ); + + // This is just to test if wxDataViewCtrl can + // cope with removing rows not sorted in + // descending order + rows.Sort( my_sort ); + RowsDeleted( rows ); + } + + void AddMany() + { + m_virtualItems += 1000; + Reset( m_array.GetCount() + m_virtualItems ); + } // implementation of base class virtuals to define model @@ -423,9 +509,9 @@ public: virtual wxString GetColumnType( unsigned int col ) const { if (col == 1) - return "wxDataViewIconText"; + return wxT("wxDataViewIconText"); - return "string"; + return wxT("string"); } virtual unsigned int GetRowCount() @@ -438,19 +524,43 @@ public: { if (col==0) { - variant = m_array[ row ]; + if (row >= m_array.GetCount()) + { + wxString str; + str.Printf(wxT("row %d"), row - m_array.GetCount() ); + variant = str; + } + else + { + variant = m_array[ row ]; + } } else if (col==1) { - wxDataViewIconText data( "test", m_icon ); + wxDataViewIconText data( wxT("test"), m_icon ); variant << data; + } else + if (col==2) + { + if (row >= m_array.GetCount()) + variant = wxT("plain"); + else + variant = wxT("blue"); } - else + } + + virtual bool GetAttr( unsigned int row, unsigned int col, wxDataViewItemAttr &attr ) + { + if (col != 2) + return false; + + if (row < m_array.GetCount()) { - wxString str; - str.Printf( "row %d col %d", row, col ); - variant = str; + attr.SetColour( *wxBLUE ); + attr.SetItalic( true ); } + + return true; } virtual bool SetValue( const wxVariant &variant, @@ -458,6 +568,9 @@ public: { if (col == 0) { + if (row >= m_array.GetCount()) + return false; + m_array[row] = variant.GetString(); return true; } @@ -467,6 +580,58 @@ public: wxArrayString m_array; wxIcon m_icon; + 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; }; // ------------------------------------- @@ -487,7 +652,8 @@ public: class MyFrame : public wxFrame { public: - MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h); + MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h); + ~MyFrame(); public: void OnQuit(wxCommandEvent& event); @@ -495,20 +661,19 @@ public: void OnAddMozart(wxCommandEvent& event); void OnDeleteMusic(wxCommandEvent& event); + void OnDeleteYear(wxCommandEvent& event); void OnPrependList(wxCommandEvent& event); void OnDeleteList(wxCommandEvent& event); void OnValueChanged( wxDataViewEvent &event ); - void OnItemAdded( wxDataViewEvent &event ); - void OnItemDeleted( wxDataViewEvent &event ); void OnActivated( wxDataViewEvent &event ); void OnExpanding( wxDataViewEvent &event ); void OnExpanded( wxDataViewEvent &event ); void OnCollapsing( wxDataViewEvent &event ); void OnCollapsed( wxDataViewEvent &event ); - void OnSelected( wxDataViewEvent &event ); + void OnSelectionChanged( wxDataViewEvent &event ); void OnEditingStarted( wxDataViewEvent &event ); void OnEditingDone( wxDataViewEvent &event ); @@ -517,8 +682,11 @@ public: void OnHeaderRightClick( wxDataViewEvent &event ); void OnSorted( wxDataViewEvent &event ); + void OnContextMenu( wxDataViewEvent &event ); + void OnRightClick( wxMouseEvent &event ); void OnGoto( wxCommandEvent &event); + void OnAddMany( wxCommandEvent &event); private: wxDataViewCtrl* m_musicCtrl; @@ -549,7 +717,7 @@ bool MyApp::OnInit(void) // build the first frame MyFrame *frame = - new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 800, 440); + new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 1000, 540); frame->Show(true); SetTopWindow(frame); @@ -576,10 +744,12 @@ enum ID_ADD_MOZART = 100, ID_DELETE_MUSIC = 101, + ID_DELETE_YEAR = 102, ID_PREPEND_LIST = 200, ID_DELETE_LIST = 201, - ID_GOTO = 202 + ID_GOTO = 202, + ID_ADD_MANY = 203 }; BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -587,34 +757,34 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU( ID_EXIT, MyFrame::OnQuit ) EVT_BUTTON( ID_ADD_MOZART, MyFrame::OnAddMozart ) EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic ) + EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear ) EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList ) EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList ) EVT_BUTTON( ID_GOTO, MyFrame::OnGoto) + EVT_BUTTON( ID_ADD_MANY, MyFrame::OnAddMany) - EVT_DATAVIEW_MODEL_ITEM_ADDED( ID_MUSIC_CTRL, MyFrame::OnItemAdded ) - EVT_DATAVIEW_MODEL_ITEM_DELETED( ID_MUSIC_CTRL, MyFrame::OnItemDeleted ) - EVT_DATAVIEW_MODEL_VALUE_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged ) - EVT_DATAVIEW_MODEL_ITEM_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged ) + EVT_DATAVIEW_ITEM_VALUE_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged ) EVT_DATAVIEW_ITEM_ACTIVATED(ID_MUSIC_CTRL, MyFrame::OnActivated ) EVT_DATAVIEW_ITEM_EXPANDING(ID_MUSIC_CTRL, MyFrame::OnExpanding) EVT_DATAVIEW_ITEM_EXPANDED(ID_MUSIC_CTRL, MyFrame::OnExpanded) EVT_DATAVIEW_ITEM_COLLAPSING(ID_MUSIC_CTRL, MyFrame::OnCollapsing) EVT_DATAVIEW_ITEM_COLLAPSED(ID_MUSIC_CTRL, MyFrame::OnCollapsed) - EVT_DATAVIEW_ITEM_SELECTED(ID_MUSIC_CTRL, MyFrame::OnSelected) + EVT_DATAVIEW_SELECTION_CHANGED(ID_MUSIC_CTRL, MyFrame::OnSelectionChanged) EVT_DATAVIEW_ITEM_EDITING_STARTED(ID_MUSIC_CTRL, MyFrame::OnEditingStarted) EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone) - EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick) EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick) EVT_DATAVIEW_COLUMN_SORTED(ID_MUSIC_CTRL, MyFrame::OnSorted) + + EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu) EVT_RIGHT_UP(MyFrame::OnRightClick) END_EVENT_TABLE() -MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): +MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h): wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) { m_log = NULL; @@ -625,12 +795,12 @@ 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_ABOUT, "&About"); + file_menu->Append(ID_ABOUT, wxT("&About")); file_menu->AppendSeparator(); - file_menu->Append(ID_EXIT, "E&xit"); + file_menu->Append(ID_EXIT, wxT("E&xit")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, wxT("&File")); SetMenuBar(menu_bar); CreateStatusBar(); @@ -642,25 +812,37 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): // 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() ); - wxDataViewColumn *col = m_musicCtrl->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, - DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE ); + 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. - col->SetSortOrder( true ); + column0->SetSortOrder( true ); #endif - m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 150, - DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE ); + 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 ); - MySpinCtrlInPlaceRenderer *sr = new MySpinCtrlInPlaceRenderer; - wxDataViewColumn *column = new wxDataViewColumn( "year", sr, 2, -1, wxALIGN_CENTRE, wxDATAVIEW_COL_SORTABLE ); - 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 ); @@ -669,17 +851,22 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): // MyList m_listCtrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, - wxDefaultSize, wxDV_MULTIPLE ); + wxDefaultSize, wxDV_MULTIPLE | wxDV_ROW_LINES); m_list_model = new MyListModel; m_listCtrl->AssociateModel( m_list_model.get() ); - - m_listCtrl->AppendTextColumn( "editable string", 0, wxDATAVIEW_CELL_EDITABLE, 120 ); - - m_col = new wxDataViewColumn( "icon", new wxDataViewIconTextRenderer, 1, 60 ); - m_listCtrl->AppendColumn( m_col ); - - m_col = m_listCtrl->AppendTextColumn( "index", 2, wxDATAVIEW_CELL_INERT, 120 ); + +#if 1 + m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 ); + 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; + wxDataViewColumn *column4 = new wxDataViewColumn(wxT("attributes"), ra, 2 ); + m_listCtrl->AppendColumn( column4 ); data_sizer->Add( m_listCtrl, 2, wxGROW ); @@ -689,24 +876,72 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h): wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); - button_sizer->Add( new wxButton( this, ID_ADD_MOZART, "Add Mozart"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( this, ID_DELETE_MUSIC, "Delete selected"), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( this, ID_ADD_MOZART, _("Add Mozart")), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( this, ID_DELETE_MUSIC,_("Delete selected")), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( this, ID_DELETE_YEAR, _("Delete \"Year\" column")), 0, wxALL, 10 ); button_sizer->Add( 10, 10, 1 ); - button_sizer->Add( new wxButton( this, ID_PREPEND_LIST, "Prepend"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( this, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( this, ID_GOTO, "Goto 50"), 0, wxALL, 10 ); + wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 2 ); + grid_sizer->Add( new wxButton( this, ID_PREPEND_LIST,_("Prepend")), 0, wxALL, 2 ); + grid_sizer->Add( new wxButton( this, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 2 ); + grid_sizer->Add( new wxButton( this, ID_GOTO, _("Goto 50")), 0, wxALL, 2 ); + grid_sizer->Add( new wxButton( this, ID_ADD_MANY, _("Add 1000")), 0, wxALL, 2 ); + button_sizer->Add( grid_sizer, 0, wxALL, 10 ); main_sizer->Add( button_sizer, 0, wxGROW, 0 ); + + wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL ); - m_log = new wxTextCtrl( this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); + m_log = new wxTextCtrl( this, -1, wxString(), wxDefaultPosition, wxSize(100,200), wxTE_MULTILINE ); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); - wxLogMessage("This is the log window"); + wxLogMessage(_("This is the log window")); - main_sizer->Add( m_log, 1, wxGROW ); + bottom_sizer->Add( m_log, 1, wxGROW ); + + // wxDataViewTreeStore + + wxDataViewCtrl *treectrl = new wxDataViewCtrl( this, -1, + wxDefaultPosition, wxSize(100,200), wxDV_NO_HEADER ); + + wxDataViewTreeStore *store = new wxDataViewTreeStore; + wxDataViewItem parent = store->AppendContainer( wxDataViewItem(0),wxT("Root 1"), wxIcon(small1_xpm) ); + wxDataViewItem child = store->AppendItem( parent,wxT("Child 1"), wxIcon(small1_xpm) ); + child = store->AppendItem( parent,wxT("Child 2"), wxIcon(small1_xpm) ); + child = store->AppendItem( parent,wxT("Child 3, very long, long, long, long"), wxIcon(small1_xpm) ); + treectrl->AssociateModel( store ); + store->DecRef(); + + treectrl->AppendIconTextColumn( wxT("no label"), 0, wxDATAVIEW_CELL_INERT, -1, (wxAlignment) 0, + wxDATAVIEW_COL_RESIZABLE ); + + bottom_sizer->Add( treectrl, 1 ); + + // wxDataViewTreeCtrl + + wxDataViewTreeCtrl *treectrl2 = new wxDataViewTreeCtrl( this, -1, wxDefaultPosition, wxSize(100,200) ); + + wxImageList *ilist = new wxImageList( 16, 16 ); + ilist->Add( wxIcon(small1_xpm) ); + treectrl2->SetImageList( ilist ); + + parent = treectrl2->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 ); + child = treectrl2->AppendItem( parent,wxT("Child 1"), 0 ); + child = treectrl2->AppendItem( parent,wxT("Child 2"), 0 ); + child = treectrl2->AppendItem( parent,wxT("Child 3, very long, long, long, long"), 0 ); + + bottom_sizer->Add( treectrl2, 1 ); + + // main sizer + + main_sizer->Add( bottom_sizer, 0, wxGROW ); SetSizer( main_sizer ); } +MyFrame::~MyFrame() +{ + delete wxLog::SetActiveTarget(m_logOld); +} + void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { Close(true); @@ -714,7 +949,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) ) { - m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", 1787 ); + m_music_model->AddToClassical( wxT("Kleine Nachtmusik"), wxT("Wolfgang Mozart"), 1787 ); } void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) ) @@ -726,34 +961,23 @@ void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) ) m_music_model->Delete( items[i] ); } +void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) ) +{ + m_musicCtrl->DeleteColumn( m_musicCtrl->GetColumn( 2 ) ); + FindWindow( ID_DELETE_YEAR )->Disable(); +} + void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) ) { - m_list_model->Prepend( "Test" ); + m_list_model->Prepend(wxT("Test")); } void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) ) { wxDataViewItemArray items; int len = m_listCtrl->GetSelections( items ); - for( int i = 0; i < len; i ++ ) - if (items[i].IsOk()) - m_list_model->DeleteItem( items[i] ); -} - -void MyFrame::OnItemAdded( wxDataViewEvent &event ) -{ - if (!m_log) - return; - - wxLogMessage("wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, Item Id: %d",event.GetItem().GetID()); -} - -void MyFrame::OnItemDeleted( wxDataViewEvent &event ) -{ - if (!m_log) - return; - - wxLogMessage( "EVT_DATAVIEW_MODEL_ITEM_DELETED, Item Id: %d", event.GetItem().GetID() ); + if (len > 0) + m_list_model->DeleteItems( items ); } void MyFrame::OnValueChanged( wxDataViewEvent &event ) @@ -761,7 +985,7 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage( "EVT_DATAVIEW_MODEL_VALUE_CHANGED, Item Id: %d; Column: %d", event.GetItem().GetID(), event.GetColumn() ); + wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d"), event.GetItem().GetID(), event.GetColumn() ); } void MyFrame::OnActivated( wxDataViewEvent &event ) @@ -769,15 +993,20 @@ void MyFrame::OnActivated( wxDataViewEvent &event ) if(!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item Id: %d; Column: %d", event.GetItem().GetID(), event.GetColumn()); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title.GetData()); } -void MyFrame::OnSelected( wxDataViewEvent &event ) +void MyFrame::OnSelectionChanged( wxDataViewEvent &event ) { if(!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + if (title.empty()) + title = wxT("None"); + + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s"), title.GetData() ); } void MyFrame::OnExpanding( wxDataViewEvent &event ) @@ -785,7 +1014,8 @@ void MyFrame::OnExpanding( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s"), title.GetData() ); } @@ -794,7 +1024,8 @@ void MyFrame::OnEditingStarted( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s"), title.GetData() ); } void MyFrame::OnEditingDone( wxDataViewEvent &event ) @@ -802,7 +1033,8 @@ void MyFrame::OnEditingDone( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s"), title.GetData() ); } void MyFrame::OnExpanded( wxDataViewEvent &event ) @@ -810,7 +1042,8 @@ void MyFrame::OnExpanded( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s"), title.GetData() ); } void MyFrame::OnCollapsing( wxDataViewEvent &event ) @@ -818,23 +1051,45 @@ void MyFrame::OnCollapsing( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item Id: %d", event.GetItem().GetID() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s"), title.GetData() ); } void MyFrame::OnCollapsed( wxDataViewEvent &event ) { if (!m_log) return; - - wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item Id: %d", event.GetItem().GetID() ); + + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s"),title.GetData()); +} + +void MyFrame::OnContextMenu( wxDataViewEvent &event ) +{ + if (!m_log) + return; + + 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 ) { if(!m_log) return; + + int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); - wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column: %d", event.GetColumn()); + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos ); } void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) @@ -842,7 +1097,9 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) if(!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column: %d", event.GetColumn()); + int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); + + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos ); } void MyFrame::OnSorted( wxDataViewEvent &event ) @@ -850,7 +1107,9 @@ void MyFrame::OnSorted( wxDataViewEvent &event ) if(!m_log) return; - wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column: %d", event.GetColumn()); + int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); + + wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos ); } void MyFrame::OnRightClick( wxMouseEvent &event ) @@ -858,15 +1117,21 @@ void MyFrame::OnRightClick( wxMouseEvent &event ) if(!m_log) return; - wxLogMessage("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d", event.GetX(), event.GetY()); + wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), event.GetX(), event.GetY()); } -void MyFrame::OnGoto( wxCommandEvent &event) +void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event)) { wxDataViewItem item = m_list_model->GetItem( 50 ); m_listCtrl->EnsureVisible(item,m_col); } +void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event)) +{ + m_list_model->AddMany(); +} + + void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { wxAboutDialogInfo info;