regenerate after the recent changes (wxDataViewCtrl enabled by default, socket sample...

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 2b013e6d9a45cf1b8b65779c3a10abf54a060ef2..3f4e207444ed3963bfbc21e98f8f66c4a2ac51ca 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


@@ -34,12 +34,41 @@
 
 #include "null.xpm"
 
 
 #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
 // -------------------------------------


@@ -65,23 +94,22 @@ WX_DEFINE_ARRAY_PTR( MyMusicModelNode*, MyMusicModelNodes );
 class MyMusicModelNode
 {
 public:
 class MyMusicModelNode
 {
 public:

-    MyMusicModelNode( MyMusicModelNode* parent, const wxUint32 id,
-                      const wxString &title, const wxString &artist, const wxString &year )
+    MyMusicModelNode( MyMusicModelNode* parent, 
+                      const wxString &title, const wxString &artist, int year )

     { 
         m_parent = parent; 
     { 
         m_parent = parent; 

-        m_id = id;

         m_title = title;
         m_artist = artist;
         m_year = year;
         m_isContainer = false;
     }
     
         m_title = title;
         m_artist = artist;
         m_year = year;
         m_isContainer = false;
     }
     

-    MyMusicModelNode( MyMusicModelNode* parent, const wxUint32 id,
+    MyMusicModelNode( MyMusicModelNode* parent,

                       const wxString &branch )
     { 
         m_parent = parent; 
                       const wxString &branch )
     { 
         m_parent = parent; 

-        m_id = id;

         m_title = branch;
         m_title = branch;

+        m_year = -1;

         m_isContainer = true;
     }
     
         m_isContainer = true;
     }
     


@@ -96,7 +124,6 @@ public:
         }
     }
 
         }
     }
 

-    wxUint32 GetID()                                      { return m_id; }

     bool IsContainer()                                    { return m_isContainer; }
 
     MyMusicModelNode* GetParent()                         { return m_parent; }
     bool IsContainer()                                    { return m_isContainer; }
 
     MyMusicModelNode* GetParent()                         { return m_parent; }


@@ -109,12 +136,11 @@ 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;
     MyMusicModelNodes   m_children; 
     
 private:
     MyMusicModelNode   *m_parent;
     MyMusicModelNodes   m_children; 

-    wxUint32            m_id;

     bool                m_isContainer;
 };
 
     bool                m_isContainer;
 };
 


@@ -122,40 +148,96 @@ private:
 class MyMusicModel: public wxDataViewModel
 {
 public:
 class MyMusicModel: public wxDataViewModel
 {
 public:

+
+    // constructor
+

     MyMusicModel() 
     {
     MyMusicModel() 
     {

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

         m_root->Append( m_pop );
         m_root->Append( m_pop );

-        m_pop->Append( new MyMusicModelNode( m_pop, GetNewId(), 
-            "You are not alone", "Michael Jackson", "1995" ) );
-        m_pop->Append( new MyMusicModelNode( m_pop, GetNewId(), 
-            "Take a bow", "Madonna", "1994" ) );
-        m_classical = new MyMusicModelNode( m_root, GetNewId(), "Classical music" );
+        m_pop->Append( new MyMusicModelNode( m_pop, 
+            "You are not alone", "Michael Jackson", 1995 ) );
+        m_pop->Append( new MyMusicModelNode( m_pop, 
+            "Take a bow", "Madonna", 1994 ) );
+        m_classical = new MyMusicModelNode( m_root, "Classical music" );

         m_root->Append( m_classical );
         m_root->Append( m_classical );

-        m_classical->Append( new MyMusicModelNode( m_classical, GetNewId(), 
-            "Ninth symphony", "Ludwig van Beethoven", "1824" ) );
-        m_classical->Append( new MyMusicModelNode( m_classical, GetNewId(), 
-            "German Requiem", "Johannes Brahms", "1868" ) );
+        m_classical->Append( new MyMusicModelNode( m_classical, 
+            "Ninth symphony", "Ludwig van Beethoven", 1824 ) );
+        m_classical->Append( new MyMusicModelNode( m_classical, 
+            "German Requiem", "Johannes Brahms", 1868 ) );

         m_classicalMusicIsKnownToControl = false;
     }
     
         m_classicalMusicIsKnownToControl = false;
     }
     

-    void AddToClassical( const wxString &title, const wxString &artist, const wxString &year )
+    // 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, int year )

     {
         // add to data
         MyMusicModelNode *child_node = 
     {
         // add to data
         MyMusicModelNode *child_node = 

-            new MyMusicModelNode( m_classical, GetNewId(), title, artist, year );
+            new MyMusicModelNode( m_classical, title, artist, year );
+        

         m_classical->Append( child_node );
         
         if (m_classicalMusicIsKnownToControl)
         {
             // notify control
         m_classical->Append( child_node );
         
         if (m_classicalMusicIsKnownToControl)
         {
             // notify control

-            wxDataViewItem child( child_node->GetID() );
-            wxDataViewItem parent( m_classical->GetID() );
+            wxDataViewItem child( (void*) child_node );
+            wxDataViewItem parent( (void*) m_classical );

             ItemAdded( parent, child );
         }
     }
             ItemAdded( parent, child );
         }
     }

+
+    void Delete( const wxDataViewItem &item )
+    {
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
+        wxDataViewItem parent( node->GetParent() );
+        
+        node->GetParent()->GetChildren().Remove( node );
+        delete node;
+        
+        // notify control
+        ItemDeleted( parent, item );
+    }
+    
+    // override sorting to always sort branches ascendingly
+    
+    int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+                 unsigned int column, bool ascending )
+    {
+        if (IsContainer(item1) && IsContainer(item2))
+        {
+            wxVariant value1,value2;
+            GetValue( value1, item1, 0 );
+            GetValue( value2, item2, 0 );
+
+            wxString str1 = value1.GetString();
+            wxString str2 = value2.GetString();
+            int res = str1.Cmp( str2 );
+            if (res) return res;
+            
+            // items must be different
+            unsigned long litem1 = (unsigned long) item1.GetID();    
+            unsigned long litem2 = (unsigned long) item2.GetID();    
+
+            return litem1-litem2;
+        }
+        
+        return wxDataViewModel::Compare( item1, item2, column, ascending );
+    }
+
+    // implementation of base class virtuals to define model

     
     virtual unsigned int GetColumnCount() const
     {
     
     virtual unsigned int GetColumnCount() const
     {


@@ -164,118 +246,277 @@ public:
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
 
     virtual wxString GetColumnType( unsigned int col ) const
     {

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

         return "string";
     }
 
     virtual void GetValue( wxVariant &variant, 
                            const wxDataViewItem &item, unsigned int col ) const
     {
         return "string";
     }
 
     virtual void GetValue( wxVariant &variant, 
                            const wxDataViewItem &item, unsigned int col ) const
     {

-        MyMusicModelNode *node = FindNode( item );
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();

         switch (col)
         {
             case 0: variant = node->m_title; break;
             case 1: variant = node->m_artist; break;
         switch (col)
         {
             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;
+                }
+            }

         }
     }
 
     virtual bool SetValue( const wxVariant &variant, 
                            const wxDataViewItem &item, unsigned int col )
     {
         }
     }
 
     virtual bool SetValue( const wxVariant &variant, 
                            const wxDataViewItem &item, unsigned int col )
     {

-        MyMusicModelNode *node = FindNode( item );
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();

         switch (col)
         {
         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 bool HasChildren( const wxDataViewItem &item ) const
+    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const

     {
     {

-        if (item.GetID() == 0)
+        // the invisble root node has no parent
+        if (!item.IsOk())
+            return wxDataViewItem(0);
+            
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
+        
+        // "MyMusic" also has no parent
+        if (node == m_root)
+            return wxDataViewItem(0);
+            
+        return wxDataViewItem( (void*) node->GetParent() );
+    }
+
+    virtual bool IsContainer( const wxDataViewItem &item ) const
+    {
+        // the invisble root node can have children (in
+        // our model always "MyMusic")
+        if (!item.IsOk())

             return true;
     
             return true;
     

-        MyMusicModelNode *node = FindNode( item );
+        MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();

         return node->IsContainer();
     }
     
         return node->IsContainer();
     }
     

-    virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const
+    virtual unsigned int GetChildren( const wxDataViewItem &parent, wxDataViewItemArray &array ) const

     {
     {

-        if (parent.GetID() == 0)
-            return wxDataViewItem( m_root->GetID() );
+        MyMusicModelNode *node = (MyMusicModelNode*) parent.GetID();
+        if (!node)
+        {
+            array.Add( wxDataViewItem( (void*) m_root ) );
+            return 1;
+        }

         
         

-        MyMusicModelNode *node = FindNode( parent );
-            
-        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( first_child->GetID() );
+        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
+private:
+    MyMusicModelNode*   m_root;
+    MyMusicModelNode*   m_pop;
+    MyMusicModelNode*   m_classical;
+    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() : 
+#ifdef __WXMAC__
+        wxDataViewIndexListModel( 1000 + 100 )
+#else
+        wxDataViewIndexListModel( 100000 + 100 )
+#endif

     {
     {

-        MyMusicModelNode *node = FindNode( item );
-        MyMusicModelNode *parent = node->GetParent();
-        if (!parent)
-            return wxDataViewItem(0);
+#ifdef __WXMAC__
+        m_virtualItems = 1000;
+#else
+        m_virtualItems = 100000;
+#endif

 
 

-        int pos = parent->GetChildren().Index( node );
-        if (pos == wxNOT_FOUND)
-            return wxDataViewItem(0);
-            
-        if (pos == parent->GetChildCount()-1)
-            return wxDataViewItem(0);
-            
-        node = parent->GetChildren().Item( pos+1 );
-        return wxDataViewItem( node->GetID() );
-    } 
-    
-private:
-    wxUint32 GetNewId() { m_idCounter++; return m_idCounter; }
+        unsigned int i;
+        for (i = 0; i < 100; i++)
+        {
+            wxString str;
+            str.Printf( "Test %d", i );
+            m_array.Add( str );
+        }
+        
+        m_icon = wxIcon( null_xpm );
+    }

     
     

-    MyMusicModelNode *FindNodeRec( MyMusicModelNode *node, const wxDataViewItem &item ) const
+    // helper methods to change the model
+
+    void Prepend( const wxString &text )
+    {
+        m_array.Insert( text, 0 );
+        RowPrepended();
+    }
+
+    void DeleteItem( const wxDataViewItem &item )

     {
     {

-        if (node->GetID() == item.GetID())
-            return node;
+        unsigned int row = GetRow( item );
+        if (row >= m_array.GetCount())
+           return;
+           
+        m_array.RemoveAt( row );
+        RowDeleted( row );
+    }

     
     

-        size_t count = node->GetChildCount();
-        size_t i;
-        for (i = 0; i < count; i++)
+    void DeleteItems( const wxDataViewItemArray &items )
+    {
+        wxArrayInt rows;
+        unsigned int i;
+        for (i = 0; i < items.GetCount(); i++)

         {
         {

-            MyMusicModelNode *child = node->GetChildren().Item( i );
-            MyMusicModelNode *node2 = FindNodeRec( child, item );
-            if (node2)
-                return node2;
+            unsigned int row = GetRow( items[i] );
+            if (row < m_array.GetCount())
+                rows.Add( row );

         }
         }

-        return NULL;
+
+        // 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

     
     

-    MyMusicModelNode *FindNode( const wxDataViewItem &item ) const
+    virtual unsigned int GetColumnCount() const
+    {
+        return 3;
+    }
+
+    virtual wxString GetColumnType( unsigned int col ) const

     {
     {

-        if (item.GetID() == 0)
-            return NULL;
+        if (col == 1)
+            return "wxDataViewIconText";

             
             

-        if (!m_root)
-            return NULL;
+        return "string";
+    }
+    
+    virtual void GetValue( wxVariant &variant, 
+                           unsigned int row, unsigned int col ) const
+    {
+        if (col==0)
+        {
+            if (row >= m_array.GetCount())
+            {
+                wxString str;
+                str.Printf( "row %d", row - m_array.GetCount() );
+                variant = str;
+            }
+            else
+            {
+                variant = m_array[ row ];
+            }
+        } else
+        if (col==1)
+        {
+            wxDataViewIconText data( "test", m_icon );
+            variant << data;
+        } else
+        if (col==2)
+        {
+            if (row >= m_array.GetCount())
+                variant = "plain";
+            else
+                variant = "blue";
+        }
+    }
+    
+    virtual bool GetAttr( unsigned int row, unsigned int col, wxDataViewItemAttr &attr )
+    {
+        if (col != 2)
+            return false;

             
             

-        return FindNodeRec( m_root, item );
+        if (row < m_array.GetCount())
+        {
+            attr.SetColour( *wxBLUE );
+            attr.SetItalic( true );
+        }
+        
+        return true;            

     }
 
     }
 

-    MyMusicModelNode*   m_root;
-    MyMusicModelNode*   m_pop;
-    MyMusicModelNode*   m_classical;
-    bool                m_classicalMusicIsKnownToControl;
-    wxUint32            m_idCounter;
+    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;
+        }
+    
+        return false;
+    }
+    
+    wxArrayString    m_array;
+    wxIcon           m_icon;
+    int              m_virtualItems;

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


@@ -296,17 +537,52 @@ 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);

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

-    void OnAdd(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 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:
 
 private:

-    wxDataViewCtrl* m_dataview;
+    wxDataViewCtrl* m_musicCtrl;
+    wxObjectDataPtr<MyMusicModel> m_music_model;
+    
+    wxDataViewCtrl* m_listCtrl;
+    wxObjectDataPtr<MyListModel> m_list_model;
+
+    wxDataViewColumn * m_col;
+    

     wxTextCtrl    * m_log;
     wxTextCtrl    * m_log;

-    wxObjectDataPtr<MyMusicModel> m_model;
+    wxLog *m_logOld;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -325,7 +601,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);


@@ -348,18 +624,56 @@ enum
     ID_ABOUT = wxID_ABOUT,
     ID_EXIT = wxID_EXIT,
     
     ID_ABOUT = wxID_ABOUT,
     ID_EXIT = wxID_EXIT,
     

-    ID_ADD = 100,
+    ID_MUSIC_CTRL       = 50,
+    
+    ID_ADD_MOZART       = 100,
+    ID_DELETE_MUSIC     = 101,
+    ID_DELETE_YEAR      = 102,
+     
+    ID_PREPEND_LIST     = 200,
+    ID_DELETE_LIST      = 201,
+    ID_GOTO             = 202,
+    ID_ADD_MANY         = 203

 };
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
     EVT_MENU( ID_EXIT, MyFrame::OnQuit )
 };
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
     EVT_MENU( ID_EXIT, MyFrame::OnQuit )

-    EVT_BUTTON( ID_ADD, MyFrame::OnAdd )
+    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_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))
 {
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {

+    m_log = NULL;
+    m_col = NULL;
+

     SetIcon(wxICON(sample));
 
     // build the menus:
     SetIcon(wxICON(sample));
 
     // build the menus:


@@ -377,30 +691,114 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
 

-    m_dataview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
-                                     wxDefaultSize );
+    wxBoxSizer *data_sizer = new wxBoxSizer( wxHORIZONTAL );

 
 

-    m_model = new MyMusicModel;
-    m_dataview->AssociateModel( m_model.get() );
+    // MyMusic

 
 

-    m_dataview->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, 
+    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, 

                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
                                      DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );

-    m_dataview->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_INERT, 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_dataview->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,
-                                     DEFAULT_ALIGN );

 
 

-    main_sizer->Add( m_dataview, 2, wxGROW );
+    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 );
+    
+#if 1   
+    
+    // MyList
+    
+    m_listCtrl = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
+                                     wxDefaultSize, wxDV_MULTIPLE ); 
+    
+    m_list_model = new MyListModel;
+    m_listCtrl->AssociateModel( m_list_model.get() );
+    
+    m_listCtrl->AppendTextColumn( "editable string", 0, wxDATAVIEW_CELL_EDITABLE, 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 );
+ 
+#endif   
+
+    main_sizer->Add( data_sizer, 2, wxGROW );

     
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     
     
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     

-    button_sizer->Add( new wxButton( this, ID_ADD, "Add Mozart"), 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 );
+    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, 0, 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, "", wxDefaultPosition, wxDefaultSize, 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(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( 16, 16 );
+    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 );

     
     

-    main_sizer->Add( m_log, 1, wxGROW );
+    bottom_sizer->Add( treectrl2 );
+    
+    // main sizer
+    
+    main_sizer->Add( bottom_sizer, 0, wxGROW );

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


@@ -410,25 +808,182 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
     Close(true);
 }
 
     Close(true);
 }
 

-void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) )

 {
 {

-#if 0
-    // ignore selection, do something better later
-    wxDataViewItem item = m_dataview->GetSelection();
-    if (item.IsOk())
-    {
-        if (m_model->HasChildren(item))
-        {
-        }
-        else
-        {
-        }
-    }
-#endif    
-  
-    m_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", "1787" );
+    m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", 1787 );
+}
+
+void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
+{
+    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) )
+{
+    m_list_model->Prepend( "Test" );
+}
+
+void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
+{
+    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( "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("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s", title );
+}
+
+void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    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 )
+{
+    if (!m_log)
+        return;
+        
+    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 )
+{
+    if (!m_log)
+        return;
+        
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage("wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s", title );
+}
+
+void MyFrame::OnCollapsing( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+        
+    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;
+    
+    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 position: %d", pos );
+}
+
+void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage("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("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());
+}
+
+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;