all code revisited.

Main additions: - now it's possible to change the DVC style dynamically - make models more robust against deleting items, and against other allowed user actions - comment portions of the code to make it more didactive git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-04 22:33:18 +00:00
parent 14f73cf1da
commit 81c3f0fce3
3 changed files with 632 additions and 378 deletions
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -66,10 +66,18 @@ public:
    MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h);
    ~MyFrame();

-public:
+    void BuildDataViewCtrl(wxPanel* parent, 
+                           unsigned int nPanel, 
+                           unsigned long style = 0);
+
+public:     // event handlers
+
+    void OnStyleChange(wxCommandEvent& event);
    void OnQuit(wxCommandEvent& event);
    void OnAbout(wxCommandEvent& event);

+    void OnPageChanged(wxBookCtrlEvent& event);
+
    void OnAddMozart(wxCommandEvent& event);
    void OnDeleteMusic(wxCommandEvent& event);
    void OnDeleteYear(wxCommandEvent& event);
@@ -109,15 +117,13 @@ private:

    // the controls stored in the various tabs of the main notebook:

-    wxDataViewCtrl* m_myMusicModelViewCtrl;
+    wxDataViewCtrl* m_ctrl[4];
+
+    // the models associated with the first two DVC:
+
    wxObjectDataPtr<MyMusicTreeModel> m_music_model;
-
-    wxDataViewCtrl* m_myListModelViewCtrl;
    wxObjectDataPtr<MyListModel> m_list_model;

-    wxDataViewListCtrl* m_listctrl;
-    wxDataViewTreeCtrl* m_treectrl;
-
    // other data:

    wxDataViewColumn* m_col;
@@ -145,17 +151,16 @@ public:
    {
        dc->SetBrush( *wxRED_BRUSH );
        dc->SetPen( *wxTRANSPARENT_PEN );
-        dc->DrawRectangle( rect );
+        dc->DrawRectangle( rect.Deflate(2) );
        return true;
    }

-
    virtual bool Activate( wxRect WXUNUSED(cell),
                           wxDataViewModel *WXUNUSED(model), 
                           const wxDataViewItem &WXUNUSED(item), 
                           unsigned int WXUNUSED(col) )
    {
-        wxLogMessage( wxT("MyCustomRenderer Activate()") );
+        wxLogMessage( "MyCustomRenderer Activate()" );
        return false;
    }

@@ -164,7 +169,7 @@ public:
                           const wxDataViewItem &WXUNUSED(item), 
                           unsigned int WXUNUSED(col) )
    {
-        wxLogMessage( wxT("MyCustomRenderer LeftClick( %d, %d )"), cursor.x, cursor.y );
+        wxLogMessage( "MyCustomRenderer LeftClick( %d, %d )", cursor.x, cursor.y );
        return false;
    }

@@ -217,10 +222,23 @@ bool MyApp::OnInit()

 enum
 {
+    ID_STYLE_MENU = wxID_HIGHEST+1,
+
    // file menu
-    ID_ABOUT = wxID_ABOUT,
+    //ID_SINGLE,        wxDV_SINGLE==0 so it's always present
+    ID_MULTIPLE,
+    ID_ROW_LINES,
+    ID_HORIZ_RULES,
+    ID_VERT_RULES,
+
    ID_EXIT = wxID_EXIT,

+    // about menu
+    ID_ABOUT = wxID_ABOUT,
+
+
+    // control IDs
+
    ID_MUSIC_CTRL       = 50,

    ID_ADD_MOZART       = 100,
@@ -235,8 +253,12 @@ enum
 };

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
+    EVT_MENU_RANGE( ID_MULTIPLE, ID_VERT_RULES, MyFrame::OnStyleChange )
    EVT_MENU( ID_EXIT, MyFrame::OnQuit )
+    EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
+
+    EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged )
+
    EVT_BUTTON( ID_ADD_MOZART, MyFrame::OnAddMozart )
    EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic )
    EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear )
@@ -277,19 +299,35 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
    m_log = NULL;
    m_col = NULL;

+    m_ctrl[0] = NULL;
+    m_ctrl[1] = NULL;
+    m_ctrl[2] = NULL;
+    m_ctrl[3] = NULL;
+
    SetIcon(wxICON(sample));


    // build the menus
    // ----------------

+    wxMenu *style_menu = new wxMenu;
+    //style_menu->AppendCheckItem(ID_SINGLE, wxT("Single selection"));
+    style_menu->AppendCheckItem(ID_MULTIPLE, wxT("Multiple selection"));
+    style_menu->AppendCheckItem(ID_ROW_LINES, wxT("Alternating colours"));
+    style_menu->AppendCheckItem(ID_HORIZ_RULES, wxT("Display horizontal rules"));
+    style_menu->AppendCheckItem(ID_VERT_RULES, wxT("Display vertical rules"));
+
    wxMenu *file_menu = new wxMenu;
-    file_menu->Append(ID_ABOUT, wxT("&About"));
+    file_menu->Append(ID_STYLE_MENU, wxT("&Style"), style_menu);
    file_menu->AppendSeparator();
    file_menu->Append(ID_EXIT, wxT("E&xit"));

+    wxMenu *about_menu = new wxMenu;
+    about_menu->Append(ID_ABOUT, wxT("&About"));
+
    wxMenuBar *menu_bar = new wxMenuBar;
    menu_bar->Append(file_menu, wxT("&File"));
+    menu_bar->Append(about_menu, wxT("&About"));

    SetMenuBar(menu_bar);
    CreateStatusBar();
@@ -301,75 +339,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
    m_notebook = new wxNotebook( this, wxID_ANY );

    wxPanel *firstPanel = new wxPanel( m_notebook, wxID_ANY );
-    m_myMusicModelViewCtrl = 
-        new wxDataViewCtrl( firstPanel, ID_MUSIC_CTRL, wxDefaultPosition,
-                            wxDefaultSize, wxDV_MULTIPLE|wxDV_VARIABLE_LINE_HEIGHT );

-    m_music_model = new MyMusicTreeModel;
-    m_myMusicModelViewCtrl->AssociateModel( m_music_model.get() );
-
-    m_myMusicModelViewCtrl->EnableDragSource( wxDF_UNICODETEXT );
-    m_myMusicModelViewCtrl->EnableDropTarget( wxDF_UNICODETEXT );
-
-    // column 0 of the view control:
-
-    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_RESIZABLE );
-    m_myMusicModelViewCtrl->AppendColumn( column0 );
-#if 0
-    // Call this and sorting is enabled
-    // immediatly upon start up.
-    column0->SetAsSortKey();
-#endif
-
-    // column 1 of the view control:
-
-    tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    wxDataViewColumn *column1 = 
-        new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT,
-                              wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | 
-                              wxDATAVIEW_COL_RESIZABLE );
-    column1->SetMinWidth(150); // this column can't be resized to be smaller
-    m_myMusicModelViewCtrl->AppendColumn( column1 );
-
-    // column 2 of the view control:
-
-    wxDataViewSpinRenderer *sr = 
-        new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
-    wxDataViewColumn *column2 = 
-        new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT,
-                              wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
-    m_myMusicModelViewCtrl->AppendColumn( column2 );
-
-    // column 3 of the view control:
-
-    wxArrayString choices;
-    choices.Add( "good" );
-    choices.Add( "bad" );
-    choices.Add( "lousy" );
-    wxDataViewChoiceRenderer *c = 
-        new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
-    wxDataViewColumn *column3 = 
-        new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT,
-                              wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
-    m_myMusicModelViewCtrl->AppendColumn( column3 );
-
-    // column 4 of the view control:
-
-    m_myMusicModelViewCtrl->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 );
-
-    // column 5 of the view control:
-
-    MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT );
-    wxDataViewColumn *column5 = 
-        new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT,
-                              wxDATAVIEW_COL_RESIZABLE );
-    m_myMusicModelViewCtrl->AppendColumn( column5 );
-
-    // complete this page:
+    BuildDataViewCtrl(firstPanel, 0);    // sets m_ctrl[0]

    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
    button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART,  _("Add Mozart")),             0, wxALL, 10 );
@@ -378,8 +349,11 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
    button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,_("Select Ninth")),           0, wxALL, 10 );

    wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL );
-    m_myMusicModelViewCtrl->SetMinSize(wxSize(-1, 200));
-    firstPanelSz->Add(m_myMusicModelViewCtrl, 1, wxGROW|wxALL, 5);
+    m_ctrl[0]->SetMinSize(wxSize(-1, 200));
+    firstPanelSz->Add(m_ctrl[0], 1, wxGROW|wxALL, 5);
+    firstPanelSz->Add(
+        new wxStaticText(firstPanel, wxID_ANY, wxT("Most of the cells above are editable!")), 
+        0, wxGROW|wxALL, 5);
    firstPanelSz->Add(button_sizer);
    firstPanel->SetSizerAndFit(firstPanelSz);

@@ -389,24 +363,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int

    wxPanel *secondPanel = new wxPanel( m_notebook, wxID_ANY );

-    m_myListModelViewCtrl = new wxDataViewCtrl( secondPanel, wxID_ANY, wxDefaultPosition,
-                                                wxDefaultSize, wxDV_MULTIPLE | wxDV_ROW_LINES);
-
-    m_list_model = new MyListModel;
-    m_myListModelViewCtrl->AssociateModel( m_list_model.get() );
-
-    // the various columns
-#if 1
-    m_myListModelViewCtrl->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 );
-    m_myListModelViewCtrl->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") );
-#else
-    m_myListModelViewCtrl->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE );
-    m_myListModelViewCtrl->AppendIconTextColumn(wxT("icon"),            1, wxDATAVIEW_CELL_INERT );
-#endif
-    m_myListModelViewCtrl->AppendColumn(
-        new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 ));
-
-    // complete this page:
+    BuildDataViewCtrl(secondPanel, 1);    // sets m_ctrl[1]

    wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL );
    button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,_("Prepend")),         0, wxALL, 10 );
@@ -415,35 +372,20 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
    button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY,    _("Add 1000")),        0, wxALL, 10 );

    wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL );
-    secondPanelSz->Add(m_myListModelViewCtrl, 1, wxGROW|wxALL, 5);
+    secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5);
    secondPanelSz->Add(button_sizer2);
    secondPanel->SetSizerAndFit(secondPanelSz);


-
    // third page of the notebook
    // ---------------------------

    wxPanel *thirdPanel = new wxPanel( m_notebook, wxID_ANY );

-    m_listctrl = new wxDataViewListCtrl( thirdPanel, wxID_ANY );
-    m_listctrl->AppendToggleColumn( wxT("Toggle") );
-    m_listctrl->AppendTextColumn( wxT("Text") );
-
-    wxVector<wxVariant> data;
-    data.push_back( true );
-    data.push_back( "row 1" );
-    m_listctrl->AppendItem( data );
-
-    data.clear();
-    data.push_back( false );
-    data.push_back( "row 3" );
-    m_listctrl->AppendItem( data );
-
-    // complete this page:
+    BuildDataViewCtrl(thirdPanel, 2);    // sets m_ctrl[2]

    wxSizer *thirdPanelSz = new wxBoxSizer( wxVERTICAL );
-    thirdPanelSz->Add(m_listctrl, 1, wxGROW|wxALL, 5);
+    thirdPanelSz->Add(m_ctrl[2], 1, wxGROW|wxALL, 5);
    thirdPanel->SetSizerAndFit(thirdPanelSz);


@@ -452,21 +394,10 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
    
    wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY );

-    m_treectrl = new wxDataViewTreeCtrl( fourthPanel, wxID_ANY );
-
-    wxImageList *ilist = new wxImageList( 16, 16 );
-    ilist->Add( wxIcon(wx_small_xpm) );
-    m_treectrl->SetImageList( ilist );
-
-    wxDataViewItem parent2 = m_treectrl->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 );
-    m_treectrl->AppendItem( parent2, wxT("Child 1"), 0 );
-    m_treectrl->AppendItem( parent2, wxT("Child 2"), 0 );
-    m_treectrl->AppendItem( parent2, wxT("Child 3, very long, long, long, long"), 0 );
-
-    // complete this page:
+    BuildDataViewCtrl(fourthPanel, 3);    // sets m_ctrl[3]

    wxSizer *fourthPanelSz = new wxBoxSizer( wxVERTICAL );
-    fourthPanelSz->Add(m_treectrl, 1, wxGROW|wxALL, 5);
+    fourthPanelSz->Add(m_ctrl[3], 1, wxGROW|wxALL, 5);
    fourthPanel->SetSizerAndFit(fourthPanelSz);


@@ -498,20 +429,322 @@ MyFrame::~MyFrame()
    delete wxLog::SetActiveTarget(m_logOld);
 }

-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned long style)
+{
+    switch (nPanel)
+    {
+    case 0:
+        {
+            wxASSERT(!m_ctrl[0] && !m_music_model);
+            m_ctrl[0] = 
+                new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition,
+                                    wxDefaultSize, style );
+
+            m_music_model = new MyMusicTreeModel;
+            m_ctrl[0]->AssociateModel( m_music_model.get() );
+
+            m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT );
+            m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT );
+
+            // column 0 of the view control:
+
+            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_RESIZABLE );
+            m_ctrl[0]->AppendColumn( column0 );
+#if 0
+            // Call this and sorting is enabled
+            // immediatly upon start up.
+            column0->SetAsSortKey();
+#endif
+
+            // column 1 of the view control:
+
+            tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+            wxDataViewColumn *column1 = 
+                new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT,
+                                      wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | 
+                                      wxDATAVIEW_COL_RESIZABLE );
+            column1->SetMinWidth(150); // this column can't be resized to be smaller
+            m_ctrl[0]->AppendColumn( column1 );
+
+            // column 2 of the view control:
+
+            wxDataViewSpinRenderer *sr = 
+                new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
+            wxDataViewColumn *column2 = 
+                new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT,
+                                      wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
+            m_ctrl[0]->AppendColumn( column2 );
+
+            // column 3 of the view control:
+
+            wxArrayString choices;
+            choices.Add( "good" );
+            choices.Add( "bad" );
+            choices.Add( "lousy" );
+            wxDataViewChoiceRenderer *c = 
+                new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
+            wxDataViewColumn *column3 = 
+                new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT,
+                                      wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
+            m_ctrl[0]->AppendColumn( column3 );
+
+            // column 4 of the view control:
+
+            m_ctrl[0]->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 );
+
+            // column 5 of the view control:
+
+            MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT );
+            wxDataViewColumn *column5 = 
+                new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT,
+                                      wxDATAVIEW_COL_RESIZABLE );
+            m_ctrl[0]->AppendColumn( column5 );
+            
+
+            // select initially the ninth symphony:
+            m_ctrl[0]->Select(m_music_model->GetNinthItem());
+        }
+        break;
+
+    case 1:
+        {
+            wxASSERT(!m_ctrl[1] && !m_list_model);
+            m_ctrl[1] = new wxDataViewCtrl( parent, wxID_ANY, wxDefaultPosition,
+                                            wxDefaultSize, style );
+
+            m_list_model = new MyListModel;
+            m_ctrl[1]->AssociateModel( m_list_model.get() );
+
+            // the various columns
+#if 1
+            m_ctrl[1]->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 );
+            m_ctrl[1]->AppendIconTextColumn(wxIcon(wx_small_xpm),   1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") );
+#else
+            m_ctrl[1]->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE );
+            m_ctrl[1]->AppendIconTextColumn(wxT("icon"),            1, wxDATAVIEW_CELL_INERT );
+#endif
+            m_ctrl[1]->AppendColumn(
+                new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 ));
+        }
+        break;
+
+    case 2:
+        {
+            wxASSERT(!m_ctrl[2]);
+            wxDataViewListCtrl* lc = 
+                new wxDataViewListCtrl( parent, wxID_ANY, wxDefaultPosition,
+                                        wxDefaultSize, style );
+            m_ctrl[2] = lc;
+
+            lc->AppendToggleColumn( wxT("Toggle") );
+            lc->AppendTextColumn( wxT("Text") );
+            lc->AppendProgressColumn( wxT("Progress") );
+
+            wxVector<wxVariant> data;
+            for (unsigned int i=0; i<10; i++)
+            {
+                data.clear();
+                data.push_back( (i%3) == 0 );
+                data.push_back( wxString::Format("row %d", i) );
+                data.push_back( long(5*i) );
+
+                lc->AppendItem( data );
+            }
+        }
+        break;
+
+    case 3:
+        {
+            wxASSERT(!m_ctrl[3]);
+            wxDataViewTreeCtrl* tc = 
+                new wxDataViewTreeCtrl( parent, wxID_ANY, wxDefaultPosition,
+                                        wxDefaultSize, style );
+            m_ctrl[3] = tc;
+
+            wxImageList *ilist = new wxImageList( 16, 16 );
+            ilist->Add( wxIcon(wx_small_xpm) );
+            tc->SetImageList( ilist );
+
+            wxDataViewItem parent = 
+                tc->AppendContainer( wxDataViewItem(0), wxT("The Root"), 0 );
+            tc->AppendItem( parent, wxT("Child 1"), 0 );
+            tc->AppendItem( parent, wxT("Child 2"), 0 );
+            tc->AppendItem( parent, wxT("Child 3, very long, long, long, long"), 0 );
+
+            wxDataViewItem cont =
+                tc->AppendContainer( parent, wxT("Container child"), 0 );
+            tc->AppendItem( cont, wxT("Child 4"), 0 );
+            tc->AppendItem( cont, wxT("Child 5"), 0 );
+
+            tc->Expand(cont);
+        } 
+        break;
+    }
+}
+
+
+// ----------------------------------------------------------------------------
+// MyFrame - generic event handlers
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnPageChanged(wxBookCtrlEvent& WXUNUSED(event) )
+{
+    unsigned int nPanel = m_notebook->GetSelection();
+
+    GetMenuBar()->FindItem(ID_STYLE_MENU)->SetItemLabel(
+                wxString::Format("Style of panel #%d", nPanel+1));
+
+    for (unsigned int id = ID_MULTIPLE; id <= ID_VERT_RULES; id++)
+    {
+        unsigned long style = 0;
+        switch (id)
+        {
+        /*case ID_SINGLE:
+            style = wxDV_SINGLE;
+            break;*/
+        case ID_MULTIPLE:
+            style = wxDV_MULTIPLE;
+            break;
+        case ID_ROW_LINES:
+            style = wxDV_ROW_LINES;
+            break;
+        case ID_HORIZ_RULES:
+            style = wxDV_HORIZ_RULES;
+            break;
+        case ID_VERT_RULES:
+            style = wxDV_VERT_RULES;
+            break;
+        default:
+            wxFAIL;
+        }
+
+        GetMenuBar()->FindItem(id)->Check( m_ctrl[nPanel]->HasFlag(style) );
+    }
+}
+
+void MyFrame::OnStyleChange(wxCommandEvent& WXUNUSED(event) )
+{
+    unsigned int nPanel = m_notebook->GetSelection();
+
+    // build the style
+    unsigned long style = 0;
+    /*if (GetMenuBar()->FindItem(ID_SINGLE)->IsChecked())
+        style |= wxDV_SINGLE;*/
+    if (GetMenuBar()->FindItem(ID_MULTIPLE)->IsChecked())
+        style |= wxDV_MULTIPLE;
+    if (GetMenuBar()->FindItem(ID_ROW_LINES)->IsChecked())
+        style |= wxDV_ROW_LINES;
+    if (GetMenuBar()->FindItem(ID_HORIZ_RULES)->IsChecked())
+        style |= wxDV_HORIZ_RULES;
+    if (GetMenuBar()->FindItem(ID_VERT_RULES)->IsChecked())
+        style |= wxDV_VERT_RULES;
+
+    wxSizer* sz = m_ctrl[nPanel]->GetContainingSizer();
+    wxASSERT(sz);
+
+    sz->Detach(m_ctrl[nPanel]);
+    wxDELETE(m_ctrl[nPanel]);
+    m_ctrl[nPanel] = NULL;
+
+    if (nPanel == 0)
+        m_music_model.reset(NULL);
+    else if (nPanel == 1)
+        m_list_model.reset(NULL);
+
+    // rebuild the DVC for the selected panel:
+    BuildDataViewCtrl((wxPanel*)m_notebook->GetPage(nPanel), nPanel, style);
+
+    sz->Prepend(m_ctrl[nPanel], 1, wxGROW|wxALL, 5);
+    sz->Layout();
+}
+
+void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
    Close(true);
 }

-void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+{
+    wxAboutDialogInfo info;
+    info.SetName(_("DataView sample"));
+    info.SetDescription(_("This sample demonstrates wxDataViewCtrl"));
+    info.SetCopyright(_T("(C) 2007-2009 Robert Roebling"));
+    info.AddDeveloper("Robert Roebling");
+    info.AddDeveloper("Francesco Montorsi");
+
+    wxAboutBox(info);
+}
+
+
+// ----------------------------------------------------------------------------
+// MyFrame - event handlers for the first page
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnBeginDrag( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drags for item, not containers
+    if (m_music_model->IsContainer( item ) )
+    {
+        event.Veto();
+        return;
+    }
+
+    MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID();
+    wxTextDataObject *obj = new wxTextDataObject;
+    obj->SetText( node->m_title );
+    event.SetDataObject( obj );
+}
+
+void MyFrame::OnDropPossible( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drags for item, not containers
+    if (m_music_model->IsContainer( item ) )
+        event.Veto();
+
+    if (event.GetDataFormat() != wxDF_UNICODETEXT)
+        event.Veto();
+}
+
+void MyFrame::OnDrop( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drops for item, not containers
+    if (m_music_model->IsContainer( item ) )
+    {
+        event.Veto();
+        return;
+    }
+
+    if (event.GetDataFormat() != wxDF_UNICODETEXT)
+    {
+        event.Veto();
+        return;
+    }
+
+    wxTextDataObject obj;
+    obj.SetData( wxDF_UNICODETEXT, event.GetDataSize(), event.GetDataBuffer() );
+
+    wxLogMessage(wxT("Text dropped: %s"), obj.GetText() );
+}
+
+void MyFrame::OnAddMozart( wxCommandEvent& WXUNUSED(event) )
 {
    m_music_model->AddToClassical( wxT("Kleine Nachtmusik"), wxT("Wolfgang Mozart"), 1787 );
 }

-void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnDeleteMusic( wxCommandEvent& WXUNUSED(event) )
 {
    wxDataViewItemArray items;
-    int len = m_myMusicModelViewCtrl->GetSelections( items );
+    int len = m_ctrl[0]->GetSelections( items );
    for( int i = 0; i < len; i ++ )
        if (items[i].IsOk())
            m_music_model->Delete( items[i] );
@@ -519,26 +752,13 @@ void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) )
 {
-    m_myMusicModelViewCtrl->DeleteColumn( m_myMusicModelViewCtrl->GetColumn( 2 ) );
+    m_ctrl[0]->DeleteColumn( m_ctrl[0]->GetColumn( 2 ) );
    FindWindow( ID_DELETE_YEAR )->Disable();
 }

 void MyFrame::OnSelectNinth( wxCommandEvent& WXUNUSED(event) )
 {
-    m_myMusicModelViewCtrl->Select( m_music_model->GetNinthItem() );
-}
-
-void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
-{
-    m_list_model->Prepend(wxT("Test"));
-}
-
-void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
-{
-    wxDataViewItemArray items;
-    int len = m_myListModelViewCtrl->GetSelections( items );
-    if (len > 0)
-        m_list_model->DeleteItems( items );
+    m_ctrl[0]->Select( m_music_model->GetNinthItem() );
 }

 void MyFrame::OnValueChanged( wxDataViewEvent &event )
@@ -558,7 +778,7 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
    wxString title = m_music_model->GetTitle( event.GetItem() );
    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title );

-    if (m_myMusicModelViewCtrl->IsExpanded( event.GetItem() ))
+    if (m_ctrl[0]->IsExpanded( event.GetItem() ))
        wxLogMessage(wxT("Item: %s is expanded"), title );
 }

@@ -642,10 +862,10 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event )
    menu.Append( 2, wxT("entry 2") );
    menu.Append( 3, wxT("entry 3") );

-    m_myMusicModelViewCtrl->PopupMenu(&menu);
+    m_ctrl[0]->PopupMenu(&menu);

-//    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),
-//                 title.GetData(), event.GetValue().GetString());
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),
+                 title.GetData(), event.GetValue().GetString());
 }

 void MyFrame::OnHeaderClick( wxDataViewEvent &event )
@@ -654,10 +874,10 @@ void MyFrame::OnHeaderClick( wxDataViewEvent &event )
    // this column when it is clicked to take place
    event.Skip();

-    if(!m_log)
+    if (!m_log)
        return;

-    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+    int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );

    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos );
 }
@@ -667,7 +887,7 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
    if(!m_log)
        return;

-    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+    int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );

    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos );
 }
@@ -677,7 +897,7 @@ void MyFrame::OnSorted( wxDataViewEvent &event )
    if(!m_log)
        return;

-    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+    int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );

    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos );
 }
@@ -691,10 +911,28 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
                 event.GetX(), event.GetY());
 }

+
+// ----------------------------------------------------------------------------
+// MyFrame - event handlers for the second page
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
+{
+    m_list_model->Prepend(wxT("Test"));
+}
+
+void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
+{
+    wxDataViewItemArray items;
+    int len = m_ctrl[1]->GetSelections( items );
+    if (len > 0)
+        m_list_model->DeleteItems( items );
+}
+
 void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event))
 {
    wxDataViewItem item = m_list_model->GetItem( 50 );
-    m_myListModelViewCtrl->EnsureVisible(item,m_col);
+    m_ctrl[1]->EnsureVisible(item,m_col);
 }

 void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event))
@@ -702,68 +940,3 @@ void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event))
    m_list_model->AddMany();
 }

-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    wxAboutDialogInfo info;
-    info.SetName(_("DataView sample"));
-    info.SetDescription(_("This sample demonstrates wxDataViewCtrl"));
-    info.SetCopyright(_T("(C) 2007-2009 Robert Roebling"));
-    info.AddDeveloper("Robert Roebling");
-    info.AddDeveloper("Francesco Montorsi");
-
-    wxAboutBox(info);
-}
-
-void MyFrame::OnBeginDrag( wxDataViewEvent &event )
-{
-    wxDataViewItem item( event.GetItem() );
-
-    // only allow drags for item, not containers
-    if (m_music_model->IsContainer( item ) )
-    {
-        event.Veto();
-        return;
-    }
-
-    MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID();
-    wxTextDataObject *obj = new wxTextDataObject;
-    obj->SetText( node->m_title );
-    event.SetDataObject( obj );
-}
-
-void MyFrame::OnDropPossible( wxDataViewEvent &event )
-{
-    wxDataViewItem item( event.GetItem() );
-
-    // only allow drags for item, not containers
-    if (m_music_model->IsContainer( item ) )
-        event.Veto();
-
-    if (event.GetDataFormat() != wxDF_UNICODETEXT)
-        event.Veto();
-}
-
-void MyFrame::OnDrop( wxDataViewEvent &event )
-{
-    wxDataViewItem item( event.GetItem() );
-
-    // only allow drops for item, not containers
-    if (m_music_model->IsContainer( item ) )
-    {
-        event.Veto();
-        return;
-    }
-
-    if (event.GetDataFormat() != wxDF_UNICODETEXT)
-    {
-        event.Veto();
-        return;
-    }
-
-    wxTextDataObject obj;
-    obj.SetData( wxDF_TEXT, event.GetDataSize(), event.GetDataBuffer() );
-
-    wxLogMessage(wxT("Text dropped: %s"), obj.GetText() );
-}
-