Move wxMBConv_cf out of strconv.cpp and into strconv_cf.(cpp|h) by forking the files...

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index a58827d5de085862ab68a9df3d4843517b1aa2b8..9a80b8196a7dbdfcff89b2db92112d3e69e6ae2a 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dataview.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dataview.cpp

-// Purpose:     DataVewCtrl  wxWidgets sample
+// Purpose:     wxDataViewCtrl wxWidgets sample

 // Author:      Robert Roebling
 // Author:      Robert Roebling

-// Modified by:
+// Modified by: Francesco Montorsi

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


@@ -17,201 +17,215 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 
 #endif
 

+#include "wx/datetime.h"
+#include "wx/splitter.h"
+#include "wx/aboutdlg.h"
+#include "wx/choicdlg.h"
+#include "wx/numdlg.h"
+#include "wx/dataview.h"
+#include "wx/spinctrl.h"
+

 #ifndef __WXMSW__
 #ifndef __WXMSW__

-#include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #endif
 

-#include "wx/dataview.h"
+#include "null.xpm"
+
+
+#define DEFAULT_ALIGN                   wxALIGN_LEFT
+#define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
+
+

 
 // -------------------------------------
 
 // -------------------------------------

-// MyTextModel
+// MyMusicModel

 // -------------------------------------
 
 // -------------------------------------
 

-WX_DECLARE_LIST(wxDateTime,wxArrayDate);
-#include <wx/listimpl.cpp>
-WX_DEFINE_LIST(wxArrayDate);
-
-class MyTextModel: public wxDataViewListModel
+/*
+Implement this data model
+            Title               Artist               Year
+-------------------------------------------------------------
+1: My Music:
+    2:  Pop music
+        3:  You are not alone   Michael Jackson      1995
+        4:  Take a bow          Madonna              1994
+    5:  Classical music
+        6:  Ninth Symphony      Ludwig v. Beethoven  1824
+        7:  German Requiem      Johannes Brahms      1868
+*/
+
+
+class MyMusicModel: public wxDataViewModel

 {
 public:
 {
 public:

-    MyTextModel() 
+    MyMusicModel() {}
+    
+    virtual unsigned int GetColumnCount() const

     {
     {

-        size_t i;
-        for (i = 0; i < 1000; i++)
-            m_list.Add( wxT("Test") );
-        for (i = 0; i < 500; i++)
-            { m_bools.Add( 0 ); m_bools.Add( 1 ); }
-        for (i = 0; i < 500; i++)
-            { m_colours.Add( wxT("red") ); m_colours.Add( wxT("green") ); }
-        for (i = 0; i < 1000; i++)
-            { m_progress.Add( i/10 ); }
-        for (i = 0; i < 1000; i++)
-            { 
-                wxDateTime *date = new wxDateTime( wxDateTime::Now() );
-                m_dates.Append( date ); 
-            }
+        return 3;

     }
     }

-    
-    virtual size_t GetNumberOfRows() 
-        { return 1000; }
-    virtual size_t GetNumberOfCols()
-        { return 7; }
-        
-    // as reported by wxVariant
-    virtual wxString GetColType( size_t col )
-        {
-            if (col == 6)
-                return wxT("datetime");
-                
-            if (col == 5)
-                return wxT("long");
-                
-            if (col == 3)
-                return wxT("bool");
-                 
-            return wxT("string"); 
-        }
-        
-    virtual wxVariant GetValue( size_t col, size_t row )
+
+    virtual wxString GetColumnType( unsigned int col ) const
+    {
+        return "string";
+    }
+
+    virtual void GetValue( wxVariant &variant, 
+                           const wxDataViewItem &item, unsigned int col ) const
+    {
+        variant = wxString("");
+        int ID = item.GetID();
+        switch (ID)

         {
         {

-            if (col == 6)
-            {
-                return (wxDateTime) *m_dates[row];
-            } else
-            if (col == 5)
-            {
-                return (long) m_progress[row];
-            } else
-            if (col == 4)
+            case 1: if (col == 0) variant = wxString("My Music"); break;
+            case 2: if (col == 0) variant = wxString("Pop music"); break;
+            case 5: if (col == 0) variant = wxString("Classical music"); break;
+            case 3:

             {
             {

-                return m_colours[row];
-            } else
-            if (col == 3)
-            {
-                return (bool) m_bools[row];
-            } else 
-            if (col == 2)
-            {
-                return m_list[row];
+                switch (col)
+                {
+                    case 0: variant = wxString("You are not alone"); break;
+                    case 1: variant = wxString("Michael Jackson"); break;
+                    case 2: variant = wxString("1995");
+                }

             }
             }

-            else
+            break;
+            case 4:

             {
             {

-                wxString tmp; 
-                tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 
-                return tmp;
+                switch (col)
+                {
+                    case 0: variant = wxString("Take a bow"); break;
+                    case 1: variant = wxString("Madonna"); break;
+                    case 2: variant = wxString("1994");
+                }

             }
             }

-        }
-    virtual bool SetValue( wxVariant &value, size_t col, size_t row )
-        {
-            if (col == 6)
-            {
-                *m_dates[row] = value.GetDateTime();
-            } else
-            if (col == 3)
+            break;
+            case 6:

             {
             {

-                m_bools[row] = (int) value.GetBool();
-            } else
-            if (col == 2)
+                switch (col)
+                {
+                    case 0: variant = wxString("Ninth symphony"); break;
+                    case 1: variant = wxString("Ludwig v. Beethoven"); break;
+                    case 2: variant = wxString("1824");
+                }
+            }
+            break;
+            case 7:

             {
             {

-                m_list[row] = value.GetString();
+                switch (col)
+                {
+                    case 0: variant = wxString("German requiem"); break;
+                    case 1: variant = wxString("Johannes Brahms"); break;
+                    case 2: variant = wxString("1868");
+                }

             }
             }

-            return true;
+            break;

         }
         }

-    
-    wxArrayString m_list;
-    wxArrayInt    m_bools;
-    wxArrayString m_colours;
-    wxArrayInt    m_progress;
-    wxArrayDate   m_dates;
-};
-
-// -------------------------------------
-// MyCustomCell
-// -------------------------------------
-
-class MyCustomCell: public wxDataViewCustomCell
-{
-public:
-    MyCustomCell() :
-        wxDataViewCustomCell( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE ) 
-    { 
-        m_colour = wxT("black"); 
+            

     }
     }

-    bool SetValue( const wxVariant &value )
+
+    virtual bool SetValue( const wxVariant &variant, 
+                           const wxDataViewItem &item, unsigned int col )

     {
     {

-        m_colour = value.GetString();
+        // readonly

         return true;
     }
         return true;
     }

-    bool Render( wxRect rect, wxDC *dc, int state )
-    {   
-        dc->SetPen( *wxBLACK_PEN );
-        if (m_colour == wxT("red"))
-            dc->SetBrush( *wxRED_BRUSH );
-        else if (m_colour == wxT("green"))
-            dc->SetBrush( *wxGREEN_BRUSH );
-        else 
-            dc->SetBrush( *wxBLACK_BRUSH );
-        dc->DrawRectangle( rect );
-        return true;
-    }
-    wxSize GetSize()
+
+    virtual bool HasChildren( const wxDataViewItem &item ) const

     {
     {

-        return wxSize(20,8);
+        int ID = item.GetID();
+        return ((ID == 1) || (ID == 2) || (ID == 5));

     }
     }

-    bool Activate( wxRect rect,
-                   wxDataViewListModel *model, size_t col, size_t row )
+    
+    virtual int GetChildCount( const wxDataViewItem &item ) const

     {
     {

-        return false;
+        int ID = item.GetID();
+        switch (ID)
+        {
+            case 1: return 2;
+            case 2: return 2;
+            case 5: return 2;
+        }
+        return 0;

     }
     }

-
-private:
-    wxString m_colour;    
-};
-
-// -------------------------------------
-// MyUnsortedTextModel
-// -------------------------------------
-
-class MyUnsortedTextModel: public wxDataViewListModel
-{
-public:
-    MyUnsortedTextModel()
+    virtual wxDataViewItem GetParent( const wxDataViewItem &child ) const

     {
     {

-        m_list.Add( wxT("This") );
-        m_list.Add( wxT("is") );
-        m_list.Add( wxT("an") );
-        m_list.Add( wxT("unsorted") );
-        m_list.Add( wxT("list") );
-        m_list.Add( wxT("of") );
-        m_list.Add( wxT("words.") );
+        int ID = child.GetID();
+        switch (ID)
+        {
+            case 2:
+            case 5: return wxDataViewItem( 1 );
+            case 3:
+            case 4: return wxDataViewItem( 2 );
+            case 6:
+            case 7: return wxDataViewItem( 5 );
+        }
+        
+        return wxDataViewItem(0);

     }
     }

-
-    virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
-    virtual size_t GetNumberOfCols() { return 2; }
-    virtual wxString GetColType( size_t col ) { return wxT("string"); }
-    virtual wxVariant GetValue( size_t col, size_t row )
+    virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const

     {
     {

-        if (col == 0)
-            return m_list[row];
-        wxString tmp;
-        tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 
-        return tmp;
+        int ID = parent.GetID();
+        switch (ID)
+        {
+            case 1: return wxDataViewItem( 2 );
+            case 2: return wxDataViewItem( 3 );
+            case 5: return wxDataViewItem( 6 );
+        }
+        
+        return wxDataViewItem(0);

     }
     }

-    virtual bool SetValue( wxVariant &variant, size_t col, size_t row )
+    virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const

     {
     {

-        if (col == 0)
+        int ID = item.GetID();
+        switch (ID)

         {
         {

-            m_list[row] = variant.GetString();
-            return true;
+            case 2: return wxDataViewItem( 5 );
+            case 3: return wxDataViewItem( 4 );
+            case 6: return wxDataViewItem( 7 );

         }
         }

-        return false;

         
         

+        return wxDataViewItem(0);
+    }
+    virtual wxDataViewItem GetNthChild(  const wxDataViewItem &parent, unsigned int n ) const
+    {
+        if (!parent.IsOk())
+        {
+            // root node
+            if (n == 0)
+                return wxDataViewItem( 1 );
+                
+            return wxDataViewItem( 0 );
+        }
+    
+        int ID = parent.GetID();
+        switch (ID)
+        {
+            case 1:
+            {
+                if (n == 0) return wxDataViewItem( 2 );
+                else if (n == 1) return wxDataViewItem( 5 );
+            }
+            break;
+            case 2: 
+            {
+                if (n == 0) return wxDataViewItem( 3 );
+                else if (n == 1) return wxDataViewItem( 4 );
+            }
+            break;
+            case 5:
+            {
+                if (n == 0) return wxDataViewItem( 6 );
+                else if (n == 1) return wxDataViewItem( 7 );
+            }
+            break;
+        }
+    
+        return wxDataViewItem(0);

     }
     }

-
-    wxArrayString m_list;

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


@@ -222,13 +236,14 @@ class MyApp: public wxApp
 {
 public:
     bool OnInit(void);
 {
 public:
     bool OnInit(void);

+    int OnExit();

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

-class MyFrame: public wxFrame
+class MyFrame : public wxFrame

 {
 public:
     MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
 {
 public:
     MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);


@@ -236,56 +251,11 @@ public:
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

-    
-private:
-    wxDataViewCtrl* dataview_left;
-    wxDataViewCtrl* dataview_right;
-};

 
 

-// -------------------------------------
-// MySortingFrame
-// -------------------------------------
-
-enum my_events
-{
-    ID_APPEND_ROW_LEFT = 1000,
-    ID_PREPEND_ROW_LEFT,
-    ID_INSERT_ROW_LEFT,
-    ID_DELETE_ROW_LEFT,
-    ID_EDIT_ROW_LEFT,
-    
-    ID_APPEND_ROW_RIGHT,
-    ID_PREPEND_ROW_RIGHT,
-    ID_INSERT_ROW_RIGHT,
-    ID_DELETE_ROW_RIGHT,
-    ID_EDIT_ROW_RIGHT
-};
-
-class MySortingFrame: public wxFrame
-{
-public:
-    MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
+private:
+    wxDataViewCtrl* m_dataview;

 
 

-public:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    
-    void OnAppendRowLeft(wxCommandEvent& event);
-    void OnPrependRowLeft(wxCommandEvent& event);
-    void OnInsertRowLeft(wxCommandEvent& event);
-    void OnDeleteRowLeft(wxCommandEvent& event);
-    void OnEditRowLeft(wxCommandEvent& event);
-    
-    void OnAppendRowRight(wxCommandEvent& event);
-    void OnPrependRowRight(wxCommandEvent& event);
-    void OnInsertRowRight(wxCommandEvent& event);
-    void OnDeleteRowRight(wxCommandEvent& event);
-    void OnEditRowRight(wxCommandEvent& event);
-    

 private:
 private:

-    wxDataViewCtrl* dataview_left;
-    wxDataViewCtrl* dataview_right;
-    

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -293,251 +263,88 @@ private:
 // MyApp
 // -------------------------------------
 
 // MyApp
 // -------------------------------------
 

-#define DYNAMIC_QUIT   wxID_EXIT
-#define DYNAMIC_ABOUT  wxID_ABOUT
-
-IMPLEMENT_APP  (MyApp)
+IMPLEMENT_APP(MyApp)

 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
-    frame->Show(true);
+    if ( !wxApp::OnInit() )
+        return false;

 
 

-    MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 350, 600, 300);
-    frame2->Show(true);
+    // build the first frame
+    MyFrame *frame = 
+        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
+    frame->Show(true);

 
     SetTopWindow(frame);
 
     SetTopWindow(frame);

-

     return true;
 }
 
     return true;
 }
 

-// -------------------------------------
-// MyFrame
-// -------------------------------------
-
-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))
+int MyApp::OnExit()

 {
 {

-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#else
-    SetIcon(wxIcon(mondrian_xpm));
-#endif
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
-    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, _T("&File"));
-    SetMenuBar(menu_bar);
-
-    // You used to have to do some casting for param 4, but now there are type-safe handlers
-    Connect( DYNAMIC_QUIT,  wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnQuit) );
-    Connect( DYNAMIC_ABOUT, wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
-
-    CreateStatusBar();
-    
-    
-    // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, -1 );
-    
-    MyTextModel *model = new MyTextModel;
-    dataview_left->AssociateModel( model );
-    
-    dataview_left->AppendTextColumn( wxT("first"), 0 );
-    dataview_left->AppendTextColumn( wxT("second"), 1 );
-
-    wxDataViewTextCell *text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 2 );
-    dataview_left->AppendColumn( column );
-    
-    dataview_left->AppendToggleColumn( wxT("fourth"), 3 );
-    
-    MyCustomCell *custom_cell = new MyCustomCell;
-    column = new wxDataViewColumn( wxT("custom"), custom_cell, 4 );
-    dataview_left->AppendColumn( column );
-    
-    dataview_left->AppendProgressColumn( wxT("progress"), 5 );
-    
-    dataview_left->AppendDateColumn( wxT("date"), 6 );
-    
-    // Right wxDataViewCtrl using the same model
-    dataview_right = new wxDataViewCtrl( this, -1 );
-    dataview_right->AssociateModel( model );
-
-    text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_cell, 2 );
-    dataview_right->AppendColumn( column );
-    dataview_right->AppendTextColumn( wxT("first"), 0 );
-    dataview_right->AppendTextColumn( wxT("second"), 1 );
-    wxDataViewToggleCell *toggle_cell = new wxDataViewToggleCell( wxT("bool"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3 );
-    dataview_right->AppendColumn( column );
-
-    dataview_right->AppendDateColumn( wxT("date"), 6 );
-    
-    // layout dataview controls.
-    
-    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
-    sizer->Add( dataview_left, 3, wxGROW );
-    sizer->Add(10,10);
-    sizer->Add( dataview_right, 2, wxGROW );
-    SetSizer( sizer );
+    return 0;

 }
 
 }
 

-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
-{
-    Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageDialog dialog(this, _T("This demonstrates the dataview control handling"),
-        _T("About DataView"), wxOK);
-
-    dialog.ShowModal();
-}

 
 // -------------------------------------
 
 // -------------------------------------

-// MySortingFrame
+// MyFrame

 // -------------------------------------
 
 // -------------------------------------
 

-BEGIN_EVENT_TABLE(MySortingFrame,wxFrame)
-    EVT_BUTTON( ID_APPEND_ROW_LEFT, MySortingFrame::OnAppendRowLeft )
+enum
+{
+    // file menu
+    ID_ABOUT = wxID_ABOUT,
+    ID_EXIT = wxID_EXIT,
+};
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
+    EVT_MENU( ID_EXIT, MyFrame::OnQuit )

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
+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))
 {
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {

-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#else
-    SetIcon(wxIcon(mondrian_xpm));
-#endif
+    SetIcon(wxICON(sample));
+
+    // build the menus:

 
     wxMenu *file_menu = new wxMenu;
 
     wxMenu *file_menu = new wxMenu;

+    file_menu->Append(ID_ABOUT, "&About");
+    file_menu->AppendSeparator();
+    file_menu->Append(ID_EXIT, "E&xit");

 
 

-    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
-    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));

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

-    menu_bar->Append(file_menu, _T("&File"));
-    SetMenuBar(menu_bar);
-
-    // You used to have to do some casting for param 4, but now there are type-safe handlers
-    Connect( DYNAMIC_QUIT,  wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnQuit) );
-    Connect( DYNAMIC_ABOUT, wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnAbout) );
+    menu_bar->Append(file_menu, "&File");

 
 

+    SetMenuBar(menu_bar);

     CreateStatusBar();
     CreateStatusBar();

-    
-    
-    // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, -1 );
-
-    MyUnsortedTextModel *model = new MyUnsortedTextModel;
-    dataview_left->AssociateModel( model );
-    wxDataViewTextCell *text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 0 );
-    dataview_left->AppendColumn( column );
-    dataview_left->AppendTextColumn( wxT("second"), 1 );
-    
-    // Right wxDataViewCtrl using the sorting model
-    dataview_right = new wxDataViewCtrl( this, -1 );
-    wxDataViewSortedListModel *sorted_model = 
-        new wxDataViewSortedListModel( model );
-    dataview_right->AssociateModel( sorted_model );
-    text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_cell, 0 );
-    dataview_right->AppendColumn( column );
-    dataview_right->AppendTextColumn( wxT("second"), 1 );
-
-    // layout dataview controls.
-    
-    wxBoxSizer *top_sizer = new wxBoxSizer( wxHORIZONTAL );
-    top_sizer->Add( dataview_left, 1, wxGROW );
-    top_sizer->Add(10,10);
-    top_sizer->Add( dataview_right, 1, wxGROW );
-    
-    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
-    button_sizer->Add( 10, 10, 1 );
-    wxFlexGridSizer *left_sizer = new wxFlexGridSizer( 2 );
-    left_sizer->Add( new wxButton( this, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_DELETE_ROW_LEFT, wxT("Delete") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
-    button_sizer->Add( left_sizer );
-    button_sizer->Add( 10, 10, 2 );
-    wxFlexGridSizer *right_sizer = new wxFlexGridSizer( 2 );
-    right_sizer->Add( new wxButton( this, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_DELETE_ROW_RIGHT, wxT("Delete") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_EDIT_ROW_RIGHT, wxT("Edit") ), 0, wxALL, 5 );
-    button_sizer->Add( right_sizer );
-    button_sizer->Add( 10, 10, 1 );
-    
-    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
-    main_sizer->Add( top_sizer, 1, wxGROW );
-    main_sizer->Add( button_sizer, 0, wxGROW );
-    
-    SetSizer( main_sizer );
-}
-
-void MySortingFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
-{
-    Close(true);
-}

 
 

-void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageDialog dialog(this, _T("This demonstrates the dataview control sorting"),
-        _T("About DataView"), wxOK);
+    m_dataview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
+                                     wxDefaultSize );

 
 

-    dialog.ShowModal();
-}
+    wxObjectDataPtr<MyMusicModel> model(new MyMusicModel);
+    m_dataview->AssociateModel( model.get() );

 
 

-void MySortingFrame::OnAppendRowLeft(wxCommandEvent& event)
-{
+    m_dataview->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, 
+                                     DEFAULT_ALIGN );
+    m_dataview->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_INERT, 200,
+                                     DEFAULT_ALIGN );
+    m_dataview->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,
+                                     DEFAULT_ALIGN );

 }
 
 }
 

-void MySortingFrame::OnPrependRowLeft(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnInsertRowLeft(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnEditRowLeft(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnAppendRowRight(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnPrependRowRight(wxCommandEvent& event)
-{
-}
-
-void MySortingFrame::OnInsertRowRight(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )

 {
 {

+    Close(true);

 }
 
 }
 

-void MySortingFrame::OnDeleteRowRight(wxCommandEvent& event)
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )

 {
 {

-}
+    wxAboutDialogInfo info;
+    info.SetName(_("DataView sample"));
+    info.SetDescription(_("This sample demonstrates the dataview control handling"));
+    info.SetCopyright(_T("(C) 2007 Robert Roebling"));

 
 

-void MySortingFrame::OnEditRowRight(wxCommandEvent& event)
-{
+    wxAboutBox(info);

 }
 
 }