ensure all topic overviews have an horizontal rule with the list of the sections...

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 5142ea28b4735d6963d0cf59630e3c2f673fccc1..5f9c879d28a6065ca85be572769b1e27a60e4513 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -2,7 +2,7 @@
 // Name:        dataview.cpp
 // Purpose:     wxDataViewCtrl wxWidgets sample
 // Author:      Robert Roebling
 // Name:        dataview.cpp
 // Purpose:     wxDataViewCtrl wxWidgets sample
 // Author:      Robert Roebling

-// Modified by: Francesco Montorsi
+// Modified by: Francesco Montorsi, Bo Yang

 // Created:     06/01/06
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     06/01/06
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling


@@ -28,18 +28,48 @@
 #include "wx/dataview.h"
 #include "wx/spinctrl.h"
 
 #include "wx/dataview.h"
 #include "wx/spinctrl.h"
 

+#include "wx/ptr_shrd.h"
+#include "wx/vector.h"
+

 #ifndef __WXMSW__
     #include "../sample.xpm"
 #endif
 
 #include "null.xpm"
 
 #ifndef __WXMSW__
     #include "../sample.xpm"
 #endif
 
 #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)
 
 
 #define DEFAULT_ALIGN                   wxALIGN_LEFT
 #define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
 

-
-

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


@@ -66,7 +96,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 +110,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 +137,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;


@@ -123,29 +154,46 @@ public:
 
     MyMusicModel() 
     {
 
     MyMusicModel() 
     {

-        m_root = new MyMusicModelNode( NULL, "My Music" );
-        m_pop = new MyMusicModelNode( m_root, "Pop music" );
+        m_root = new MyMusicModelNode( NULL, wxT("My Music" ));
+        m_pop = new MyMusicModelNode( m_root, wxT("Pop music") );

         m_root->Append( m_pop );
         m_pop->Append( new MyMusicModelNode( m_pop, 
         m_root->Append( m_pop );
         m_pop->Append( new MyMusicModelNode( m_pop, 

-            "You are not alone", "Michael Jackson", "1995" ) );
+            wxT("You are not alone"), wxT("Michael Jackson"), 1995 ) );

         m_pop->Append( new MyMusicModelNode( m_pop, 
         m_pop->Append( new MyMusicModelNode( m_pop, 

-            "Take a bow", "Madonna", "1994" ) );
-        m_classical = new MyMusicModelNode( m_root, "Classical music" );
+            wxT("Take a bow"), wxT("Madonna"), 1994 ) );
+        m_classical = new MyMusicModelNode( m_root, wxT("Classical music") );

         m_root->Append( m_classical );
         m_classical->Append( new MyMusicModelNode( m_classical, 
         m_root->Append( m_classical );
         m_classical->Append( new MyMusicModelNode( m_classical, 

-            "Ninth symphony", "Ludwig van Beethoven", "1824" ) );
+            wxT("Ninth symphony"), wxT("Ludwig van Beethoven"), 1824 ) );

         m_classical->Append( new MyMusicModelNode( m_classical, 
         m_classical->Append( new MyMusicModelNode( m_classical, 

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

         m_classicalMusicIsKnownToControl = false;
     }
         m_classicalMusicIsKnownToControl = false;
     }

+
+    ~MyMusicModel()
+    {
+        delete m_root;
+    }
+    
+    // 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 = 
             new MyMusicModelNode( m_classical, title, artist, year );
     {
         // add to data
         MyMusicModelNode *child_node = 
             new MyMusicModelNode( m_classical, title, artist, year );

+        

         m_classical->Append( child_node );
         
         if (m_classicalMusicIsKnownToControl)
         m_classical->Append( child_node );
         
         if (m_classicalMusicIsKnownToControl)


@@ -161,6 +209,7 @@ public:
     {
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         wxDataViewItem parent( node->GetParent() );
     {
         MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
         wxDataViewItem parent( node->GetParent() );

+        

         node->GetParent()->GetChildren().Remove( node );
         delete node;
         
         node->GetParent()->GetChildren().Remove( node );
         delete node;
         


@@ -170,7 +219,8 @@ public:
     
     // override sorting to always sort branches ascendingly
     
     
     // override sorting to always sort branches ascendingly
     

-    int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
+    int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+                 unsigned int column, bool ascending )

     {
         if (IsContainer(item1) && IsContainer(item2))
         {
     {
         if (IsContainer(item1) && IsContainer(item2))
         {


@@ -190,7 +240,7 @@ public:
             return litem1-litem2;
         }
         
             return litem1-litem2;
         }
         

-        return wxDataViewModel::Compare( item1, item2 );
+        return wxDataViewModel::Compare( item1, item2, column, ascending );

     }
 
     // implementation of base class virtuals to define model
     }
 
     // implementation of base class virtuals to define model


@@ -202,7 +252,10 @@ public:
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
 
     virtual wxString GetColumnType( unsigned int col ) const
     {

-        return "string";
+        if (col == 2)
+            return wxT("long");
+            
+        return wxT("string");

     }
 
     virtual void GetValue( wxVariant &variant, 
     }
 
     virtual void GetValue( wxVariant &variant, 


@@ -213,8 +266,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( wxT("MyMusicModel::GetValue: wrong column" ));
+                
+                // provoke a crash when mouse button down
+                wxMouseState state = wxGetMouseState();
+                if (state.ShiftDown())
+                {
+                    char *crash = 0;
+                    *crash = 0;
+                }
+            }

         }
     }
 
         }
     }
 


@@ -224,11 +288,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;
-            default: wxLogError( "MyMusicModel::SetValue: wrong column" );
+            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( wxT("MyMusicModel::SetValue: wrong column") );

         }
         }

+        return false;

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


@@ -257,47 +322,67 @@ 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();
+    // DnD 
+    
+    virtual bool IsDraggable( const wxDataViewItem &item )
+        { 
+            // only drag items
+            return (!IsContainer(item)); 
+        }

         
         

-        // "MyMusic" has no siblings in our model
-        if (node == m_root)
-            return wxDataViewItem(0);
-
-        MyMusicModelNode *parent = node->GetParent();
-        int pos = parent->GetChildren().Index( node );
+    virtual size_t GetDragDataSize( const wxDataViewItem &item, const wxDataFormat &WXUNUSED(format) )
+        {
+            wxPrintf( "GetDragDataSize\n" );

         
         

-        // Something went wrong
-        if (pos == wxNOT_FOUND)
-            return wxDataViewItem(0);
-            
-        // No more children
-        if (pos == parent->GetChildCount()-1)
-            return wxDataViewItem(0);
+            MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
+            wxString data;
+            data += node->m_title; data += wxT(" ");
+            data += node->m_artist;
+            return strlen( data.utf8_str() ) + 1;
+        }
+    virtual bool GetDragData( const wxDataViewItem &item, const wxDataFormat &WXUNUSED(format), 
+                              void* dest, size_t WXUNUSED(size) )
+        {
+            wxPrintf( "GetDragData\n" );

             
             

-        node = parent->GetChildren().Item( pos+1 );
-        return wxDataViewItem( (void*) node );
-    } 
+            MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
+            wxString data;
+            data += node->m_title; data += wxT(" ");
+            data += node->m_artist;
+            wxCharBuffer buffer( data.utf8_str() );
+            memcpy( dest, buffer, strlen(buffer)+1 );
+            return true;
+        }

     
 private:
     MyMusicModelNode*   m_root;
     
 private:
     MyMusicModelNode*   m_root;


@@ -306,19 +391,42 @@ private:
     bool                m_classicalMusicIsKnownToControl;
 };
 
     bool                m_classicalMusicIsKnownToControl;
 };
 

+
+static int my_sort_reverse( int *v1, int *v2 )
+{
+   return *v2-*v1;
+}
+
+static int my_sort( int *v1, int *v2 )
+{
+   return *v1-*v2;
+}
+

 class MyListModel: public wxDataViewIndexListModel
 {
 public:
     MyListModel() : 
 class MyListModel: public wxDataViewIndexListModel
 {
 public:
     MyListModel() : 

-        wxDataViewIndexListModel( 100 )
+#ifdef __WXMAC__
+        wxDataViewIndexListModel( 1000 + 100 )
+#else
+        wxDataViewIndexListModel( 100000 + 100 )
+#endif

     {
     {

+#ifdef __WXMAC__
+        m_virtualItems = 1000;
+#else
+        m_virtualItems = 100000;
+#endif
+

         unsigned int i;
         for (i = 0; i < 100; i++)
         {
             wxString str;
         unsigned int i;
         for (i = 0; i < 100; i++)
         {
             wxString str;

-            str.Printf( "row number %d", i );
+            str.Printf( wxT("row number %d"), i );

             m_array.Add( str );
         }
             m_array.Add( str );
         }

+        
+        m_icon = wxIcon( null_xpm );

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


@@ -332,20 +440,57 @@ public:
     void DeleteItem( const wxDataViewItem &item )
     {
         unsigned int row = GetRow( item );
     void DeleteItem( const wxDataViewItem &item )
     {
         unsigned int row = GetRow( item );

+        if (row >= m_array.GetCount())
+           return;
+           

         m_array.RemoveAt( row );
         RowDeleted( row );
     }
         m_array.RemoveAt( row );
         RowDeleted( row );
     }

+    
+    void DeleteItems( const wxDataViewItemArray &items )
+    {
+        wxArrayInt rows;
+        unsigned int i;
+        for (i = 0; i < items.GetCount(); i++)
+        {
+            unsigned int row = GetRow( items[i] );
+            if (row < m_array.GetCount())
+                rows.Add( row );
+        }
+
+        // Sort in descending order so that the last
+        // row will be deleted first. Otherwise the
+        // remaining indeces would all be wrong.
+        rows.Sort( my_sort_reverse );
+        for (i = 0; i < rows.GetCount(); i++)
+            m_array.RemoveAt( rows[i] );
+
+        // This is just to test if wxDataViewCtrl can
+        // cope with removing rows not sorted in 
+        // descending order
+        rows.Sort( my_sort );
+        RowsDeleted( rows );
+    }
+    
+    void AddMany()
+    {
+        m_virtualItems += 1000;
+        Reset( m_array.GetCount() + m_virtualItems );
+    }

 
     // implementation of base class virtuals to define model
     
     virtual unsigned int GetColumnCount() const
     {
 
     // implementation of base class virtuals to define model
     
     virtual unsigned int GetColumnCount() const
     {

-        return 2;
+        return 3;

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

-        return "string";
+        if (col == 1)
+            return wxT("wxDataViewIconText");
+            
+        return wxT("string");

     }
     
     virtual unsigned int GetRowCount()
     }
     
     virtual unsigned int GetRowCount()


@@ -358,14 +503,43 @@ public:
     {
         if (col==0)
         {
     {
         if (col==0)
         {

-            variant = m_array[ row ];
+            if (row >= m_array.GetCount())
+            {
+                wxString str;
+                str.Printf(wxT("row %d"), row - m_array.GetCount() );
+                variant = str;
+            }
+            else
+            {
+                variant = m_array[ row ];
+            }
+        } else
+        if (col==1)
+        {
+            wxDataViewIconText data( wxT("test"), m_icon );
+            variant << data;
+        } else
+        if (col==2)
+        {
+            if (row >= m_array.GetCount())
+                variant = wxT("plain");
+            else
+                variant = wxT("blue");

         }
         }

-        else
+    }
+    
+    virtual bool GetAttr( unsigned int row, unsigned int col, wxDataViewItemAttr &attr )
+    {
+        if (col != 2)
+            return false;
+            
+        if (row < m_array.GetCount())

         {
         {

-            wxString str;
-            str.Printf( "row %d col %d", row, col );
-            variant = str;
+            attr.SetColour( *wxBLUE );
+            attr.SetItalic( true );

         }
         }

+        
+        return true;            

     }
 
     virtual bool SetValue( const wxVariant &variant, 
     }
 
     virtual bool SetValue( const wxVariant &variant, 


@@ -373,6 +547,9 @@ public:
     {
         if (col == 0)
         {
     {
         if (col == 0)
         {

+            if (row >= m_array.GetCount())
+               return false;
+               

             m_array[row] = variant.GetString();
             return true;
         }
             m_array[row] = variant.GetString();
             return true;
         }


@@ -381,6 +558,8 @@ public:
     }
     
     wxArrayString    m_array;
     }
     
     wxArrayString    m_array;

+    wxIcon           m_icon;
+    int              m_virtualItems;

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


@@ -401,7 +580,8 @@ public:
 class MyFrame : public wxFrame
 {
 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);
+    ~MyFrame();

 
 public:
     void OnQuit(wxCommandEvent& event);
 
 public:
     void OnQuit(wxCommandEvent& event);


@@ -409,13 +589,32 @@ public:
     
     void OnAddMozart(wxCommandEvent& event);
     void OnDeleteMusic(wxCommandEvent& event);
     
     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 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 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);
+    void OnAddMany( wxCommandEvent &event);

 
 private:
     wxDataViewCtrl* m_musicCtrl;
 
 private:
     wxDataViewCtrl* m_musicCtrl;


@@ -423,8 +622,11 @@ private:
     
     wxDataViewCtrl* m_listCtrl;
     wxObjectDataPtr<MyListModel> m_list_model;
     
     wxDataViewCtrl* m_listCtrl;
     wxObjectDataPtr<MyListModel> m_list_model;

+
+    wxDataViewColumn * m_col;

     
     wxTextCtrl    * m_log;
     
     wxTextCtrl    * m_log;

+    wxLog *m_logOld;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -443,7 +645,7 @@ bool MyApp::OnInit(void)
 
     // build the first frame
     MyFrame *frame = 
 
     // build the first frame
     MyFrame *frame = 

-        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 700, 440);
+        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 800, 540);

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


@@ -470,9 +672,12 @@ enum
     
     ID_ADD_MOZART       = 100,
     ID_DELETE_MUSIC     = 101,
     
     ID_ADD_MOZART       = 100,
     ID_DELETE_MUSIC     = 101,

+    ID_DELETE_YEAR      = 102,

      
     ID_PREPEND_LIST     = 200,
      
     ID_PREPEND_LIST     = 200,

-    ID_DELETE_LIST      = 201
+    ID_DELETE_LIST      = 201,
+    ID_GOTO             = 202,
+    ID_ADD_MANY         = 203

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


@@ -480,29 +685,50 @@ 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_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_PREPEND_LIST, MyFrame::OnPrependList )
     EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )

-    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_BUTTON( ID_GOTO, MyFrame::OnGoto)
+    EVT_BUTTON( ID_ADD_MANY, MyFrame::OnAddMany)
+    
+    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_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()
 
 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;
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     m_log = NULL;

+    m_col = NULL;

 
     SetIcon(wxICON(sample));
 
     // build the menus:
 
     wxMenu *file_menu = new wxMenu;
 
     SetIcon(wxICON(sample));
 
     // build the menus:
 
     wxMenu *file_menu = new wxMenu;

-    file_menu->Append(ID_ABOUT, "&About");
+    file_menu->Append(ID_ABOUT, wxT("&About"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(ID_EXIT, "E&xit");
+    file_menu->Append(ID_EXIT, wxT("E&xit"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
     wxMenuBar *menu_bar = new wxMenuBar;

-    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(file_menu, wxT("&File"));

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


@@ -514,17 +740,27 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     // MyMusic
 
     m_musicCtrl = new wxDataViewCtrl( this, ID_MUSIC_CTRL, wxDefaultPosition,
     // MyMusic
 
     m_musicCtrl = new wxDataViewCtrl( this, ID_MUSIC_CTRL, wxDefaultPosition,

-                                    wxDefaultSize );
+                                    wxDefaultSize, wxDV_MULTIPLE );

 
     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, 
-                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
-    m_musicCtrl->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_EDITABLE, 200,
-                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
-    m_musicCtrl->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,
-                                     DEFAULT_ALIGN );
+#if 0 
+    // Call this and sorting is enabled
+    // immediatly upon start up.                                    
+    wxDataViewColumn *col = m_musicCtrl->AppendTextColumn( wxT("Title"), 0, wxDATAVIEW_CELL_INERT, 200, 
+                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE);
+    col->SetSortOrder( true );
+#else
+    m_musicCtrl->AppendTextColumn(wxT("Title"),0,wxDATAVIEW_CELL_INERT,200,DEFAULT_ALIGN,wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE);
+#endif
+    
+    m_musicCtrl->AppendTextColumn( wxT("Artist"), 1, wxDATAVIEW_CELL_EDITABLE, 150,
+                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE);
+
+    wxDataViewSpinRenderer *sr = new wxDataViewSpinRenderer( 0, 2010 );
+    wxDataViewColumn *column = new wxDataViewColumn( wxT("year"), sr, 2, -1, wxALIGN_CENTRE, wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE);
+    m_musicCtrl->AppendColumn( column );

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


@@ -533,13 +769,17 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     // MyList
     
     m_listCtrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
     // MyList
     
     m_listCtrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,

-                                     wxDefaultSize ); 
+                                     wxDefaultSize, wxDV_MULTIPLE | wxDV_ROW_LINES); 

     
     m_list_model = new MyListModel;
     m_listCtrl->AssociateModel( m_list_model.get() );
     
     
     m_list_model = new MyListModel;
     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->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 );
+    m_listCtrl->AppendIconTextColumn(wxT("icon"),            1, wxDATAVIEW_CELL_INERT,     60 );
+    
+    wxDataViewTextRendererAttr *ra = new wxDataViewTextRendererAttr;
+    column = new wxDataViewColumn(wxT("attributes"), ra, 2 );
+    m_listCtrl->AppendColumn( column );

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


@@ -549,21 +789,71 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     
     
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     

-    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_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( 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 );
+    wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 2 );
+    grid_sizer->Add( new wxButton( this, ID_PREPEND_LIST,_("Prepend")),         0, wxALL, 2 );
+    grid_sizer->Add( new wxButton( this, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 2 );
+    grid_sizer->Add( new wxButton( this, ID_GOTO,        _("Goto 50")),         0, wxALL, 2 );
+    grid_sizer->Add( new wxButton( this, ID_ADD_MANY,    _("Add 1000")),        0, wxALL, 2 );
+    button_sizer->Add( grid_sizer, 0, wxALL, 10 );

     
     main_sizer->Add( button_sizer, 0, wxGROW, 0 );
     
     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_log = new wxTextCtrl( this, -1, wxString(), wxDefaultPosition, wxSize(100,200), wxTE_MULTILINE );
+    m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
+    wxLogMessage(_("This is the log window"));
+
+    bottom_sizer->Add( m_log, 1, wxGROW );
+ 
+    // wxDataViewTreeStore
+
+    wxDataViewCtrl *treectrl = new wxDataViewCtrl( this, -1, 
+        wxDefaultPosition, wxSize(100,200), wxDV_NO_HEADER );
+        
+    wxDataViewTreeStore *store = new wxDataViewTreeStore;
+    wxDataViewItem parent = store->AppendContainer( wxDataViewItem(0),wxT("Root 1"), wxIcon(small1_xpm) );
+    wxDataViewItem child = store->AppendItem( parent,wxT("Child 1"), wxIcon(small1_xpm) );
+    child = store->AppendItem( parent,wxT("Child 2"), wxIcon(small1_xpm) );
+    child = store->AppendItem( parent,wxT("Child 3, very long, long, long, long"), wxIcon(small1_xpm) );
+    treectrl->AssociateModel( store );
+    store->DecRef();
+
+    treectrl->AppendIconTextColumn(wxT("no label"), 0, wxDATAVIEW_CELL_INERT, -1 );
+
+    bottom_sizer->Add( treectrl, 1 );
+
+    // wxDataViewTreeCtrl
+
+    wxDataViewTreeCtrl *treectrl2 = new wxDataViewTreeCtrl( this, -1, wxDefaultPosition, wxSize(100,200) );
+    
+    wxImageList *ilist = new wxImageList( 16, 16 );
+    ilist->Add( wxIcon(small1_xpm) );
+    treectrl2->SetImageList( ilist );
+    
+    parent = treectrl2->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 );
+    child = treectrl2->AppendItem( parent,wxT("Child 1"), 0 );
+    child = treectrl2->AppendItem( parent,wxT("Child 2"), 0 );
+    child = treectrl2->AppendItem( parent,wxT("Child 3, very long, long, long, long"), 0 );
+
+    bottom_sizer->Add( treectrl2, 1 );
+    
+    // main sizer

     
     

-    main_sizer->Add( m_log, 1, wxGROW );
+    main_sizer->Add( bottom_sizer, 0, wxGROW );

     
     SetSizer( main_sizer );
 }
 
     
     SetSizer( main_sizer );
 }
 

+MyFrame::~MyFrame()
+{
+    delete wxLog::SetActiveTarget(m_logOld);
+}
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(true);
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(true);


@@ -571,52 +861,180 @@ 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( wxT("Kleine Nachtmusik"), wxT("Wolfgang Mozart"), 1787 );

 }
 
 void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
 {

-    wxDataViewItem item = m_musicCtrl->GetSelection();
-    if (item.IsOk())
-        m_music_model->Delete( item );
+    wxDataViewItemArray items;
+    int len = m_musicCtrl->GetSelections( items );
+    for( int i = 0; i < len; i ++ )
+        if (items[i].IsOk())
+            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) )
 {
 }
 
 void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
 {

-    m_list_model->Prepend( "Test" );
+    m_list_model->Prepend(wxT("Test"));

 }
 
 void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
 {

-    wxDataViewItem item = m_listCtrl->GetSelection();
-    if (item.IsOk())
-        m_list_model->DeleteItem( item );
+    wxDataViewItemArray items;
+    int len = m_listCtrl->GetSelections( items );
+    if (len > 0)
+        m_list_model->DeleteItems( items );
+}
+
+void MyFrame::OnValueChanged( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d;  Column: %d"), event.GetItem().GetID(), event.GetColumn() );
+}
+
+void MyFrame::OnActivated( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title.GetData());

 }
 
 }
 

-void MyFrame::OnItemAdded( wxDataViewEvent &event )
+void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    if (title.empty())
+        title = wxT("None");
+        
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s"), title.GetData() );
+}
+
+void MyFrame::OnExpanding( wxDataViewEvent &event )

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

-    m_log->AppendText( "EVT_DATAVIEW_MODEL_ITEM_ADDED\n" );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s"), title.GetData() );

 }
 
 }
 

-void MyFrame::OnItemDeleted( wxDataViewEvent &event )
+
+void MyFrame::OnEditingStarted( wxDataViewEvent &event )

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

-    m_log->AppendText( "EVT_DATAVIEW_MODEL_ITEM_DELETED\n" );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s"), title.GetData() );

 }
 
 }
 

-void MyFrame::OnValueChanged( wxDataViewEvent &event )
+void MyFrame::OnEditingDone( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s"), title.GetData() );
+}
+
+void MyFrame::OnExpanded( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s"), title.GetData() );
+}
+
+void MyFrame::OnCollapsing( wxDataViewEvent &event )

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

-    m_log->AppendText( "EVT_DATAVIEW_MODEL_VALUE_CHANGED\n" );
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s"), title.GetData() );
+}
+
+void MyFrame::OnCollapsed( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+    
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s"),title.GetData());
+}
+
+void MyFrame::OnContextMenu( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+    
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title.GetData());
+}
+
+void MyFrame::OnHeaderClick( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+        
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos );
+}
+
+void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos );
+}
+
+void MyFrame::OnSorted( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos );

 }
 
 }
 

+void MyFrame::OnRightClick( wxMouseEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), event.GetX(), event.GetY());
+}
+
+void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event))
+{
+    wxDataViewItem item = m_list_model->GetItem( 50 );
+    m_listCtrl->EnsureVisible(item,m_col);
+}
+
+void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event))
+{
+    m_list_model->AddMany();
+}
+
+

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
     wxAboutDialogInfo info;
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
     wxAboutDialogInfo info;