implement wxTreeCtrl::GetFocusedItem() for wxMSW too (see #10859)

[wxWidgets.git] / samples / dataview / dataview.cpp

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 2b0dc8efd250737f3f08ab2498edbbfa1fee99bd..77d5875e55a70ddbb2781172ec70c141f6fb7ec4 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -66,8 +66,8 @@ public:
     MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h);
     ~MyFrame();
 
     MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h);
     ~MyFrame();
 

-    void BuildDataViewCtrl(wxPanel* parent, 
-                           unsigned int nPanel, 
+    void BuildDataViewCtrl(wxPanel* parent,
+                           unsigned int nPanel,

                            unsigned long style = 0);
 
 public:     // event handlers
                            unsigned long style = 0);
 
 public:     // event handlers


@@ -76,12 +76,15 @@ public:     // event handlers
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

+    void OnClearLog(wxCommandEvent& event);

     void OnPageChanged(wxBookCtrlEvent& event);
 
     void OnAddMozart(wxCommandEvent& event);
     void OnDeleteMusic(wxCommandEvent& event);
     void OnDeleteYear(wxCommandEvent& event);
     void OnSelectNinth(wxCommandEvent& event);
     void OnPageChanged(wxBookCtrlEvent& event);
 
     void OnAddMozart(wxCommandEvent& event);
     void OnDeleteMusic(wxCommandEvent& event);
     void OnDeleteYear(wxCommandEvent& event);
     void OnSelectNinth(wxCommandEvent& event);

+    void OnCollapse(wxCommandEvent& event);
+    void OnExpand(wxCommandEvent& event);

 
     void OnPrependList(wxCommandEvent& event);
     void OnDeleteList(wxCommandEvent& event);
 
     void OnPrependList(wxCommandEvent& event);
     void OnDeleteList(wxCommandEvent& event);


@@ -95,6 +98,7 @@ public:     // event handlers
     void OnCollapsed( wxDataViewEvent &event );
     void OnSelectionChanged( wxDataViewEvent &event );
 
     void OnCollapsed( wxDataViewEvent &event );
     void OnSelectionChanged( wxDataViewEvent &event );
 

+    void OnStartEditing( wxDataViewEvent &event );

     void OnEditingStarted( wxDataViewEvent &event );
     void OnEditingDone( wxDataViewEvent &event );
 
     void OnEditingStarted( wxDataViewEvent &event );
     void OnEditingDone( wxDataViewEvent &event );
 


@@ -156,8 +160,8 @@ public:
     }
 
     virtual bool Activate( wxRect WXUNUSED(cell),
     }
 
     virtual bool Activate( wxRect WXUNUSED(cell),

-                           wxDataViewModel *WXUNUSED(model), 
-                           const wxDataViewItem &WXUNUSED(item), 
+                           wxDataViewModel *WXUNUSED(model),
+                           const wxDataViewItem &WXUNUSED(item),

                            unsigned int WXUNUSED(col) )
     {
         wxLogMessage( "MyCustomRenderer Activate()" );
                            unsigned int WXUNUSED(col) )
     {
         wxLogMessage( "MyCustomRenderer Activate()" );


@@ -165,8 +169,8 @@ public:
     }
 
     virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell),
     }
 
     virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell),

-                           wxDataViewModel *WXUNUSED(model), 
-                           const wxDataViewItem &WXUNUSED(item), 
+                           wxDataViewModel *WXUNUSED(model),
+                           const wxDataViewItem &WXUNUSED(item),

                            unsigned int WXUNUSED(col) )
     {
         wxLogMessage( "MyCustomRenderer LeftClick( %d, %d )", cursor.x, cursor.y );
                            unsigned int WXUNUSED(col) )
     {
         wxLogMessage( "MyCustomRenderer LeftClick( %d, %d )", cursor.x, cursor.y );


@@ -208,7 +212,7 @@ bool MyApp::OnInit()
         return false;
 
     MyFrame *frame =
         return false;
 
     MyFrame *frame =

-        new MyFrame(NULL, wxT("wxDataViewCtrl sample"), 40, 40, 1000, 540);
+        new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);

     SetTopWindow(frame);
 
     frame->Show(true);
     SetTopWindow(frame);
 
     frame->Show(true);


@@ -222,7 +226,8 @@ bool MyApp::OnInit()
 
 enum
 {
 
 enum
 {

-    ID_STYLE_MENU = wxID_HIGHEST+1,
+    ID_CLEARLOG = wxID_HIGHEST+1,
+    ID_STYLE_MENU,

 
     // file menu
     //ID_SINGLE,        wxDV_SINGLE==0 so it's always present
 
     // file menu
     //ID_SINGLE,        wxDV_SINGLE==0 so it's always present


@@ -245,6 +250,8 @@ enum
     ID_DELETE_MUSIC     = 101,
     ID_DELETE_YEAR      = 102,
     ID_SELECT_NINTH     = 103,
     ID_DELETE_MUSIC     = 101,
     ID_DELETE_YEAR      = 102,
     ID_SELECT_NINTH     = 103,

+    ID_COLLAPSE         = 104,
+    ID_EXPAND           = 105,

 
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,
 
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,


@@ -256,6 +263,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU_RANGE( ID_MULTIPLE, ID_VERT_RULES, MyFrame::OnStyleChange )
     EVT_MENU( ID_EXIT, MyFrame::OnQuit )
     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_MENU( ID_CLEARLOG, MyFrame::OnClearLog )

 
     EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged )
 
 
     EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged )
 


@@ -263,6 +271,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic )
     EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear )
     EVT_BUTTON( ID_SELECT_NINTH, MyFrame::OnSelectNinth )
     EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic )
     EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear )
     EVT_BUTTON( ID_SELECT_NINTH, MyFrame::OnSelectNinth )

+    EVT_BUTTON( ID_COLLAPSE, MyFrame::OnCollapse )
+    EVT_BUTTON( ID_EXPAND, MyFrame::OnExpand )
+

     EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList )
     EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )
     EVT_BUTTON( ID_GOTO, MyFrame::OnGoto)
     EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList )
     EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )
     EVT_BUTTON( ID_GOTO, MyFrame::OnGoto)


@@ -277,6 +288,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DATAVIEW_ITEM_COLLAPSED(ID_MUSIC_CTRL, MyFrame::OnCollapsed)
     EVT_DATAVIEW_SELECTION_CHANGED(ID_MUSIC_CTRL, MyFrame::OnSelectionChanged)
 
     EVT_DATAVIEW_ITEM_COLLAPSED(ID_MUSIC_CTRL, MyFrame::OnCollapsed)
     EVT_DATAVIEW_SELECTION_CHANGED(ID_MUSIC_CTRL, MyFrame::OnSelectionChanged)
 

+    EVT_DATAVIEW_ITEM_START_EDITING(ID_MUSIC_CTRL, MyFrame::OnStartEditing)

     EVT_DATAVIEW_ITEM_EDITING_STARTED(ID_MUSIC_CTRL, MyFrame::OnEditingStarted)
     EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
 
     EVT_DATAVIEW_ITEM_EDITING_STARTED(ID_MUSIC_CTRL, MyFrame::OnEditingStarted)
     EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
 


@@ -311,23 +323,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_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"));
+    //style_menu->AppendCheckItem(ID_SINGLE, "Single selection"));
+    style_menu->AppendCheckItem(ID_MULTIPLE, "Multiple selection");
+    style_menu->AppendCheckItem(ID_ROW_LINES, "Alternating colours");
+    style_menu->AppendCheckItem(ID_HORIZ_RULES, "Display horizontal 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(about_menu, wxT("&About"));
+    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(about_menu, "&About");

 
     SetMenuBar(menu_bar);
     CreateStatusBar();
 
     SetMenuBar(menu_bar);
     CreateStatusBar();


@@ -335,7 +348,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
 
     // first page of the notebook
     // --------------------------
 
     // first page of the notebook
     // --------------------------

-    
+

     m_notebook = new wxNotebook( this, wxID_ANY );
 
     wxPanel *firstPanel = new wxPanel( m_notebook, wxID_ANY );
     m_notebook = new wxNotebook( this, wxID_ANY );
 
     wxPanel *firstPanel = new wxPanel( m_notebook, wxID_ANY );


@@ -343,16 +356,18 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     BuildDataViewCtrl(firstPanel, 0);    // sets m_ctrl[0]
 
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     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 );
-    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_SELECT_NINTH,_("Select Ninth")),           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_YEAR, "Delete \"Year\" column"), 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_EXPAND,      "Expand"),                 0, wxALL, 10 );

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

         0, wxGROW|wxALL, 5);
     firstPanelSz->Add(button_sizer);
     firstPanel->SetSizerAndFit(firstPanelSz);
         0, wxGROW|wxALL, 5);
     firstPanelSz->Add(button_sizer);
     firstPanel->SetSizerAndFit(firstPanelSz);


@@ -366,10 +381,10 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     BuildDataViewCtrl(secondPanel, 1);    // sets m_ctrl[1]
 
     wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL );
     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 );
-    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_ADD_MANY,    _("Add 1000")),        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_GOTO,        "Goto 50"),         0, wxALL, 10 );
+    button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY,    "Add 1000"),        0, wxALL, 10 );

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


@@ -391,7 +406,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
 
     // fourth page of the notebook
     // ---------------------------
 
     // fourth page of the notebook
     // ---------------------------

-    
+

     wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY );
 
     BuildDataViewCtrl(fourthPanel, 3);    // sets m_ctrl[3]
     wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY );
 
     BuildDataViewCtrl(fourthPanel, 3);    // sets m_ctrl[3]


@@ -401,7 +416,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     fourthPanel->SetSizerAndFit(fourthPanelSz);
 
 
     fourthPanel->SetSizerAndFit(fourthPanelSz);
 
 

-    
+

     // complete GUI
     // ------------
 
     // complete GUI
     // ------------
 


@@ -411,16 +426,16 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     m_notebook->AddPage(fourthPanel, "wxDataViewTreeCtrl");
 
     wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
     m_notebook->AddPage(fourthPanel, "wxDataViewTreeCtrl");
 
     wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);

-    
-    m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition, 
+
+    m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition,

                             wxDefaultSize, wxTE_MULTILINE );
     m_log->SetMinSize(wxSize(-1, 100));
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
                             wxDefaultSize, wxTE_MULTILINE );
     m_log->SetMinSize(wxSize(-1, 100));
     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_log, 0, wxGROW );
 
     mainSizer->Add( m_notebook, 1, wxGROW );
     mainSizer->Add( m_log, 0, wxGROW );

-
+    

     SetSizerAndFit(mainSizer);
 }
 
     SetSizerAndFit(mainSizer);
 }
 


@@ -436,7 +451,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
     case 0:
         {
             wxASSERT(!m_ctrl[0] && !m_music_model);
     case 0:
         {
             wxASSERT(!m_ctrl[0] && !m_music_model);

-            m_ctrl[0] = 
+            m_ctrl[0] =

                 new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition,
                                     wxDefaultSize, style );
 
                 new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition,
                                     wxDefaultSize, style );
 


@@ -448,10 +463,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
 
             // column 0 of the view control:
 
 
             // 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,
+            wxDataViewTextRenderer *tr =
+                new wxDataViewTextRenderer( "string", wxDATAVIEW_CELL_INERT );
+            wxDataViewColumn *column0 =
+                new wxDataViewColumn( "title", tr, 0, 200, wxALIGN_LEFT,

                                       wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[0]->AppendColumn( column0 );
 #if 0
                                       wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[0]->AppendColumn( column0 );
 #if 0


@@ -462,20 +477,20 @@ 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 );
-            wxDataViewColumn *column1 = 
-                new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT,
-                                      wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | 
+            tr = new wxDataViewTextRenderer( "string", wxDATAVIEW_CELL_EDITABLE );
+            wxDataViewColumn *column1 =
+                new wxDataViewColumn( "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:
 
                                       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 = 
+            wxDataViewSpinRenderer *sr =

                 new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
                 new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );

-            wxDataViewColumn *column2 = 
-                new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT,
+            wxDataViewColumn *column2 =
+                new wxDataViewColumn( "year", sr, 2, 60, wxALIGN_LEFT,

                                       wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
             m_ctrl[0]->AppendColumn( column2 );
 
                                       wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
             m_ctrl[0]->AppendColumn( column2 );
 


@@ -485,25 +500,25 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             choices.Add( "good" );
             choices.Add( "bad" );
             choices.Add( "lousy" );
             choices.Add( "good" );
             choices.Add( "bad" );
             choices.Add( "lousy" );

-            wxDataViewChoiceRenderer *c = 
+            wxDataViewChoiceRenderer *c =

                 new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
                 new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );

-            wxDataViewColumn *column3 = 
-                new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT,
+            wxDataViewColumn *column3 =
+                new wxDataViewColumn( "rating", c, 3, 100, wxALIGN_LEFT,

                                       wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[0]->AppendColumn( column3 );
 
             // column 4 of the view control:
 
                                       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 );
+            m_ctrl[0]->AppendProgressColumn( "popularity", 4, wxDATAVIEW_CELL_INERT, 80 );

 
             // column 5 of the view control:
 
             MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT );
 
             // 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,
+            wxDataViewColumn *column5 =
+                new wxDataViewColumn( "custom", cr, 5, -1, wxALIGN_LEFT,

                                       wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[0]->AppendColumn( column5 );
                                       wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[0]->AppendColumn( column5 );

-            
+

 
             // select initially the ninth symphony:
             m_ctrl[0]->Select(m_music_model->GetNinthItem());
 
             // select initially the ninth symphony:
             m_ctrl[0]->Select(m_music_model->GetNinthItem());


@@ -521,28 +536,28 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
 
             // the various columns
 #if 1
 
             // 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") );
+            m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE, 120);
+            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]->AppendIconTextColumn(wxT("icon"),            1, wxDATAVIEW_CELL_INERT );
+            m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE);
+            m_ctrl[1]->AppendIconTextColumn("icon", 1, wxDATAVIEW_CELL_INERT);

 #endif
             m_ctrl[1]->AppendColumn(
 #endif
             m_ctrl[1]->AppendColumn(

-                new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 ));
+                new wxDataViewColumn("attributes", new wxDataViewTextRendererAttr, 2 ));

         }
         break;
 
     case 2:
         {
             wxASSERT(!m_ctrl[2]);
         }
         break;
 
     case 2:
         {
             wxASSERT(!m_ctrl[2]);

-            wxDataViewListCtrl* lc = 
+            wxDataViewListCtrl* lc =

                 new wxDataViewListCtrl( parent, wxID_ANY, wxDefaultPosition,
                                         wxDefaultSize, style );
             m_ctrl[2] = 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") );
+            lc->AppendToggleColumn( "Toggle" );
+            lc->AppendTextColumn( "Text" );
+            lc->AppendProgressColumn( "Progress" );

 
             wxVector<wxVariant> data;
             for (unsigned int i=0; i<10; i++)
 
             wxVector<wxVariant> data;
             for (unsigned int i=0; i<10; i++)


@@ -560,7 +575,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
     case 3:
         {
             wxASSERT(!m_ctrl[3]);
     case 3:
         {
             wxASSERT(!m_ctrl[3]);

-            wxDataViewTreeCtrl* tc = 
+            wxDataViewTreeCtrl* tc =

                 new wxDataViewTreeCtrl( parent, wxID_ANY, wxDefaultPosition,
                                         wxDefaultSize, style );
             m_ctrl[3] = tc;
                 new wxDataViewTreeCtrl( parent, wxID_ANY, wxDefaultPosition,
                                         wxDefaultSize, style );
             m_ctrl[3] = tc;


@@ -569,19 +584,19 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             ilist->Add( wxIcon(wx_small_xpm) );
             tc->SetImageList( ilist );
 
             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 parent =
+                tc->AppendContainer( wxDataViewItem(0), "The Root", 0 );
+            tc->AppendItem( parent, "Child 1", 0 );
+            tc->AppendItem( parent, "Child 2", 0 );
+            tc->AppendItem( parent, "Child 3, very long, long, long, long", 0 );

 
             wxDataViewItem cont =
 
             wxDataViewItem cont =

-                tc->AppendContainer( parent, wxT("Container child"), 0 );
-            tc->AppendItem( cont, wxT("Child 4"), 0 );
-            tc->AppendItem( cont, wxT("Child 5"), 0 );
+                tc->AppendContainer( parent, "Container child", 0 );
+            tc->AppendItem( cont, "Child 4", 0 );
+            tc->AppendItem( cont, "Child 5", 0 );

 
             tc->Expand(cont);
 
             tc->Expand(cont);

-        } 
+        }

         break;
     }
 }
         break;
     }
 }


@@ -591,7 +606,12 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
 // MyFrame - generic event handlers
 // ----------------------------------------------------------------------------
 
 // MyFrame - generic event handlers
 // ----------------------------------------------------------------------------
 

-void MyFrame::OnPageChanged(wxBookCtrlEvent& WXUNUSED(event) )
+void MyFrame::OnClearLog( wxCommandEvent& WXUNUSED(event) )
+{
+    m_log->Clear();
+}
+
+void MyFrame::OnPageChanged( wxBookCtrlEvent& WXUNUSED(event) )

 {
     unsigned int nPanel = m_notebook->GetSelection();
 
 {
     unsigned int nPanel = m_notebook->GetSelection();
 


@@ -626,7 +646,7 @@ void MyFrame::OnPageChanged(wxBookCtrlEvent& WXUNUSED(event) )
     }
 }
 
     }
 }
 

-void MyFrame::OnStyleChange(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnStyleChange( wxCommandEvent& WXUNUSED(event) )

 {
     unsigned int nPanel = m_notebook->GetSelection();
 
 {
     unsigned int nPanel = m_notebook->GetSelection();
 


@@ -667,7 +687,7 @@ void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
     Close(true);
 }
 
     Close(true);
 }
 

-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )

 {
     wxAboutDialogInfo info;
     info.SetName(_("DataView sample"));
 {
     wxAboutDialogInfo info;
     info.SetName(_("DataView sample"));


@@ -733,12 +753,12 @@ void MyFrame::OnDrop( wxDataViewEvent &event )
     wxTextDataObject obj;
     obj.SetData( wxDF_UNICODETEXT, event.GetDataSize(), event.GetDataBuffer() );
 
     wxTextDataObject obj;
     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) )


@@ -758,15 +778,35 @@ 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() );
 }
 

+void MyFrame::OnCollapse( wxCommandEvent& WXUNUSED(event) )
+{
+    wxDataViewItem item = m_ctrl[0]->GetSelection();
+    if (item.IsOk())
+        m_ctrl[0]->Collapse( item );
+}
+
+void MyFrame::OnExpand( wxCommandEvent& WXUNUSED(event) )
+{
+    wxDataViewItem item = m_ctrl[0]->GetSelection();
+    if (item.IsOk())
+        m_ctrl[0]->Expand( item );
+}
+

 void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
 
 void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {
     if (!m_log)
         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() );
 }
 


@@ -776,10 +816,10 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 )


@@ -789,9 +829,9 @@ void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
     if (title.empty())
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
     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 )


@@ -800,17 +840,34 @@ void MyFrame::OnExpanding( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 );

 }
 
 
 }
 
 

+void MyFrame::OnStartEditing( wxDataViewEvent &event )
+{
+    wxString artist = m_music_model->GetArtist( event.GetItem() );
+    if (artist == "Ludwig van Beethoven")
+    {
+        event.Veto();
+        
+        if (!m_log)
+           return;
+           
+        wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING vetoed. Artist: %s", artist );
+    }
+    else
+        wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING not vetoed. Artist: %s", artist );
+    
+}
+

 void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
 void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
 
     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 )


@@ -819,7 +876,7 @@ void MyFrame::OnEditingDone( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 )


@@ -828,7 +885,7 @@ void MyFrame::OnExpanded( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 )


@@ -837,7 +894,7 @@ void MyFrame::OnCollapsing( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 )


@@ -846,7 +903,7 @@ void MyFrame::OnCollapsed( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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 )


@@ -855,17 +912,14 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event )
         return;
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
         return;
 
     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( 2, wxT("entry 2") );
-    menu.Append( 3, wxT("entry 3") );
+    menu.Append( 1, "menuitem 1" );
+    menu.Append( 2, "menuitem 2" );
+    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 )


@@ -879,7 +933,8 @@ 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 );
+    wxLogMessage( "Column width: %d", event.GetDataViewColumn()->GetWidth() );

 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )


@@ -889,7 +944,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 )


@@ -899,7 +954,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 )


@@ -907,8 +962,8 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
     if(!m_log)
         return;
 
     if(!m_log)
         return;
 

-    wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), 
-                 event.GetX(), event.GetY());
+    wxLogMessage( "wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d",
+                 event.GetX(), event.GetY() );

 }
 
 
 }
 
 


@@ -918,7 +973,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) )