Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove wxT() and _() macros to make the sample more readable; add File->Clear log menuitem; re-add m_container flag in MyMusicTreeModelNode and describe in a TODO/FIXME item why it's needed; warn when selecting the ninth symphony is not possible

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-06 20:45:04 +00:00
parent fca0d8b506
commit ecad59d882
3 changed files with 160 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
samples/dataview/dataview.cpp
View File

@@ -76,6 +76,7 @@ public: // event handlers
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
void OnClearLog(wxCommandEvent& event);
void OnPageChanged(wxBookCtrlEvent& event); void OnPageChanged(wxBookCtrlEvent& event);
void OnAddMozart(wxCommandEvent& event); void OnAddMozart(wxCommandEvent& event);
@@ -210,7 +211,7 @@ bool MyApp::OnInit()
return false; return false;
MyFrame *frame = MyFrame *frame =
new MyFrame(NULL, wxT("wxDataViewCtrl sample"), 40, 40, 1000, 540); new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);
SetTopWindow(frame); SetTopWindow(frame);
frame->Show(true); frame->Show(true);
@@ -224,7 +225,8 @@ bool MyApp::OnInit()
enum enum
{ {
ID_STYLE_MENU = wxID_HIGHEST+1, ID_CLEARLOG = wxID_HIGHEST+1,
ID_STYLE_MENU,
// file menu // file menu
//ID_SINGLE, wxDV_SINGLE==0 so it's always present //ID_SINGLE, wxDV_SINGLE==0 so it's always present
@@ -260,6 +262,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU_RANGE( ID_MULTIPLE, ID_VERT_RULES, MyFrame::OnStyleChange ) EVT_MENU_RANGE( ID_MULTIPLE, ID_VERT_RULES, MyFrame::OnStyleChange )
EVT_MENU( ID_EXIT, MyFrame::OnQuit ) EVT_MENU( ID_EXIT, MyFrame::OnQuit )
EVT_MENU( ID_ABOUT, MyFrame::OnAbout ) EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
EVT_MENU( ID_CLEARLOG, MyFrame::OnClearLog )
EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged ) EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged )
@@ -318,23 +321,24 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
// ---------------- // ----------------
wxMenu *style_menu = new wxMenu; wxMenu *style_menu = new wxMenu;
//style_menu->AppendCheckItem(ID_SINGLE, wxT("Single selection")); //style_menu->AppendCheckItem(ID_SINGLE, "Single selection"));
style_menu->AppendCheckItem(ID_MULTIPLE, wxT("Multiple selection")); style_menu->AppendCheckItem(ID_MULTIPLE, "Multiple selection");
style_menu->AppendCheckItem(ID_ROW_LINES, wxT("Alternating colours")); style_menu->AppendCheckItem(ID_ROW_LINES, "Alternating colours");
style_menu->AppendCheckItem(ID_HORIZ_RULES, wxT("Display horizontal rules")); style_menu->AppendCheckItem(ID_HORIZ_RULES, "Display horizontal rules");
style_menu->AppendCheckItem(ID_VERT_RULES, wxT("Display vertical rules")); style_menu->AppendCheckItem(ID_VERT_RULES, "Display vertical rules");
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append(ID_STYLE_MENU, wxT("&Style"), style_menu); file_menu->Append(ID_CLEARLOG, "Clear log");
file_menu->Append(ID_STYLE_MENU, "&Style", style_menu);
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(ID_EXIT, wxT("E&xit")); file_menu->Append(ID_EXIT, "E&xit");
wxMenu *about_menu = new wxMenu; wxMenu *about_menu = new wxMenu;
about_menu->Append(ID_ABOUT, wxT("&About")); about_menu->Append(ID_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, wxT("&File")); menu_bar->Append(file_menu, "&File");
menu_bar->Append(about_menu, wxT("&About")); menu_bar->Append(about_menu, "&About");
SetMenuBar(menu_bar); SetMenuBar(menu_bar);
CreateStatusBar(); CreateStatusBar();
@@ -350,18 +354,18 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
BuildDataViewCtrl(firstPanel, 0); // sets m_ctrl[0] BuildDataViewCtrl(firstPanel, 0); // sets m_ctrl[0]
wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART, _("Add Mozart")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART, "Add Mozart"), 0, wxALL, 10 );
button_sizer->Add( new wxButton( firstPanel, ID_DELETE_MUSIC,_("Delete selected")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_DELETE_MUSIC,"Delete selected"), 0, wxALL, 10 );
button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, _("Delete \"Year\" column")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, "Delete \"Year\" column"), 0, wxALL, 10 );
button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,_("Select Ninth")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,"Select ninth symphony"), 0, wxALL, 10 );
button_sizer->Add( new wxButton( firstPanel, ID_COLLAPSE, _("Collapse")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_COLLAPSE, "Collapse"), 0, wxALL, 10 );
button_sizer->Add( new wxButton( firstPanel, ID_EXPAND, _("Expand")), 0, wxALL, 10 ); button_sizer->Add( new wxButton( firstPanel, ID_EXPAND, "Expand"), 0, wxALL, 10 );
wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL ); wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL );
m_ctrl[0]->SetMinSize(wxSize(-1, 200)); m_ctrl[0]->SetMinSize(wxSize(-1, 200));
firstPanelSz->Add(m_ctrl[0], 1, wxGROW|wxALL, 5); firstPanelSz->Add(m_ctrl[0], 1, wxGROW|wxALL, 5);
firstPanelSz->Add( firstPanelSz->Add(
new wxStaticText(firstPanel, wxID_ANY, wxT("Most of the cells above are editable!")), new wxStaticText(firstPanel, wxID_ANY, "Most of the cells above are editable!"),
0, wxGROW|wxALL, 5); 0, wxGROW|wxALL, 5);
firstPanelSz->Add(button_sizer); firstPanelSz->Add(button_sizer);
firstPanel->SetSizerAndFit(firstPanelSz); firstPanel->SetSizerAndFit(firstPanelSz);
@@ -375,10 +379,10 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
BuildDataViewCtrl(secondPanel, 1); // sets m_ctrl[1] BuildDataViewCtrl(secondPanel, 1); // sets m_ctrl[1]
wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL );
button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,_("Prepend")), 0, wxALL, 10 ); button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,"Prepend"), 0, wxALL, 10 );
button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 10 ); button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 );
button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, _("Goto 50")), 0, wxALL, 10 ); button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, "Goto 50"), 0, wxALL, 10 );
button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, _("Add 1000")), 0, wxALL, 10 ); button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, "Add 1000"), 0, wxALL, 10 );
wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL ); wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL );
secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5); secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5);
@@ -425,7 +429,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
wxDefaultSize, wxTE_MULTILINE ); wxDefaultSize, wxTE_MULTILINE );
m_log->SetMinSize(wxSize(-1, 100)); m_log->SetMinSize(wxSize(-1, 100));
m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
wxLogMessage(_("This is the log window")); wxLogMessage( "This is the log window" );
mainSizer->Add( m_notebook, 1, wxGROW ); mainSizer->Add( m_notebook, 1, wxGROW );
mainSizer->Add( m_log, 0, wxGROW ); mainSizer->Add( m_log, 0, wxGROW );
@@ -458,9 +462,9 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
// column 0 of the view control: // column 0 of the view control:
wxDataViewTextRenderer *tr = wxDataViewTextRenderer *tr =
new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT ); new wxDataViewTextRenderer( "string", wxDATAVIEW_CELL_INERT );
wxDataViewColumn *column0 = wxDataViewColumn *column0 =
new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT, new wxDataViewColumn( "title", tr, 0, 200, wxALIGN_LEFT,
wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE ); wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE );
m_ctrl[0]->AppendColumn( column0 ); m_ctrl[0]->AppendColumn( column0 );
#if 0 #if 0
@@ -471,9 +475,9 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
// column 1 of the view control: // column 1 of the view control:
tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); tr = new wxDataViewTextRenderer( "string", wxDATAVIEW_CELL_EDITABLE );
wxDataViewColumn *column1 = wxDataViewColumn *column1 =
new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT, new wxDataViewColumn( "artist", tr, 1, 150, wxALIGN_LEFT,
wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE |
wxDATAVIEW_COL_RESIZABLE ); wxDATAVIEW_COL_RESIZABLE );
column1->SetMinWidth(150); // this column can't be resized to be smaller column1->SetMinWidth(150); // this column can't be resized to be smaller
@@ -484,7 +488,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
wxDataViewSpinRenderer *sr = wxDataViewSpinRenderer *sr =
new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
wxDataViewColumn *column2 = wxDataViewColumn *column2 =
new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT, new wxDataViewColumn( "year", sr, 2, 60, wxALIGN_LEFT,
wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE ); wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
m_ctrl[0]->AppendColumn( column2 ); m_ctrl[0]->AppendColumn( column2 );
@@ -497,19 +501,19 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
wxDataViewChoiceRenderer *c = wxDataViewChoiceRenderer *c =
new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
wxDataViewColumn *column3 = wxDataViewColumn *column3 =
new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT, new wxDataViewColumn( "rating", c, 3, 100, wxALIGN_LEFT,
wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
m_ctrl[0]->AppendColumn( column3 ); m_ctrl[0]->AppendColumn( column3 );
// column 4 of the view control: // column 4 of the view control:
m_ctrl[0]->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 ); m_ctrl[0]->AppendProgressColumn( "popularity", 4, wxDATAVIEW_CELL_INERT, 80 );
// column 5 of the view control: // column 5 of the view control:
MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT ); MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT );
wxDataViewColumn *column5 = wxDataViewColumn *column5 =
new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT, new wxDataViewColumn( "custom", cr, 5, -1, wxALIGN_LEFT,
wxDATAVIEW_COL_RESIZABLE ); wxDATAVIEW_COL_RESIZABLE );
m_ctrl[0]->AppendColumn( column5 ); m_ctrl[0]->AppendColumn( column5 );
@@ -530,14 +534,14 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
// the various columns // the various columns
#if 1 #if 1
m_ctrl[1]->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 ); m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE, 120);
m_ctrl[1]->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") ); m_ctrl[1]->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( "icon");
#else #else
m_ctrl[1]->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE ); m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE);
m_ctrl[1]->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT ); m_ctrl[1]->AppendIconTextColumn("icon", 1, wxDATAVIEW_CELL_INERT);
#endif #endif
m_ctrl[1]->AppendColumn( m_ctrl[1]->AppendColumn(
new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 )); new wxDataViewColumn("attributes", new wxDataViewTextRendererAttr, 2 ));
} }
break; break;
@@ -549,9 +553,9 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
wxDefaultSize, style ); wxDefaultSize, style );
m_ctrl[2] = lc; m_ctrl[2] = lc;
lc->AppendToggleColumn( wxT("Toggle") ); lc->AppendToggleColumn( "Toggle" );
lc->AppendTextColumn( wxT("Text") ); lc->AppendTextColumn( "Text" );
lc->AppendProgressColumn( wxT("Progress") ); lc->AppendProgressColumn( "Progress" );
wxVector<wxVariant> data; wxVector<wxVariant> data;
for (unsigned int i=0; i<10; i++) for (unsigned int i=0; i<10; i++)
@@ -579,15 +583,15 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
tc->SetImageList( ilist ); tc->SetImageList( ilist );
wxDataViewItem parent = wxDataViewItem parent =
tc->AppendContainer( wxDataViewItem(0), wxT("The Root"), 0 ); tc->AppendContainer( wxDataViewItem(0), "The Root", 0 );
tc->AppendItem( parent, wxT("Child 1"), 0 ); tc->AppendItem( parent, "Child 1", 0 );
tc->AppendItem( parent, wxT("Child 2"), 0 ); tc->AppendItem( parent, "Child 2", 0 );
tc->AppendItem( parent, wxT("Child 3, very long, long, long, long"), 0 ); tc->AppendItem( parent, "Child 3, very long, long, long, long", 0 );
wxDataViewItem cont = wxDataViewItem cont =
tc->AppendContainer( parent, wxT("Container child"), 0 ); tc->AppendContainer( parent, "Container child", 0 );
tc->AppendItem( cont, wxT("Child 4"), 0 ); tc->AppendItem( cont, "Child 4", 0 );
tc->AppendItem( cont, wxT("Child 5"), 0 ); tc->AppendItem( cont, "Child 5", 0 );
tc->Expand(cont); tc->Expand(cont);
} }
@@ -600,6 +604,11 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
// MyFrame - generic event handlers // MyFrame - generic event handlers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void MyFrame::OnClearLog( wxCommandEvent& WXUNUSED(event) )
{
m_log->Clear();
}
void MyFrame::OnPageChanged( wxBookCtrlEvent& WXUNUSED(event) ) void MyFrame::OnPageChanged( wxBookCtrlEvent& WXUNUSED(event) )
{ {
unsigned int nPanel = m_notebook->GetSelection(); unsigned int nPanel = m_notebook->GetSelection();
@@ -742,12 +751,12 @@ void MyFrame::OnDrop( wxDataViewEvent &event )
wxTextDataObject obj; wxTextDataObject obj;
obj.SetData( wxDF_UNICODETEXT, event.GetDataSize(), event.GetDataBuffer() ); obj.SetData( wxDF_UNICODETEXT, event.GetDataSize(), event.GetDataBuffer() );
wxLogMessage(wxT("Text dropped: %s"), obj.GetText() ); wxLogMessage( "Text dropped: %s", obj.GetText() );
} }
void MyFrame::OnAddMozart( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAddMozart( wxCommandEvent& WXUNUSED(event) )
{ {
m_music_model->AddToClassical( wxT("Kleine Nachtmusik"), wxT("Wolfgang Mozart"), 1787 ); m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", 1787 );
} }
void MyFrame::OnDeleteMusic( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDeleteMusic( wxCommandEvent& WXUNUSED(event) )
@@ -767,6 +776,12 @@ void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnSelectNinth( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnSelectNinth( wxCommandEvent& WXUNUSED(event) )
{ {
if (!m_music_model->GetNinthItem().IsOk())
{
wxLogError( "Cannot select the ninth symphony: it was removed!" );
return;
}
m_ctrl[0]->Select( m_music_model->GetNinthItem() ); m_ctrl[0]->Select( m_music_model->GetNinthItem() );
} }
@@ -789,7 +804,7 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event )
if (!m_log) if (!m_log)
return; return;
wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d"), wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d",
event.GetItem().GetID(), event.GetColumn() ); event.GetItem().GetID(), event.GetColumn() );
} }
@@ -799,10 +814,10 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s", title );
if (m_ctrl[0]->IsExpanded( event.GetItem() )) if (m_ctrl[0]->IsExpanded( event.GetItem() ))
wxLogMessage(wxT("Item: %s is expanded"), title ); wxLogMessage( "Item: %s is expanded", title );
} }
void MyFrame::OnSelectionChanged( wxDataViewEvent &event ) void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
@@ -812,9 +827,9 @@ void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
if (title.empty()) if (title.empty())
title = wxT("None"); title = "None";
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s", title );
} }
void MyFrame::OnExpanding( wxDataViewEvent &event ) void MyFrame::OnExpanding( wxDataViewEvent &event )
@@ -823,7 +838,7 @@ void MyFrame::OnExpanding( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s", title );
} }
@@ -833,7 +848,7 @@ void MyFrame::OnEditingStarted( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );
} }
void MyFrame::OnEditingDone( wxDataViewEvent &event ) void MyFrame::OnEditingDone( wxDataViewEvent &event )
@@ -842,7 +857,7 @@ void MyFrame::OnEditingDone( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );
} }
void MyFrame::OnExpanded( wxDataViewEvent &event ) void MyFrame::OnExpanded( wxDataViewEvent &event )
@@ -851,7 +866,7 @@ void MyFrame::OnExpanded( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s", title );
} }
void MyFrame::OnCollapsing( wxDataViewEvent &event ) void MyFrame::OnCollapsing( wxDataViewEvent &event )
@@ -860,7 +875,7 @@ void MyFrame::OnCollapsing( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s"), title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s", title );
} }
void MyFrame::OnCollapsed( wxDataViewEvent &event ) void MyFrame::OnCollapsed( wxDataViewEvent &event )
@@ -869,7 +884,7 @@ void MyFrame::OnCollapsed( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s"),title); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s", title );
} }
void MyFrame::OnContextMenu( wxDataViewEvent &event ) void MyFrame::OnContextMenu( wxDataViewEvent &event )
@@ -878,17 +893,14 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event )
return; return;
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title );
wxMenu menu; wxMenu menu;
menu.Append( 1, wxT("entry 1") ); menu.Append( 1, "menuitem 1" );
menu.Append( 2, wxT("entry 2") ); menu.Append( 2, "menuitem 2" );
menu.Append( 3, wxT("entry 3") ); menu.Append( 3, "menuitem 3" );
m_ctrl[0]->PopupMenu(&menu); m_ctrl[0]->PopupMenu(&menu);
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),
title.GetData(), event.GetValue().GetString());
} }
void MyFrame::OnHeaderClick( wxDataViewEvent &event ) void MyFrame::OnHeaderClick( wxDataViewEvent &event )
@@ -902,7 +914,7 @@ void MyFrame::OnHeaderClick( wxDataViewEvent &event )
int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );
} }
void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
@@ -912,7 +924,7 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );
} }
void MyFrame::OnSorted( wxDataViewEvent &event ) void MyFrame::OnSorted( wxDataViewEvent &event )
@@ -922,7 +934,7 @@ void MyFrame::OnSorted( wxDataViewEvent &event )
int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d", pos );
} }
void MyFrame::OnRightClick( wxMouseEvent &event ) void MyFrame::OnRightClick( wxMouseEvent &event )
@@ -930,7 +942,7 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
if(!m_log) if(!m_log)
return; return;
wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), wxLogMessage( "wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d",
event.GetX(), event.GetY() ); event.GetX(), event.GetY() );
} }
@@ -941,7 +953,7 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
{ {
m_list_model->Prepend(wxT("Test")); m_list_model->Prepend("Test");
} }
void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )

40
samples/dataview/mymodels.cpp
View File

@@ -38,23 +38,23 @@
MyMusicTreeModel::MyMusicTreeModel() MyMusicTreeModel::MyMusicTreeModel()
{ {
m_root = new MyMusicTreeModelNode( NULL, wxT("My Music" )); m_root = new MyMusicTreeModelNode( NULL, "My Music" );
// setup pop music // setup pop music
m_pop = new MyMusicTreeModelNode( m_root, wxT("Pop music") ); m_pop = new MyMusicTreeModelNode( m_root, "Pop music" );
m_pop->Append( m_pop->Append(
new MyMusicTreeModelNode( m_pop, wxT("You are not alone"), wxT("Michael Jackson"), 1995 ) ); new MyMusicTreeModelNode( m_pop, "You are not alone"), "Michael Jackson", 1995 ) );
m_pop->Append( m_pop->Append(
new MyMusicTreeModelNode( m_pop, wxT("Take a bow"), wxT("Madonna"), 1994 ) ); new MyMusicTreeModelNode( m_pop, "Take a bow", "Madonna", 1994 ) );
m_root->Append( m_pop ); m_root->Append( m_pop );
// setup classical music // setup classical music
m_classical = new MyMusicTreeModelNode( m_root, wxT("Classical music") ); m_classical = new MyMusicTreeModelNode( m_root, "Classical music" );
m_ninth = new MyMusicTreeModelNode( m_classical, wxT("Ninth symphony"), m_ninth = new MyMusicTreeModelNode( m_classical, "Ninth symphony",
wxT("Ludwig van Beethoven"), 1824 ); "Ludwig van Beethoven", 1824 );
m_classical->Append( m_ninth ); m_classical->Append( m_ninth );
m_classical->Append( new MyMusicTreeModelNode( m_classical, wxT("German Requiem"), m_classical->Append( new MyMusicTreeModelNode( m_classical, "German Requiem",
wxT("Johannes Brahms"), 1868 ) ); "Johannes Brahms", 1868 ) );
m_root->Append( m_classical ); m_root->Append( m_classical );
m_classicalMusicIsKnownToControl = false; m_classicalMusicIsKnownToControl = false;
@@ -86,8 +86,13 @@ void MyMusicTreeModel::AddToClassical( const wxString &title, const wxString &ar
wxASSERT(m_root); wxASSERT(m_root);
// it was removed: restore it // it was removed: restore it
m_classical = new MyMusicTreeModelNode( m_root, wxT("Classical music") ); m_classical = new MyMusicTreeModelNode( m_root, "Classical music" );
m_root->Append( m_classical ); m_root->Append( m_classical );
// notify control
wxDataViewItem child( (void*) m_classical );
wxDataViewItem parent( (void*) m_root );
ItemAdded( parent, child );
} }
// add to the classical music node a new node: // add to the classical music node a new node:
@@ -95,6 +100,7 @@ void MyMusicTreeModel::AddToClassical( const wxString &title, const wxString &ar
new MyMusicTreeModelNode( m_classical, title, artist, year ); new MyMusicTreeModelNode( m_classical, title, artist, year );
m_classical->Append( child_node ); m_classical->Append( child_node );
// FIXME: what's m_classicalMusicIsKnownToControl for?
if (m_classicalMusicIsKnownToControl) if (m_classicalMusicIsKnownToControl)
{ {
// notify control // notify control
@@ -203,7 +209,7 @@ void MyMusicTreeModel::GetValue( wxVariant &variant,
break; break;
default: default:
wxLogError( wxT("MyMusicTreeModel::GetValue: wrong column %d"), col ); wxLogError( "MyMusicTreeModel::GetValue: wrong column %d", col );
} }
} }
@@ -229,7 +235,7 @@ bool MyMusicTreeModel::SetValue( const wxVariant &variant,
return true; return true;
default: default:
wxLogError( wxT("MyMusicTreeModel::SetValue: wrong column") ); wxLogError( "MyMusicTreeModel::SetValue: wrong column" );
} }
return false; return false;
} }
@@ -323,7 +329,7 @@ MyListModel::MyListModel() :
for (unsigned int i = 0; i < 100; i++) for (unsigned int i = 0; i < 100; i++)
{ {
wxString str; wxString str;
str.Printf( wxT("real row %d"), i ); str.Printf( "real row %d"), i );
m_array.Add( str ); m_array.Add( str );
} }
@@ -392,21 +398,21 @@ void MyListModel::GetValueByRow( wxVariant &variant,
if (col==0) if (col==0)
{ {
if (row >= m_array.GetCount()) if (row >= m_array.GetCount())
variant = wxString::Format( wxT("virtual row %d"), row ); variant = wxString::Format( "virtual row %d", row );
else else
variant = m_array[ row ]; variant = m_array[ row ];
} }
else if (col==1) else if (col==1)
{ {
wxDataViewIconText data( wxT("test"), m_icon[ row%2 ] ); wxDataViewIconText data( "test", m_icon[ row%2 ] );
variant << data; variant << data;
} }
else if (col==2) else if (col==2)
{ {
if (row >= m_array.GetCount()) if (row >= m_array.GetCount())
variant = wxT("plain"); variant = "plain";
else else
variant = wxT("blue/green/red"); variant = "blue/green/red";
} }
} }

17
samples/dataview/mymodels.h
View File

@@ -30,6 +30,8 @@ public:
m_artist = artist; m_artist = artist;
m_year = year; m_year = year;
m_quality = "good"; m_quality = "good";
m_container = false;
} }
MyMusicTreeModelNode( MyMusicTreeModelNode* parent, MyMusicTreeModelNode( MyMusicTreeModelNode* parent,
@@ -39,6 +41,8 @@ public:
m_title = branch; m_title = branch;
m_year = -1; m_year = -1;
m_container = true;
} }
~MyMusicTreeModelNode() ~MyMusicTreeModelNode()
@@ -53,7 +57,7 @@ public:
} }
bool IsContainer() const bool IsContainer() const
{ return m_children.GetCount()>0; } { return m_container; }
MyMusicTreeModelNode* GetParent() MyMusicTreeModelNode* GetParent()
{ return m_parent; } { return m_parent; }
@@ -74,6 +78,17 @@ public: // public to avoid getters/setters
int m_year; int m_year;
wxString m_quality; wxString m_quality;
// TODO/FIXME:
// the GTK version of wxDVC (in particular wxDataViewCtrlInternal::ItemAdded)
// needs to know in advance if a node is or _will be_ a container.
// Thus implementing:
// bool IsContainer() const
// { return m_children.GetCount()>0; }
// doesn't work with wxGTK when MyMusicTreeModel::AddToClassical is called
// AND the classical node was removed (a new node temporary without children
// would be added to the control)
bool m_container;
private: private:
MyMusicTreeModelNode *m_parent; MyMusicTreeModelNode *m_parent;
MyMusicTreeModelNodePtrArray m_children; MyMusicTreeModelNodePtrArray m_children;