X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5f688eddd190d7079319b589ab6a54b202dde15..4eccf53dd554235876dccd4e37331d64427e84c4:/samples/dataview/dataview.cpp

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index e46d35b60d..c852284476 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -34,12 +34,41 @@
 
 #include "null.xpm"
 
+/* XPM */
+static const char *small1_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+". c Black",
+"o c #FFFFFF",
+"X c #000080",
+"O c #FFFF00",
+"  c None",
+"+ c #FF0000",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"    .......     ",
+"    .XXXXX.     ",
+"    .oXXXX.     ",
+"    .oXXX.......",
+".....oXXX.OOOOO.",
+".+++.XXXX.oOOOO.",
+".o++......oOOOO.",
+".o++++.  .oOOOO.",
+".o++++.  .OOOOO.",
+".+++++.  .......",
+".......         ",
+"                ",
+"                "
+};
+
+
 
 #define DEFAULT_ALIGN                   wxALIGN_LEFT
 #define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
 
 
-
 // -------------------------------------
 // MyMusicModel
 // -------------------------------------
@@ -66,7 +95,7 @@ class MyMusicModelNode
 {
 public:
     MyMusicModelNode( MyMusicModelNode* parent, 
-                      const wxString &title, const wxString &artist, const wxString &year )
+                      const wxString &title, const wxString &artist, int year )
     { 
         m_parent = parent; 
         m_title = title;
@@ -80,6 +109,7 @@ public:
     { 
         m_parent = parent; 
         m_title = branch;
+        m_year = -1;
         m_isContainer = true;
     }
     
@@ -106,7 +136,7 @@ public:
 public:
     wxString            m_title;
     wxString            m_artist;
-    wxString            m_year;
+    int                 m_year;
     
 private:
     MyMusicModelNode   *m_parent;
@@ -127,21 +157,32 @@ public:
         m_pop = new MyMusicModelNode( m_root, "Pop music" );
         m_root->Append( m_pop );
         m_pop->Append( new MyMusicModelNode( m_pop, 
-            "You are not alone", "Michael Jackson", "1995" ) );
+            "You are not alone", "Michael Jackson", 1995 ) );
         m_pop->Append( new MyMusicModelNode( m_pop, 
-            "Take a bow", "Madonna", "1994" ) );
+            "Take a bow", "Madonna", 1994 ) );
         m_classical = new MyMusicModelNode( m_root, "Classical music" );
         m_root->Append( m_classical );
         m_classical->Append( new MyMusicModelNode( m_classical, 
-            "Ninth symphony", "Ludwig van Beethoven", "1824" ) );
+            "Ninth symphony", "Ludwig van Beethoven", 1824 ) );
         m_classical->Append( new MyMusicModelNode( m_classical, 
-            "German Requiem", "Johannes Brahms", "1868" ) );
+            "German Requiem", "Johannes Brahms", 1868 ) );
         m_classicalMusicIsKnownToControl = false;
     }
     
+    // helper method for wxLog
+    
+    wxString GetTitle( const wxDataViewItem &item )
+    {
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
+        if (!node)
+            return wxEmptyString;
+            
+        return node->m_title;
+    }
+    
     // helper methods to change the model
 
-    void AddToClassical( const wxString &title, const wxString &artist, const wxString &year )
+    void AddToClassical( const wxString &title, const wxString &artist, int year )
     {
         // add to data
         MyMusicModelNode *child_node = 
@@ -163,15 +204,11 @@ public:
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         wxDataViewItem parent( node->GetParent() );
         
-        // notify control
-        ItemDeleted( parent, item );
-        //We must delete the node after we call ItemDeleted
-        //The reason is that:
-        //When we use wxSortedArray, the array find a node through binary search for speed.
-        //And when the array is searching for some node, it call the model's compare function.
-        //The compare function need the node to be compared. So we should delete the node later, here.
         node->GetParent()->GetChildren().Remove( node );
         delete node;
+        
+        // notify control
+        ItemDeleted( parent, item );
     }
     
     // override sorting to always sort branches ascendingly
@@ -209,6 +246,9 @@ public:
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
+        if (col == 2)
+            return "long";
+            
         return "string";
     }
 
@@ -220,10 +260,12 @@ public:
         {
             case 0: variant = node->m_title; break;
             case 1: variant = node->m_artist; break;
-            case 2: variant = node->m_year; break;
+            case 2: variant = (long) node->m_year; break;
             default: 
             {
                 wxLogError( "MyMusicModel::GetValue: wrong column" );
+                
+                // provoke a crash when mouse button down
                 wxMouseState state = wxGetMouseState();
                 if (state.ShiftDown())
                 {
@@ -242,7 +284,7 @@ public:
         {
             case 0: node->m_title = variant.GetString(); return true;
             case 1: node->m_artist  = variant.GetString(); return true;
-            case 2: node->m_year  = variant.GetString(); return true;
+            case 2: node->m_year  = variant.GetLong(); return true;
             default: wxLogError( "MyMusicModel::SetValue: wrong column" );
         }
         return false;
@@ -274,48 +316,36 @@ public:
         return node->IsContainer();
     }
     
-    virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const
+    virtual unsigned int GetChildren( const wxDataViewItem &parent, wxDataViewItemArray &array ) const
     {
         MyMusicModelNode *node = (MyMusicModelNode*) parent.GetID();
         if (!node)
-            return wxDataViewItem( (void*) m_root );
+        {
+            array.Add( wxDataViewItem( (void*) m_root ) );
+            return 1;
+        }
         
-        if (node->GetChildCount() == 0)
-            return wxDataViewItem( 0 );
-           
         if (node == m_classical)
         {
             MyMusicModel *model = (MyMusicModel*)(const MyMusicModel*) this;
             model->m_classicalMusicIsKnownToControl = true;
         }
         
-        MyMusicModelNode *first_child = node->GetChildren().Item( 0 );
-        return wxDataViewItem( (void*) first_child );
+        if (node->GetChildCount() == 0)
+        {
+            return 0;
+        }
+           
+        unsigned int count = node->GetChildren().GetCount();
+        unsigned int pos;
+        for (pos = 0; pos < count; pos++)
+        {
+            MyMusicModelNode *child = node->GetChildren().Item( pos );
+            array.Add( wxDataViewItem( (void*) child ) );
+        }
+        return count;
     }
     
-    virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const
-    {
-        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
-        
-        // "MyMusic" has no siblings in our model
-        if (node == m_root)
-            return wxDataViewItem(0);
-
-        MyMusicModelNode *parent = node->GetParent();
-        int pos = parent->GetChildren().Index( node );
-        
-        // Something went wrong
-        if (pos == wxNOT_FOUND)
-            return wxDataViewItem(0);
-            
-        // No more children
-        if (pos == parent->GetChildCount()-1)
-            return wxDataViewItem(0);
-            
-        node = parent->GetChildren().Item( pos+1 );
-        return wxDataViewItem( (void*) node );
-    } 
-    
 private:
     MyMusicModelNode*   m_root;
     MyMusicModelNode*   m_pop;
@@ -327,7 +357,11 @@ class MyListModel: public wxDataViewIndexListModel
 {
 public:
     MyListModel() : 
-        wxDataViewIndexListModel( 100 )
+#ifdef __WXMAC__
+        wxDataViewIndexListModel( 1000 )
+#else
+        wxDataViewIndexListModel( 100000 )
+#endif
     {
         unsigned int i;
         for (i = 0; i < 100; i++)
@@ -336,6 +370,8 @@ public:
             str.Printf( "row number %d", i );
             m_array.Add( str );
         }
+        
+        m_icon = wxIcon( null_xpm );
     }
     
     // helper methods to change the model
@@ -357,11 +393,14 @@ public:
     
     virtual unsigned int GetColumnCount() const
     {
-        return 2;
+        return 3;
     }
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
+        if (col == 1)
+            return "wxDataViewIconText";
+            
         return "string";
     }
     
@@ -375,21 +414,52 @@ public:
     {
         if (col==0)
         {
-            variant = m_array[ row ];
-        }
-        else
+            if (row >= m_array.GetCount())
+            {
+                wxString str;
+                str.Printf( "row %d", row );
+                variant = str;
+            }
+            else
+            {
+                variant = m_array[ row ];
+            }
+        } else
+        if (col==1)
         {
-            wxString str;
-            str.Printf( "row %d col %d", row, col );
-            variant = str;
+            wxDataViewIconText data( "test", m_icon );
+            variant << data;
+        } else
+        if (col==2)
+        {
+            if ((row % 2) == 1)
+                variant = "Blue";
+            else
+                variant = "Italic";
         }
     }
+    
+    virtual bool GetAttr( unsigned int row, unsigned int col, wxDataViewItemAttr &attr )
+    {
+        if (col != 2)
+            return false;
+            
+        if ((row % 2) == 1)
+            attr.SetColour( *wxBLUE );
+        else
+            attr.SetItalic( true );
+        
+        return true;            
+    }
 
     virtual bool SetValue( const wxVariant &variant, 
                            unsigned int row, unsigned int col )
     {
         if (col == 0)
         {
+            if (row >= m_array.GetCount())
+               return false;
+               
             m_array[row] = variant.GetString();
             return true;
         }
@@ -398,6 +468,7 @@ public:
     }
     
     wxArrayString    m_array;
+    wxIcon           m_icon;
 };
 
 // -------------------------------------
@@ -418,7 +489,7 @@ public:
 class MyFrame : public wxFrame
 {
 public:
-    MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
+    MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h);
 
 public:
     void OnQuit(wxCommandEvent& event);
@@ -426,25 +497,29 @@ public:
     
     void OnAddMozart(wxCommandEvent& event);
     void OnDeleteMusic(wxCommandEvent& event);
+    void OnDeleteYear(wxCommandEvent& event);
     
     void OnPrependList(wxCommandEvent& event);
     void OnDeleteList(wxCommandEvent& event);
 
     void OnValueChanged( wxDataViewEvent &event );
-    void OnItemAdded( wxDataViewEvent &event );
-    void OnItemDeleted( wxDataViewEvent &event );
     
     void OnActivated( wxDataViewEvent &event );
     void OnExpanding( wxDataViewEvent &event );
     void OnExpanded( wxDataViewEvent &event );
     void OnCollapsing( wxDataViewEvent &event );
     void OnCollapsed( wxDataViewEvent &event );
-    void OnSelected( wxDataViewEvent &event );
+    void OnSelectionChanged( wxDataViewEvent &event );
+    
+    void OnEditingStarted( wxDataViewEvent &event );
+    void OnEditingDone( wxDataViewEvent &event );
     
     void OnHeaderClick( wxDataViewEvent &event );
     void OnHeaderRightClick( wxDataViewEvent &event );
     void OnSorted( wxDataViewEvent &event );
 
+    void OnContextMenu( wxDataViewEvent &event );
+
     void OnRightClick( wxMouseEvent &event );
     void OnGoto( wxCommandEvent &event);
 
@@ -454,6 +529,8 @@ private:
     
     wxDataViewCtrl* m_listCtrl;
     wxObjectDataPtr<MyListModel> m_list_model;
+
+    wxDataViewColumn * m_col;
     
     wxTextCtrl    * m_log;
     wxLog *m_logOld;
@@ -475,7 +552,7 @@ bool MyApp::OnInit(void)
 
     // build the first frame
     MyFrame *frame = 
-        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 700, 440);
+        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 800, 440);
     frame->Show(true);
 
     SetTopWindow(frame);
@@ -502,10 +579,11 @@ enum
     
     ID_ADD_MOZART       = 100,
     ID_DELETE_MUSIC     = 101,
+    ID_DELETE_YEAR      = 102,
      
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,
-    ID_GOTO                  = 202
+    ID_GOTO             = 202
 };
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -513,33 +591,37 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU( ID_EXIT, MyFrame::OnQuit )
     EVT_BUTTON( ID_ADD_MOZART, MyFrame::OnAddMozart )
     EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic )
+    EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear )
     EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList )
     EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )
     EVT_BUTTON( ID_GOTO, MyFrame::OnGoto)
     
-    EVT_DATAVIEW_MODEL_ITEM_ADDED( ID_MUSIC_CTRL, MyFrame::OnItemAdded )
-    EVT_DATAVIEW_MODEL_ITEM_DELETED( ID_MUSIC_CTRL, MyFrame::OnItemDeleted )
-    EVT_DATAVIEW_MODEL_VALUE_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged )
-    EVT_DATAVIEW_MODEL_ITEM_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged )
+    EVT_DATAVIEW_ITEM_VALUE_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged )
     
     EVT_DATAVIEW_ITEM_ACTIVATED(ID_MUSIC_CTRL, MyFrame::OnActivated )
     EVT_DATAVIEW_ITEM_EXPANDING(ID_MUSIC_CTRL, MyFrame::OnExpanding)
     EVT_DATAVIEW_ITEM_EXPANDED(ID_MUSIC_CTRL, MyFrame::OnExpanded)
     EVT_DATAVIEW_ITEM_COLLAPSING(ID_MUSIC_CTRL, MyFrame::OnCollapsing)
     EVT_DATAVIEW_ITEM_COLLAPSED(ID_MUSIC_CTRL, MyFrame::OnCollapsed)
-    EVT_DATAVIEW_ITEM_SELECTED(ID_MUSIC_CTRL, MyFrame::OnSelected)
+    EVT_DATAVIEW_SELECTION_CHANGED(ID_MUSIC_CTRL, MyFrame::OnSelectionChanged)
+    
+    EVT_DATAVIEW_ITEM_EDITING_STARTED(ID_MUSIC_CTRL, MyFrame::OnEditingStarted)
+    EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
     
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick)
     EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)
     EVT_DATAVIEW_COLUMN_SORTED(ID_MUSIC_CTRL, MyFrame::OnSorted)
+
+    EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu)
     
     EVT_RIGHT_UP(MyFrame::OnRightClick)
 END_EVENT_TABLE()
 
-MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
+MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h):
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     m_log = NULL;
+    m_col = NULL;
 
     SetIcon(wxICON(sample));
 
@@ -564,11 +646,11 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 
     m_musicCtrl = new wxDataViewCtrl( this, ID_MUSIC_CTRL, wxDefaultPosition,
                                     wxDefaultSize, wxDV_MULTIPLE );
-
+                                    
     m_music_model = new MyMusicModel;
     m_musicCtrl->AssociateModel( m_music_model.get() );
 
-    wxDataViewColumn *col = m_musicCtrl->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, 
+    /* wxDataViewColumn *col = */ m_musicCtrl->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, 
                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
 #if 0 
     // Call this and sorting is enabled
@@ -576,10 +658,12 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     col->SetSortOrder( true );
 #endif
     
-    m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 200,
+    m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 150,
                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
-    m_musicCtrl->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,
-                                     DEFAULT_ALIGN );
+
+    wxDataViewSpinRenderer *sr = new wxDataViewSpinRenderer( 0, 2010 );
+    wxDataViewColumn *column = new wxDataViewColumn( "year", sr, 2, -1, wxALIGN_CENTRE, wxDATAVIEW_COL_SORTABLE );
+    m_musicCtrl->AppendColumn( column );
 
     data_sizer->Add( m_musicCtrl, 3, wxGROW );
     
@@ -594,7 +678,11 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     m_listCtrl->AssociateModel( m_list_model.get() );
     
     m_listCtrl->AppendTextColumn( "editable string", 0, wxDATAVIEW_CELL_EDITABLE, 120 );
-    m_listCtrl->AppendTextColumn( "index", 1, wxDATAVIEW_CELL_INERT, 120 );
+    m_listCtrl->AppendIconTextColumn( "icon", 1, wxDATAVIEW_CELL_INERT, 60 );
+    
+    wxDataViewTextRendererAttr *ra = new wxDataViewTextRendererAttr;
+    column = new wxDataViewColumn( "attributes", ra, 2 );
+    m_listCtrl->AppendColumn( column );
     
     data_sizer->Add( m_listCtrl, 2, wxGROW );
  
@@ -606,18 +694,57 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     
     button_sizer->Add( new wxButton( this, ID_ADD_MOZART, "Add Mozart"), 0, wxALL, 10 );
     button_sizer->Add( new wxButton( this, ID_DELETE_MUSIC, "Delete selected"), 0, wxALL, 10 );
+    button_sizer->Add( new wxButton( this, ID_DELETE_YEAR, "Delete \"Year\" column"), 0, wxALL, 10 );
     button_sizer->Add( 10, 10, 1 );
     button_sizer->Add( new wxButton( this, ID_PREPEND_LIST, "Prepend"), 0, wxALL, 10 );
     button_sizer->Add( new wxButton( this, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 );
     button_sizer->Add( new wxButton( this, ID_GOTO, "Goto 50"), 0, wxALL, 10 );
     
     main_sizer->Add( button_sizer, 0, wxGROW, 0 );
+
+    wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
     
     m_log = new wxTextCtrl( this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
     wxLogMessage("This is the log window");
 
-    main_sizer->Add( m_log, 1, wxGROW );
+    bottom_sizer->Add( m_log, 1, wxGROW );
+ 
+    // wxDataViewTreeStore
+
+    wxDataViewCtrl *treectrl = new wxDataViewCtrl( this, -1, 
+        wxDefaultPosition, wxSize(300,200), wxDV_NO_HEADER );
+        
+    wxDataViewTreeStore *store = new wxDataViewTreeStore;
+    wxDataViewItem parent = store->AppendContainer( wxDataViewItem(0), "Root 1", wxIcon(small1_xpm) );
+    wxDataViewItem child = store->AppendItem( parent, "Child 1", wxIcon(small1_xpm) );
+    child = store->AppendItem( parent, "Child 2", wxIcon(small1_xpm) );
+    child = store->AppendItem( parent, "Child 3", wxIcon(small1_xpm) );
+    treectrl->AssociateModel( store );
+    store->DecRef();
+
+    treectrl->AppendIconTextColumn( "no label", 0, wxDATAVIEW_CELL_INERT, 200 );
+
+    bottom_sizer->Add( treectrl );
+
+    // wxDataViewTreeCtrl
+
+    wxDataViewTreeCtrl *treectrl2 = new wxDataViewTreeCtrl( this, -1, wxDefaultPosition, wxSize(300,200) );
+    
+    wxImageList *ilist = new wxImageList;
+    ilist->Add( wxIcon(small1_xpm) );
+    treectrl2->SetImageList( ilist );
+    
+    parent = treectrl2->AppendContainer( wxDataViewItem(0), "Root 1", 0 );
+    child = treectrl2->AppendItem( parent, "Child 1", 0 );
+    child = treectrl2->AppendItem( parent, "Child 2", 0 );
+    child = treectrl2->AppendItem( parent, "Child 3", 0 );
+    
+    bottom_sizer->Add( treectrl2 );
+    
+    // main sizer
+    
+    main_sizer->Add( bottom_sizer, 0, wxGROW );
     
     SetSizer( main_sizer );
 }
@@ -629,7 +756,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) )
 {
-    m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", "1787" );
+    m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", 1787 );
 }
 
 void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
@@ -641,6 +768,12 @@ void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
             m_music_model->Delete( items[i] );
 }
 
+void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) )
+{
+    m_musicCtrl->DeleteColumn( m_musicCtrl->GetColumn( 2 ) );
+    FindWindow( ID_DELETE_YEAR )->Disable();
+}
+
 void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
 {
     m_list_model->Prepend( "Test" );
@@ -655,52 +788,61 @@ void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
             m_list_model->DeleteItem( items[i] );
 }
 
-void MyFrame::OnItemAdded( wxDataViewEvent &event )
+void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
         
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, Item Id: %d",event.GetItem().GetID());
+    wxLogMessage( "EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d;  Column: %d", event.GetItem().GetID(), event.GetColumn() );
 }
 
-void MyFrame::OnItemDeleted( wxDataViewEvent &event )
+void MyFrame::OnActivated( wxDataViewEvent &event )
 {
-    if (!m_log)
+    if(!m_log)
         return;
-        
-    wxLogMessage( "EVT_DATAVIEW_MODEL_ITEM_DELETED, Item Id: %d", event.GetItem().GetID() );
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s", title );
 }
 
-void MyFrame::OnValueChanged( wxDataViewEvent &event )
+void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
 {
-    if (!m_log)
+    if(!m_log)
         return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    if (title.empty())
+        title = "None";
         
-    wxLogMessage( "EVT_DATAVIEW_MODEL_VALUE_CHANGED, Item Id: %d;  Column: %d", event.GetItem().GetID(), event.GetColumn() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s", title );
 }
 
-void MyFrame::OnActivated( wxDataViewEvent &event )
+void MyFrame::OnExpanding( wxDataViewEvent &event )
 {
-    if(!m_log)
+    if (!m_log)
         return;
-
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item Id: %d;  Column: %d", event.GetItem().GetID(), event.GetColumn());
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s", title );
 }
 
-void MyFrame::OnSelected( wxDataViewEvent &event )
+
+void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {
-    if(!m_log)
+    if (!m_log)
         return;
-
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, Item Id: %d", event.GetItem().GetID() );
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );
 }
 
-void MyFrame::OnExpanding( wxDataViewEvent &event )
+void MyFrame::OnEditingDone( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
         
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item Id: %d", event.GetItem().GetID() );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );
 }
 
 void MyFrame::OnExpanded( wxDataViewEvent &event )
@@ -708,7 +850,8 @@ void MyFrame::OnExpanded( wxDataViewEvent &event )
     if (!m_log)
         return;
         
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item Id: %d", event.GetItem().GetID() );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s", title );
 }
 
 void MyFrame::OnCollapsing( wxDataViewEvent &event )
@@ -716,23 +859,36 @@ void MyFrame::OnCollapsing( wxDataViewEvent &event )
     if (!m_log)
         return;
         
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item Id: %d", event.GetItem().GetID() );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s", title );
 }
 
 void MyFrame::OnCollapsed( wxDataViewEvent &event )
 {
     if (!m_log)
         return;
-        
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item Id: %d", event.GetItem().GetID() );
+    
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s", title );
+}
+
+void MyFrame::OnContextMenu( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+    
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title );
 }
 
 void MyFrame::OnHeaderClick( wxDataViewEvent &event )
 {
     if(!m_log)
         return;
+        
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
 
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column: %d", event.GetColumn());
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos );
 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
@@ -740,7 +896,9 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
     if(!m_log)
         return;
 
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column: %d", event.GetColumn());
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );
 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )
@@ -748,7 +906,9 @@ void MyFrame::OnSorted( wxDataViewEvent &event )
     if(!m_log)
         return;
 
-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column: %d", event.GetColumn());
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d", pos );
 }
 
 void MyFrame::OnRightClick( wxMouseEvent &event )
@@ -759,10 +919,10 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
     wxLogMessage("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d", event.GetX(), event.GetY());
 }
 
-void MyFrame::OnGoto( wxCommandEvent &event)
+void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event))
 {
     wxDataViewItem item = m_list_model->GetItem( 50 );
-    m_listCtrl->EnsureVisible(item);
+    m_listCtrl->EnsureVisible(item,m_col);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )