Change version to 3.0.0.

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index eb750bd33a9e37dcb2e8b657c73383f68f60a353..5deed638e9361a1c82fc69ab2e47c121d68172ea 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi, Bo Yang
 // Created:     06/01/06
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi, Bo Yang
 // Created:     06/01/06

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -41,7 +40,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -119,7 +118,6 @@ private:
 
     void OnContextMenu( wxDataViewEvent &event );
 
 
     void OnContextMenu( wxDataViewEvent &event );
 

-    void OnRightClick( wxMouseEvent &event );

     void OnGoto( wxCommandEvent &event);
     void OnAddMany( wxCommandEvent &event);
     void OnHideAttributes( wxCommandEvent &event);
     void OnGoto( wxCommandEvent &event);
     void OnAddMany( wxCommandEvent &event);
     void OnHideAttributes( wxCommandEvent &event);


@@ -190,21 +188,18 @@ public:
         return true;
     }
 
         return true;
     }
 

-    virtual bool Activate( wxRect WXUNUSED(cell),
-                           wxDataViewModel *WXUNUSED(model),
-                           const wxDataViewItem &WXUNUSED(item),
-                           unsigned int WXUNUSED(col) )
+    virtual bool ActivateCell(const wxRect& WXUNUSED(cell),
+                              wxDataViewModel *WXUNUSED(model),
+                              const wxDataViewItem &WXUNUSED(item),
+                              unsigned int WXUNUSED(col),
+                              const wxMouseEvent *mouseEvent)

     {
     {

-        wxLogMessage( "MyCustomRenderer Activate()" );
-        return false;
-    }
-
-    virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell),
-                           wxDataViewModel *WXUNUSED(model),
-                           const wxDataViewItem &WXUNUSED(item),
-                           unsigned int WXUNUSED(col) )
-    {
-        wxLogMessage( "MyCustomRenderer LeftClick( %d, %d )", cursor.x, cursor.y );
+        wxString position;
+        if ( mouseEvent )
+            position = wxString::Format("via mouse at %d, %d", mouseEvent->m_x, mouseEvent->m_y);
+        else
+            position = "from keyboard";
+        wxLogMessage("MyCustomRenderer ActivateCell() %s", position);

         return false;
     }
 
         return false;
     }
 


@@ -243,7 +238,6 @@ bool MyApp::OnInit()
 
     MyFrame *frame =
         new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);
 
     MyFrame *frame =
         new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);

-    SetTopWindow(frame);

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


@@ -294,7 +288,7 @@ enum
     ID_ADD_MANY         = 203,
     ID_HIDE_ATTRIBUTES  = 204,
     ID_SHOW_ATTRIBUTES  = 205,
     ID_ADD_MANY         = 203,
     ID_HIDE_ATTRIBUTES  = 204,
     ID_SHOW_ATTRIBUTES  = 205,

-    
+

     // Fourth page.
     ID_DELETE_TREE_ITEM = 400,
     ID_DELETE_ALL_TREE_ITEMS = 401,
     // Fourth page.
     ID_DELETE_TREE_ITEM = 400,
     ID_DELETE_ALL_TREE_ITEMS = 401,


@@ -348,7 +342,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
 
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick)
     EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
 
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick)

-    EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)
+    EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)

     EVT_DATAVIEW_COLUMN_SORTED(ID_MUSIC_CTRL, MyFrame::OnSorted)
 
     EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu)
     EVT_DATAVIEW_COLUMN_SORTED(ID_MUSIC_CTRL, MyFrame::OnSorted)
 
     EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu)


@@ -359,10 +353,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DATAVIEW_ITEM_DROP( ID_MUSIC_CTRL, MyFrame::OnDrop )
 #endif // wxUSE_DRAG_AND_DROP
 
     EVT_DATAVIEW_ITEM_DROP( ID_MUSIC_CTRL, MyFrame::OnDrop )
 #endif // wxUSE_DRAG_AND_DROP
 

-    EVT_RIGHT_UP(MyFrame::OnRightClick)
-    

     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick)
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick)

-    
+

 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h):
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h):


@@ -408,6 +400,14 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     CreateStatusBar();
 
 
     CreateStatusBar();
 
 

+    // redirect logs from our event handlers to text control
+    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));
+    wxLogMessage( "This is the log window" );
+
+

     // first page of the notebook
     // --------------------------
 
     // first page of the notebook
     // --------------------------
 


@@ -507,12 +507,6 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
 
     wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
 
 
     wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
 

-    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));
-    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 );
 


@@ -541,10 +535,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             m_music_model = new MyMusicTreeModel;
             m_ctrl[0]->AssociateModel( m_music_model.get() );
 
             m_music_model = new MyMusicTreeModel;
             m_ctrl[0]->AssociateModel( m_music_model.get() );
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP && wxUSE_UNICODE

             m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT );
             m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT );
             m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT );
             m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT );

-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP && wxUSE_UNICODE

 
             // column 0 of the view control:
 
 
             // column 0 of the view control:
 


@@ -622,16 +616,18 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             // the various columns
             m_ctrl[1]->AppendTextColumn("editable string",
                                         MyListModel::Col_EditableText,
             // the various columns
             m_ctrl[1]->AppendTextColumn("editable string",
                                         MyListModel::Col_EditableText,

-                                        wxDATAVIEW_CELL_EDITABLE);
+                                        wxDATAVIEW_CELL_EDITABLE,
+                                        wxCOL_WIDTH_AUTOSIZE);

             m_ctrl[1]->AppendIconTextColumn("icon",
                                             MyListModel::Col_IconText,
             m_ctrl[1]->AppendIconTextColumn("icon",
                                             MyListModel::Col_IconText,

-                                            wxDATAVIEW_CELL_EDITABLE);
-                                            
-            m_attributes = 
+                                            wxDATAVIEW_CELL_EDITABLE,
+                                            wxCOL_WIDTH_AUTOSIZE);
+
+            m_attributes =

                 new wxDataViewColumn("attributes",
                                      new wxDataViewTextRenderer,
                                      MyListModel::Col_TextWithAttr,
                 new wxDataViewColumn("attributes",
                                      new wxDataViewTextRenderer,
                                      MyListModel::Col_TextWithAttr,

-                                     80,
+                                     wxCOL_WIDTH_AUTOSIZE,

                                      wxALIGN_RIGHT,
                                      wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[1]->AppendColumn( m_attributes );
                                      wxALIGN_RIGHT,
                                      wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
             m_ctrl[1]->AppendColumn( m_attributes );


@@ -652,6 +648,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
                                         wxDefaultSize, style );
             m_ctrl[2] = lc;
 
                                         wxDefaultSize, style );
             m_ctrl[2] = lc;
 

+            MyListStoreDerivedModel* page2_model = new MyListStoreDerivedModel();
+            lc->AssociateModel(page2_model);
+            page2_model->DecRef();
+

             lc->AppendToggleColumn( "Toggle" );
             lc->AppendTextColumn( "Text" );
             lc->AppendProgressColumn( "Progress" );
             lc->AppendToggleColumn( "Toggle" );
             lc->AppendTextColumn( "Text" );
             lc->AppendProgressColumn( "Progress" );


@@ -679,7 +679,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
 
             wxImageList *ilist = new wxImageList( 16, 16 );
             ilist->Add( wxIcon(wx_small_xpm) );
 
             wxImageList *ilist = new wxImageList( 16, 16 );
             ilist->Add( wxIcon(wx_small_xpm) );

-            tc->SetImageList( ilist );
+            tc->AssignImageList( ilist );

 
             wxDataViewItem parent =
                 tc->AppendContainer( wxDataViewItem(0), "The Root", 0 );
 
             wxDataViewItem parent =
                 tc->AppendContainer( wxDataViewItem(0), "The Root", 0 );


@@ -840,6 +840,7 @@ void MyFrame::OnBeginDrag( wxDataViewEvent &event )
     wxTextDataObject *obj = new wxTextDataObject;
     obj->SetText( node->m_title );
     event.SetDataObject( obj );
     wxTextDataObject *obj = new wxTextDataObject;
     obj->SetText( node->m_title );
     event.SetDataObject( obj );

+    event.SetDragFlags(wxDrag_AllowMove); // allows both copy and move

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


@@ -942,6 +943,17 @@ void MyFrame::OnShowCurrent(wxCommandEvent& WXUNUSED(event))
     {
         wxLogMessage("There is no current item.");
     }
     {
         wxLogMessage("There is no current item.");
     }

+
+    wxDataViewColumn *col = m_ctrl[0]->GetCurrentColumn();
+    if ( col )
+    {
+        wxLogMessage("Current column: %d",
+                     m_ctrl[0]->GetColumnPosition(col));
+    }
+    else
+    {
+        wxLogMessage("There is no current column.");
+    }

 }
 
 void MyFrame::OnSetNinthCurrent(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnSetNinthCurrent(wxCommandEvent& WXUNUSED(event))


@@ -958,9 +970,6 @@ void MyFrame::OnSetNinthCurrent(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {
 
 void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %s;  Column: %d",
                   title, event.GetColumn() );
     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %s;  Column: %d",
                   title, event.GetColumn() );


@@ -968,11 +977,8 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event )
 
 void MyFrame::OnActivated( wxDataViewEvent &event )
 {
 
 void MyFrame::OnActivated( wxDataViewEvent &event )
 {

-    if(!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_ACTIVATED, Item: %s", title );

 
     if (m_ctrl[0]->IsExpanded( event.GetItem() ))
     {
 
     if (m_ctrl[0]->IsExpanded( event.GetItem() ))
     {


@@ -982,23 +988,17 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
 
 void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
 {
 
 void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
 {

-    if(!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     if (title.empty())
         title = "None";
 
     wxString title = m_music_model->GetTitle( event.GetItem() );
     if (title.empty())
         title = "None";
 

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_SELECTION_CHANGED, First selected Item: %s", title );

 }
 
 void MyFrame::OnExpanding( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnExpanding( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EXPANDING, Item: %s", title );

 }
 
 
 }
 
 


@@ -1009,68 +1009,47 @@ void MyFrame::OnStartEditing( wxDataViewEvent &event )
     {
         event.Veto();
 
     {
         event.Veto();
 

-        if (!m_log)
-           return;
-
-        wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING vetoed. Artist: %s", artist );
+        wxLogMessage( "wxEVT_DATAVIEW_ITEM_START_EDITING vetoed. Artist: %s", artist );

     }
     else
     }
     else

-        wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING not vetoed. Artist: %s", artist );
+        wxLogMessage( "wxEVT_DATAVIEW_ITEM_START_EDITING not vetoed. Artist: %s", artist );

 
 }
 
 void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {
 
 }
 
 void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );

 }
 
 void MyFrame::OnEditingDone( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnEditingDone( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );

 }
 
 void MyFrame::OnExpanded( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnExpanded( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EXPANDED, Item: %s", title );

 }
 
 void MyFrame::OnCollapsing( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnCollapsing( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_COLLAPSING, Item: %s", title );

 }
 
 void MyFrame::OnCollapsed( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnCollapsed( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_COLLAPSED, Item: %s", title );

 }
 
 void MyFrame::OnContextMenu( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnContextMenu( wxDataViewEvent &event )
 {

-    if (!m_log)
-        return;
-

     wxString title = m_music_model->GetTitle( event.GetItem() );
     wxString title = m_music_model->GetTitle( event.GetItem() );

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title );
+    wxLogMessage( "wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title );

 
     wxMenu menu;
     menu.Append( 1, "menuitem 1" );
 
     wxMenu menu;
     menu.Append( 1, "menuitem 1" );


@@ -1086,12 +1065,9 @@ void MyFrame::OnAttrHeaderClick( wxDataViewEvent &event )
     // this column when it is clicked to take place
     event.Skip();
 
     // this column when it is clicked to take place
     event.Skip();
 

-    if (!m_log)
-        return;
-

     int pos = m_ctrl[1]->GetColumnPosition( event.GetDataViewColumn() );
 
     int pos = m_ctrl[1]->GetColumnPosition( event.GetDataViewColumn() );
 

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );
+    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );

     wxLogMessage( "Column title: %s  Column width: %d", event.GetDataViewColumn()->GetTitle(), event.GetDataViewColumn()->GetWidth() );
 }
 
     wxLogMessage( "Column title: %s  Column width: %d", event.GetDataViewColumn()->GetTitle(), event.GetDataViewColumn()->GetWidth() );
 }
 


@@ -1101,42 +1077,24 @@ void MyFrame::OnHeaderClick( wxDataViewEvent &event )
     // this column when it is clicked to take place
     event.Skip();
 
     // this column when it is clicked to take place
     event.Skip();
 

-    if (!m_log)
-        return;
-

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

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );
+    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );

     wxLogMessage( "Column width: %d", event.GetDataViewColumn()->GetWidth() );
 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
 {
     wxLogMessage( "Column width: %d", event.GetDataViewColumn()->GetWidth() );
 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
 {

-    if(!m_log)
-        return;
-

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

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );
+    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );

 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )
 {
 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )
 {

-    if(!m_log)
-        return;
-

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

-    wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d", pos );
-}
-
-void MyFrame::OnRightClick( wxMouseEvent &event )
-{
-    if(!m_log)
-        return;
-
-    wxLogMessage( "wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d",
-                 event.GetX(), event.GetY() );
+    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_SORTED, Column position: %d", pos );

 }
 
 void MyFrame::OnDataViewChar(wxKeyEvent& event)
 }
 
 void MyFrame::OnDataViewChar(wxKeyEvent& event)


@@ -1195,7 +1153,7 @@ void MyFrame::OnDeleteTreeItem(wxCommandEvent& WXUNUSED(event))
     wxDataViewItem selected = ctrl->GetSelection();
     if (!selected.IsOk())
         return;
     wxDataViewItem selected = ctrl->GetSelection();
     if (!selected.IsOk())
         return;

-        
+

     ctrl->DeleteItem(selected);
 }
 
     ctrl->DeleteItem(selected);
 }
 


@@ -1209,8 +1167,11 @@ void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event))
 {
     wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3];
     wxDataViewItem selected = ctrl->GetSelection();
 {
     wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3];
     wxDataViewItem selected = ctrl->GetSelection();

-    if (ctrl->IsContainer(selected))
-        ctrl->AppendItem( selected, "Item", 0 );
+    if (ctrl->IsContainer(selected)) {
+        wxDataViewItem newitem = ctrl->AppendItem( selected, "Item", 0 );
+        ctrl->Select(newitem);
+        ctrl->EditItem(newitem, ctrl->GetColumn(0));
+    }

 }
 
 void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event))