Use line width code from GTK+ print in GNOME print

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 694cb30d8b1ee5dd9b9d72d7fd82f1b0dae9fccd..c9fc9840d4569aa33f823a0d16f7ad020c9e370e 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -39,6 +39,63 @@
 #define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
 
 
 #define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
 
 

+// -------------------------------------
+// MySpinCtrlInPlaceRenderer
+// -------------------------------------
+
+class MySpinCtrlInPlaceRenderer: public wxDataViewCustomRenderer
+{
+public:
+    MySpinCtrlInPlaceRenderer() :
+        wxDataViewCustomRenderer( wxT("long"), wxDATAVIEW_CELL_EDITABLE ) { }
+    
+    
+    virtual bool HasEditorCtrl()
+        { 
+            return true; 
+        }
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+        { 
+            long l = value;
+            return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, 
+                    labelRect.GetTopLeft(), labelRect.GetSize(), -0, -1, 2010, l );
+        }
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+        { 
+            wxSpinCtrl *sc = (wxSpinCtrl*) editor;
+            long l = sc->GetValue();
+            value = l;
+            return true;
+        }
+        
+    bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) )
+    {
+        wxString str;
+        str.Printf( wxT("%d"), (int) m_data );
+        dc->SetTextForeground( *wxBLACK );
+        dc->DrawText( str, rect.x, rect.y );
+        return true;
+    }
+    wxSize GetSize() const
+    {
+        return wxSize(80,16);
+    }
+    bool SetValue( const wxVariant &value )
+    {
+        m_data = value.GetLong();
+        return true;
+    }
+    bool GetValue( wxVariant &value ) const
+    {
+        value = m_data;
+        return true;
+    }
+    
+private:
+    long    m_data;
+};
+
+

 
 // -------------------------------------
 // MyMusicModel
 
 // -------------------------------------
 // MyMusicModel


@@ -66,7 +123,7 @@ class MyMusicModelNode
 {
 public:
     MyMusicModelNode( MyMusicModelNode* parent, 
 {
 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;
     { 
         m_parent = parent; 
         m_title = title;


@@ -80,6 +137,7 @@ public:
     { 
         m_parent = parent; 
         m_title = branch;
     { 
         m_parent = parent; 
         m_title = branch;

+        m_year = -1;

         m_isContainer = true;
     }
     
         m_isContainer = true;
     }
     


@@ -106,7 +164,7 @@ public:
 public:
     wxString            m_title;
     wxString            m_artist;
 public:
     wxString            m_title;
     wxString            m_artist;

-    wxString            m_year;
+    int                 m_year;

     
 private:
     MyMusicModelNode   *m_parent;
     
 private:
     MyMusicModelNode   *m_parent;


@@ -127,21 +185,32 @@ public:
         m_pop = new MyMusicModelNode( m_root, "Pop music" );
         m_root->Append( m_pop );
         m_pop->Append( new MyMusicModelNode( m_pop, 
         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, 
         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, 
         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, 
         m_classical->Append( new MyMusicModelNode( m_classical, 

-            "German Requiem", "Johannes Brahms", "1868" ) );
+            "German Requiem", "Johannes Brahms", 1868 ) );

         m_classicalMusicIsKnownToControl = false;
     }
     
         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
 
     // 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 = 
     {
         // add to data
         MyMusicModelNode *child_node = 


@@ -163,15 +232,11 @@ public:
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         wxDataViewItem parent( node->GetParent() );
         
         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;
         node->GetParent()->GetChildren().Remove( node );
         delete node;

+        
+        // notify control
+        ItemDeleted( parent, item );

     }
     
     // override sorting to always sort branches ascendingly
     }
     
     // override sorting to always sort branches ascendingly


@@ -209,6 +274,9 @@ public:
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
 
     virtual wxString GetColumnType( unsigned int col ) const
     {

+        if (col == 2)
+            return "long";
+            

         return "string";
     }
 
         return "string";
     }
 


@@ -220,8 +288,19 @@ public:
         {
             case 0: variant = node->m_title; break;
             case 1: variant = node->m_artist; break;
         {
             case 0: variant = node->m_title; break;
             case 1: variant = node->m_artist; break;

-            case 2: variant = node->m_year; break;
-            default: wxLogError( "MyMusicModel::GetValue: wrong column" );
+            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())
+                {
+                    char *crash = 0;
+                    *crash = 0;
+                }
+            }

         }
     }
 
         }
     }
 


@@ -231,11 +310,12 @@ public:
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         switch (col)
         {
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         switch (col)
         {

-            case 0: node->m_title = variant.GetString(); break;
-            case 1: node->m_artist  = variant.GetString(); break;
-            case 2: node->m_year  = variant.GetString(); break;
+            case 0: node->m_title = variant.GetString(); return true;
+            case 1: node->m_artist  = variant.GetString(); return true;
+            case 2: node->m_year  = variant.GetLong(); return true;

             default: wxLogError( "MyMusicModel::SetValue: wrong column" );
         }
             default: wxLogError( "MyMusicModel::SetValue: wrong column" );
         }

+        return false;

     }
 
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const
     }
 
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const


@@ -264,48 +344,36 @@ public:
         return node->IsContainer();
     }
     
         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)
     {
         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;
         }
         
         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;
 private:
     MyMusicModelNode*   m_root;
     MyMusicModelNode*   m_pop;


@@ -326,6 +394,8 @@ public:
             str.Printf( "row number %d", i );
             m_array.Add( str );
         }
             str.Printf( "row number %d", i );
             m_array.Add( str );
         }

+        
+        m_icon = wxIcon( null_xpm );

     }
     
     // helper methods to change the model
     }
     
     // helper methods to change the model


@@ -347,11 +417,14 @@ public:
     
     virtual unsigned int GetColumnCount() const
     {
     
     virtual unsigned int GetColumnCount() const
     {

-        return 2;
+        return 3;

     }
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
     }
 
     virtual wxString GetColumnType( unsigned int col ) const
     {

+        if (col == 1)
+            return "wxDataViewIconText";
+            

         return "string";
     }
     
         return "string";
     }
     


@@ -366,6 +439,11 @@ public:
         if (col==0)
         {
             variant = m_array[ row ];
         if (col==0)
         {
             variant = m_array[ row ];

+        } else
+        if (col==1)
+        {
+            wxDataViewIconText data( "test", m_icon );
+            variant << data;

         }
         else
         {
         }
         else
         {


@@ -388,6 +466,7 @@ public:
     }
     
     wxArrayString    m_array;
     }
     
     wxArrayString    m_array;

+    wxIcon           m_icon;

 };
 
 // -------------------------------------
 };
 
 // -------------------------------------


@@ -429,7 +508,10 @@ public:
     void OnExpanded( wxDataViewEvent &event );
     void OnCollapsing( wxDataViewEvent &event );
     void OnCollapsed( 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 OnHeaderClick( wxDataViewEvent &event );
     void OnHeaderRightClick( wxDataViewEvent &event );


@@ -444,6 +526,8 @@ private:
     
     wxDataViewCtrl* m_listCtrl;
     wxObjectDataPtr<MyListModel> m_list_model;
     
     wxDataViewCtrl* m_listCtrl;
     wxObjectDataPtr<MyListModel> m_list_model;

+
+    wxDataViewColumn * m_col;

     
     wxTextCtrl    * m_log;
     wxLog *m_logOld;
     
     wxTextCtrl    * m_log;
     wxLog *m_logOld;


@@ -465,7 +549,7 @@ bool MyApp::OnInit(void)
 
     // build the first frame
     MyFrame *frame = 
 
     // 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);
     frame->Show(true);
 
     SetTopWindow(frame);


@@ -495,7 +579,7 @@ enum
      
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,
      
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,

-    ID_GOTO                  = 202
+    ID_GOTO             = 202

 };
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 };
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -517,7 +601,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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_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_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick)
     EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)


@@ -530,6 +617,7 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     m_log = NULL;
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     m_log = NULL;

+    m_col = NULL;

 
     SetIcon(wxICON(sample));
 
 
     SetIcon(wxICON(sample));
 


@@ -558,12 +646,20 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     m_music_model = new MyMusicModel;
     m_musicCtrl->AssociateModel( m_music_model.get() );
 
     m_music_model = new MyMusicModel;
     m_musicCtrl->AssociateModel( m_music_model.get() );
 

-    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 );
                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );

-    m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 200,
+#if 0 
+    // Call this and sorting is enabled
+    // immediatly upon start up.                                    
+    col->SetSortOrder( true );
+#endif
+    
+    m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 150,

                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );

-    m_musicCtrl->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,
-                                     DEFAULT_ALIGN );
+
+    MySpinCtrlInPlaceRenderer *sr = new MySpinCtrlInPlaceRenderer;
+    wxDataViewColumn *column = new wxDataViewColumn( "year", sr, 2, -1, wxALIGN_CENTRE, wxDATAVIEW_COL_SORTABLE );
+    m_musicCtrl->AppendColumn( column );

 
     data_sizer->Add( m_musicCtrl, 3, wxGROW );
     
 
     data_sizer->Add( m_musicCtrl, 3, wxGROW );
     


@@ -578,7 +674,8 @@ 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->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 );
+    m_listCtrl->AppendTextColumn( "index", 2, wxDATAVIEW_CELL_INERT, 120 );

     
     data_sizer->Add( m_listCtrl, 2, wxGROW );
  
     
     data_sizer->Add( m_listCtrl, 2, wxGROW );
  


@@ -613,7 +710,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAddMozart(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) )
 }
 
 void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )


@@ -668,15 +765,20 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
     if(!m_log)
         return;
 
     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_ACTIVATED, Item: %s", title );

 }
 
 }
 

-void MyFrame::OnSelected( wxDataViewEvent &event )
+void MyFrame::OnSelectionChanged( wxDataViewEvent &event )

 {
     if(!m_log)
         return;
 
 {
     if(!m_log)
         return;
 

-    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, Item Id: %d", event.GetItem().GetID() );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    if (title.empty())
+        title = "None";
+        
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s", title );

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


@@ -684,7 +786,27 @@ void MyFrame::OnExpanding( wxDataViewEvent &event )
     if (!m_log)
         return;
         
     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_EXPANDING, Item: %s", title );
+}
+
+
+void MyFrame::OnEditingStarted( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );
+}
+
+void MyFrame::OnEditingDone( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );

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


@@ -692,7 +814,8 @@ void MyFrame::OnExpanded( wxDataViewEvent &event )
     if (!m_log)
         return;
         
     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 )
 }
 
 void MyFrame::OnCollapsing( wxDataViewEvent &event )


@@ -700,23 +823,27 @@ void MyFrame::OnCollapsing( wxDataViewEvent &event )
     if (!m_log)
         return;
         
     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;
 }
 
 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::OnHeaderClick( wxDataViewEvent &event )
 {
     if(!m_log)
         return;
 }
 
 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 )
 }
 
 void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )


@@ -724,7 +851,9 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
     if(!m_log)
         return;
 
     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 )
 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )


@@ -732,7 +861,9 @@ void MyFrame::OnSorted( wxDataViewEvent &event )
     if(!m_log)
         return;
 
     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 )
 }
 
 void MyFrame::OnRightClick( wxMouseEvent &event )


@@ -746,7 +877,7 @@ void MyFrame::OnRightClick( wxMouseEvent &event )
 void MyFrame::OnGoto( wxCommandEvent &event)
 {
     wxDataViewItem item = m_list_model->GetItem( 50 );
 void MyFrame::OnGoto( wxCommandEvent &event)
 {
     wxDataViewItem item = m_list_model->GetItem( 50 );

-    m_listCtrl->EnsureVisible(item);
+    m_listCtrl->EnsureVisible(item,m_col);

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