create the single global IO dispatcher in wxFDIODispatcher; don't use wxSelectDispatc...

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 0d488672aac9e8110592c27d62bd9cedd422c09c..2b013e6d9a45cf1b8b65779c3a10abf54a060ef2 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -41,361 +41,241 @@
 
 
 // -------------------------------------
 
 
 // -------------------------------------

-// MyTextModel
+// MyMusicModel

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

-WX_DECLARE_OBJARRAY(wxDateTime,wxArrayDate);
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxArrayDate)
+/*
+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 MyTextModel: public wxDataViewListModel
-{
-public:
-    MyTextModel()
-    {
-        unsigned int 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( wxDateTime::Now() );
-                m_dates.Add( date );
-            }
-    }
-
-    virtual unsigned int GetRowCount() const
-        { return 1000; }
-    virtual unsigned int GetColumnCount() const
-        { return 7; }
-
-    // as reported by wxVariant
-    virtual wxString GetColumnType( unsigned int col ) const
-        {
-            if (col == 6)
-                return wxT("datetime");
-
-            if (col == 5)
-                return wxT("long");
-
-            if (col == 3)
-                return wxT("bool");
-
-            return wxT("string");
-        }
-
-    virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
-        {
-            if (col == 6)
-            {
-                variant = (wxDateTime) m_dates[row];
-            } else
-            if (col == 5)
-            {
-                variant = (long) m_progress[row];
-            } else
-            if (col == 4)
-            {
-                variant = m_colours[row];
-            } else
-            if (col == 3)
-            {
-                variant = (bool) (m_bools[row] != 0);
-            } else
-            if (col == 2)
-            {
-                variant = m_list[row];
-            }
-            else
-            {
-                wxString tmp;
-                tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col );
-                variant = tmp;
-            }
-        }
-    virtual bool SetValue( const wxVariant &value, unsigned int col, unsigned int row )
-        {
-            if (col == 6)
-            {
-                m_dates[row] = value.GetDateTime();
-            } else
-            if (col == 3)
-            {
-                m_bools[row] = (int) value.GetBool();
-            } else
-            if (col == 2)
-            {
-                m_list[row] = value.GetString();
-            }
-            return true;
-        }
-        
-    virtual void GetAttr( wxListItemAttr &attr, unsigned int col, unsigned int row )
-        {
-            if (row == 4)
-                attr.SetBackgroundColour( *wxGREEN );
-        }

 
 

-    wxArrayString m_list;
-    wxArrayInt    m_bools;
-    wxArrayString m_colours;
-    wxArrayInt    m_progress;
-    wxArrayDate   m_dates;
-};

 
 

-// -------------------------------------
-// MyTextRenderer
-// -------------------------------------
+class MyMusicModelNode;
+WX_DEFINE_ARRAY_PTR( MyMusicModelNode*, MyMusicModelNodes );

 
 

-class MyTextRenderer: public wxDataViewTextRenderer
+class MyMusicModelNode

 {
 public:
 {
 public:

-    MyTextRenderer( const wxString varianttype = wxT("string"), 
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT )
-      : wxDataViewTextRenderer( varianttype, mode ) { }
+    MyMusicModelNode( MyMusicModelNode* parent, const wxUint32 id,
+                      const wxString &title, const wxString &artist, const wxString &year )
+    { 
+        m_parent = parent; 
+        m_id = id;
+        m_title = title;
+        m_artist = artist;
+        m_year = year;
+        m_isContainer = false;
+    }

     
     

-    virtual bool Validate( wxVariant &value )
-    {
-        wxString str = value;
-        if (str.Length() > 10)
+    MyMusicModelNode( MyMusicModelNode* parent, const wxUint32 id,
+                      const wxString &branch )
+    { 
+        m_parent = parent; 
+        m_id = id;
+        m_title = branch;
+        m_isContainer = true;
+    }
+    
+    ~MyMusicModelNode()
+    { 
+        size_t count = m_children.GetCount();
+        size_t i;
+        for (i = 0; i < count; i++)

         {
         {

-            wxMessageDialog dlg( NULL, wxT("string too long") , wxT("Error") );
-            dlg.ShowModal();
-            return false;
+            MyMusicModelNode *child = m_children[i];
+            delete child;

         }
         }

-        
-        return true;

     }
     }

-};

 
 

+    wxUint32 GetID()                                      { return m_id; }
+    bool IsContainer()                                    { return m_isContainer; }

 
 

-// -------------------------------------
-// MyCustomRenderer
-// -------------------------------------
+    MyMusicModelNode* GetParent()                         { return m_parent; }
+    MyMusicModelNodes &GetChildren()                      { return m_children; }
+    MyMusicModelNode* GetNthChild( unsigned int n )       { return m_children.Item( n ); }
+    void Insert( MyMusicModelNode* child, unsigned int n) { m_children.Insert( child, n); }
+    void Append( MyMusicModelNode* child )                { m_children.Add( child ); }
+    unsigned int GetChildCount()                          { return m_children.GetCount(); }

 
 

-class MyCustomRenderer: public wxDataViewCustomRenderer
-{

 public:
 public:

-    MyCustomRenderer() :
-        wxDataViewCustomRenderer( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE )
-    {
-        m_colour = wxT("black");
-    }
-    bool SetValue( const wxVariant &value )
-    {
-        m_colour = value.GetString();
-        return true;
-    }
-
-    bool GetValue( wxVariant &value ) const
-    {
-        value = m_colour;
-        return true;
-    }
-
-    bool Render( wxRect rect, wxDC *dc, int WXUNUSED(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() const
-    {
-        return wxSize(20,8);
-    }
-    bool Activate( wxRect WXUNUSED(rect),
-                   wxDataViewListModel *WXUNUSED(model),
-                   unsigned int WXUNUSED(col),
-                   unsigned int WXUNUSED(row) )
-    {
-        return false;
-    }
-
+    wxString            m_title;
+    wxString            m_artist;
+    wxString            m_year;
+    

 private:
 private:

-    wxString m_colour;
+    MyMusicModelNode   *m_parent;
+    MyMusicModelNodes   m_children; 
+    wxUint32            m_id;
+    bool                m_isContainer;

 };
 
 };
 

-// -------------------------------------
-// MySpinCtrlInPlaceRenderer
-// -------------------------------------
-
-class MySpinCtrlInPlaceRenderer: public wxDataViewCustomRenderer
+ 
+class MyMusicModel: public wxDataViewModel

 {
 public:
 {
 public:

-    MySpinCtrlInPlaceRenderer() :
-        wxDataViewCustomRenderer( wxT("long"), wxDATAVIEW_CELL_EDITABLE ) { }
-    
-    
-    virtual bool HasEditorCtrl()
-        { 
-            return true; 
-        }
-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
-        { 
-            long l = value;
-            return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, 
-                    labelRect.GetTopLeft(), labelRect.GetSize(), 0, 0, 100, l );
-        }
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
-        { 
-            wxSpinCtrl *sc = (wxSpinCtrl*) editor;
-            long l = sc->GetValue();
-            value = l;
-            return true;
-        }
-        
-    bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) )
-    {
-        wxString str;
-        str.Printf( wxT("%d"), (int) m_data );
-        dc->SetTextForeground( *wxBLACK );
-        dc->DrawText( str, rect.x, rect.y );
-        return true;
-    }
-    wxSize GetSize() const
-    {
-        return wxSize(80,16);
-    }
-    bool SetValue( const wxVariant &value )
-    {
-        m_data = value.GetLong();
-        return true;
-    }
-    bool GetValue( wxVariant &value ) const
-    {
-        value = m_data;
-        return true;
+    MyMusicModel() 
+    {
+        m_idCounter = 0;
+        m_root = new MyMusicModelNode( NULL, GetNewId(), "My Music" );
+        m_pop = new MyMusicModelNode( m_root, GetNewId(), "Pop music" );
+        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_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_classicalMusicIsKnownToControl = false;

     }
     
     }
     

-    
-private:
-    long    m_data;
-};
-
-// -------------------------------------
-// MyUnsortedTextModel
-// -------------------------------------
-
-class MyUnsortedTextModel: public wxDataViewListModel
-{
-public:
-    MyUnsortedTextModel()
+    void AddToClassical( const wxString &title, const wxString &artist, const wxString &year )

     {
     {

-        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.") );
+        // add to data
+        MyMusicModelNode *child_node = 
+            new MyMusicModelNode( m_classical, GetNewId(), title, artist, year );
+        m_classical->Append( child_node );

         
         

-        m_ilist.Add( 0 );
-        m_ilist.Add( 1);
-        m_ilist.Add( 2 );
-        m_ilist.Add( 3 );
-        m_ilist.Add( 4 );
-        m_ilist.Add( 5 );
-        m_ilist.Add( 6 );
-        
-        m_bitmap = wxBitmap( null_xpm );
-    }
-
-    virtual unsigned int GetRowCount() const 
-    { 
-        return m_list.GetCount(); 
+        if (m_classicalMusicIsKnownToControl)
+        {
+            // notify control
+            wxDataViewItem child( child_node->GetID() );
+            wxDataViewItem parent( m_classical->GetID() );
+            ItemAdded( parent, child );
+        }

     }
     }

-
-    virtual unsigned int GetColumnCount() const 
-    { 
-        return 4; 
+    
+    virtual unsigned int GetColumnCount() const
+    {
+        return 3;

     }
 
     }
 

-    virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const 
-    { 
-        return wxT("string"); 
+    virtual wxString GetColumnType( unsigned int col ) const
+    {
+        return "string";

     }
 
     }
 

-    virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
+    virtual void GetValue( wxVariant &variant, 
+                           const wxDataViewItem &item, unsigned int col ) const

     {
     {

-        if (col == 0)
-        {
-            variant = m_list[row];
-            return;
-        } else
-        if ((col == 2) || (col == 3))
+        MyMusicModelNode *node = FindNode( item );
+        switch (col)

         {
         {

-            variant << m_bitmap;
-            return;
-        } else
-        if (col == 4)
-        {
-            variant = (long) m_ilist[row];
-            return;
+            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" );

         }
         }

-        
-        wxString tmp;
-        tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col );
-        variant = tmp;

     }
 
     }
 

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

     {
     {

-        if (col == 0)
-        {
-            m_list[row] = variant.GetString();
-            return true;
-        } else
-        if (col == 4)
+        MyMusicModelNode *node = FindNode( item );
+        switch (col)

         {
         {

-            m_ilist[row] = variant.GetLong();
-            return true;
+            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" );

         }
         }

-        return false;
-
-    }
-
-    void AppendRow( const wxString &text )
-    {
-        m_list.Add( text );
-        m_ilist.Add( 0 );
-        RowAppended();

     }
 
     }
 

-    void PrependRow( const wxString &text )
+    virtual bool HasChildren( const wxDataViewItem &item ) const

     {
     {

-        m_list.Insert( text, 0 );
-        m_ilist.Insert( 0, 0 );
-        RowPrepended();
+        if (item.GetID() == 0)
+            return true;
+    
+        MyMusicModelNode *node = FindNode( item );
+        return node->IsContainer();

     }
     }

-
-    void InsertRowAt1( const wxString &text )
+    
+    virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const

     {
     {

-        m_list.Insert( text, 1 );
-        m_ilist.Insert( 0, 1 );
-        RowInserted( 1 );
+        if (parent.GetID() == 0)
+            return wxDataViewItem( m_root->GetID() );
+        
+        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;
+        }
+        
+        MyMusicModelNode *first_child = node->GetChildren().Item( 0 );
+        return wxDataViewItem( first_child->GetID() );

     }
     }

-
-    void DeleteRow( unsigned int index )
+    
+    virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const
+    {
+        MyMusicModelNode *node = FindNode( item );
+        MyMusicModelNode *parent = node->GetParent();
+        if (!parent)
+            return wxDataViewItem(0);
+
+        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; }
+    
+    MyMusicModelNode *FindNodeRec( MyMusicModelNode *node, const wxDataViewItem &item ) const

     {
     {

-        m_list.RemoveAt( index );
-        m_ilist.RemoveAt( index );
-        RowDeleted( index );
+        if (node->GetID() == item.GetID())
+            return node;
+    
+        size_t count = node->GetChildCount();
+        size_t i;
+        for (i = 0; i < count; i++)
+        {
+            MyMusicModelNode *child = node->GetChildren().Item( i );
+            MyMusicModelNode *node2 = FindNodeRec( child, item );
+            if (node2)
+                return node2;
+        }
+        return NULL;

     }
     }

-
-    wxArrayString m_list;
-    wxArrayInt m_ilist;
-    wxBitmap m_bitmap;
+    
+    MyMusicModelNode *FindNode( const wxDataViewItem &item ) const
+    {
+        if (item.GetID() == 0)
+            return NULL;
+            
+        if (!m_root)
+            return NULL;
+            
+        return FindNodeRec( m_root, item );
+    }
+
+    MyMusicModelNode*   m_root;
+    MyMusicModelNode*   m_pop;
+    MyMusicModelNode*   m_classical;
+    bool                m_classicalMusicIsKnownToControl;
+    wxUint32            m_idCounter;

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


@@ -421,102 +301,17 @@ public:
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

-    void OnNewSortingFrame(wxCommandEvent& event);
-
-    void OnStyleChange(wxCommandEvent& event);
-    void OnColumnSetting(wxCommandEvent& event);
+    void OnAdd(wxCommandEvent& event);

 
 private:
 
 private:

-    wxDataViewCtrl* dataview_left;
-    wxDataViewCtrl* dataview_right;
-    wxSplitterWindow *m_splitter;
-    wxPanel *m_panelLeft, *m_panelRight;
-
-    // utilities:
-
-    void CreateDataViewControls();
-
-    wxArrayInt GetFlaggedColumns(int flag);
-    wxAlignment ChooseAlign(const wxString &msg, bool onlyHorizontal);
-    void SetFlag(const wxArrayInt &idx, int flag);
-    void SetAlignment(const wxArrayInt &idx, bool header, wxAlignment align);
-    void SetWidth(const wxArrayInt &idx, bool minwidth, int width);
+    wxDataViewCtrl* m_dataview;
+    wxTextCtrl    * m_log;
+    wxObjectDataPtr<MyMusicModel> m_model;

 
 private:
     DECLARE_EVENT_TABLE()
 };
 
 
 private:
     DECLARE_EVENT_TABLE()
 };
 

-// -------------------------------------
-// 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_SELECT,
-    ID_UNSELECT_ALL,
-
-    ID_APPEND_ROW_RIGHT,
-    ID_PREPEND_ROW_RIGHT,
-    ID_INSERT_ROW_RIGHT,
-    ID_DELETE_ROW_RIGHT,
-    ID_EDIT_ROW_RIGHT,
-    
-    ID_SORTED,
-    ID_UNSORTED,
-    ID_ACTIVATED
-};
-
-class MySortingFrame: public wxFrame
-{
-public:
-    MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
-    ~MySortingFrame();
-
-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);
-
-    void OnSelect(wxCommandEvent& event);
-    void OnUnselectAll(wxCommandEvent& event);
-    
-    void OnSelectedUnsorted(wxDataViewEvent &event);
-    void OnSelectedSorted(wxDataViewEvent &event);
-    void OnActivatedUnsorted(wxDataViewEvent &event);
-
-    void OnHeaderClickSorted(wxDataViewEvent &event);
-    void OnHeaderClickUnsorted(wxDataViewEvent &event);
-
-private:
-    wxDataViewCtrl* dataview_left;
-    wxDataViewCtrl* dataview_right;
-    
-    wxLog          *m_logOld;
-    wxTextCtrl     *m_logWindow;
-
-    wxObjectDataPtr<MyUnsortedTextModel> m_unsorted_model;
-    wxObjectDataPtr<wxDataViewSortedListModel> m_sorted_model;
-
-    DECLARE_EVENT_TABLE()
-};
-

 // -------------------------------------
 // MyApp
 // -------------------------------------
 // -------------------------------------
 // MyApp
 // -------------------------------------


@@ -530,7 +325,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, 800, 340);
+        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 700, 440);

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


@@ -551,41 +346,15 @@ enum
 {
     // file menu
     ID_ABOUT = wxID_ABOUT,
 {
     // file menu
     ID_ABOUT = wxID_ABOUT,

-    ID_NEW_SORT_FRAME = wxID_HIGHEST+1,

     ID_EXIT = wxID_EXIT,
     ID_EXIT = wxID_EXIT,

-
-    // dataviewctrl menu
-    ID_SINGLE_SEL_MODE = wxID_HIGHEST+2,
-    ID_MULTIPLE_SEL_MODE,
-    ID_NO_HEADER_MODE,
-    ID_HORIZ_RULES_MODE,
-    ID_VERT_RULES_MODE,
-
-    ID_RESIZEABLE_COLUMNS,
-    ID_SORTABLE_COLUMNS,
-    ID_HIDDEN_COLUMNS,
-
-    ID_CHOOSE_COLUMN_ALIGNMENT,
-    ID_CHOOSE_CONTENTS_ALIGNMENT,
-
-    ID_SET_MINWIDTH,
-    ID_SET_WIDTH
+    
+    ID_ADD = 100,

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

-
-    // file menu

     EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
     EVT_MENU( ID_ABOUT, MyFrame::OnAbout )

-    EVT_MENU( ID_NEW_SORT_FRAME, MyFrame::OnNewSortingFrame )

     EVT_MENU( ID_EXIT, MyFrame::OnQuit )
     EVT_MENU( ID_EXIT, MyFrame::OnQuit )

-
-    // dataviewctrl menu
-    EVT_COMMAND_RANGE( ID_SINGLE_SEL_MODE, ID_VERT_RULES_MODE,
-                       wxEVT_COMMAND_MENU_SELECTED, MyFrame::OnStyleChange )
-
-    EVT_COMMAND_RANGE( ID_RESIZEABLE_COLUMNS, ID_SET_WIDTH,
-                       wxEVT_COMMAND_MENU_SELECTED, MyFrame::OnColumnSetting )
-
+    EVT_BUTTON( ID_ADD, MyFrame::OnAdd )

 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):


@@ -596,631 +365,77 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     // build the menus:
 
     wxMenu *file_menu = new wxMenu;
     // build the menus:
 
     wxMenu *file_menu = new wxMenu;

-    file_menu->Append(ID_NEW_SORT_FRAME, _T("&New sorting frame"));
-    file_menu->AppendSeparator();
-    file_menu->Append(ID_ABOUT, _T("&About"));
+    file_menu->Append(ID_ABOUT, "&About");

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

-    file_menu->Append(ID_EXIT, _T("E&xit"));
-
-    wxMenu *data_menu = new wxMenu;
-    data_menu->AppendRadioItem(ID_SINGLE_SEL_MODE, _T("&Single selection mode"));
-    data_menu->AppendRadioItem(ID_MULTIPLE_SEL_MODE, _T("&Multiple selection mode"));
-    data_menu->AppendSeparator();
-    data_menu->AppendCheckItem(ID_NO_HEADER_MODE, _T("No header mode"));
-    data_menu->AppendCheckItem(ID_HORIZ_RULES_MODE, _T("Horizontal rules"));
-    data_menu->AppendCheckItem(ID_VERT_RULES_MODE, _T("Vertical rules"));
-    data_menu->AppendSeparator();
-    data_menu->Append(ID_RESIZEABLE_COLUMNS, _T("Set column(s) as resizeable..."));
-    data_menu->Append(ID_SORTABLE_COLUMNS, _T("Set column(s) as sortable..."));
-    data_menu->Append(ID_HIDDEN_COLUMNS, _T("Set column(s) as hidden..."));
-    data_menu->AppendSeparator();
-    data_menu->Append(ID_CHOOSE_COLUMN_ALIGNMENT, _T("Set column(s) title alignment..."));
-    data_menu->Append(ID_CHOOSE_CONTENTS_ALIGNMENT, _T("Set column(s) contents alignment..."));
-    data_menu->AppendSeparator();
-    data_menu->Append(ID_SET_MINWIDTH, _T("Set column(s) minimal width..."));
-    data_menu->Append(ID_SET_WIDTH, _T("Set column(s) width..."));
+    file_menu->Append(ID_EXIT, "E&xit");

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

-    menu_bar->Append(file_menu, _T("&File"));
-    menu_bar->Append(data_menu, _T("&DataViewCtrl"));
+    menu_bar->Append(file_menu, "&File");

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

+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );

 
 

-    // check the menus for the default wxDataViewCtrl style
-    data_menu->Check(ID_MULTIPLE_SEL_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_MULTIPLE) != 0);
-    data_menu->Check(ID_NO_HEADER_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_NO_HEADER) != 0);
-    data_menu->Check(ID_HORIZ_RULES_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_HORIZ_RULES) != 0);
-    data_menu->Check(ID_VERT_RULES_MODE, (DATAVIEW_DEFAULT_STYLE & wxDV_VERT_RULES) != 0);
-
-
-    // build the other controls:
-
-    m_splitter = new wxSplitterWindow( this, wxID_ANY );
-    m_splitter->SetSashGravity(0.5);
-
-    m_panelLeft = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                               wxNO_BORDER );
-    m_panelRight = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                wxNO_BORDER );
-    wxSizer *szLeft = new wxBoxSizer(wxVERTICAL);
-    wxSizer *szRight = new wxBoxSizer(wxVERTICAL);
-
-    dataview_left = NULL;
-    dataview_right = NULL;
-    CreateDataViewControls();
-
-    // left panel
-    szLeft->Add( dataview_left, 1, wxGROW|wxALL, 5 );
-    m_panelLeft->SetSizerAndFit(szLeft);
-
-    // right panel
-    wxStaticText *stattext =
-        new wxStaticText(m_panelRight, wxID_ANY,
-                wxT("This is another wxDataViewCtrl using the same wxDataViewModel ")
-                wxT("of the wxDataViewCtrl on the left but, unlike it, this window ")
-                wxT("won't react to the style/column changes done through the ")
-                wxT("'DataViewCtrl' menu"));
-    stattext->Wrap(GetClientSize().GetWidth() / 2);
-
-    szRight->Add( stattext, 0, wxALL, 5 );
-    szRight->Add( dataview_right, 1, wxGROW|wxALL, 5 );
-    m_panelRight->SetSizerAndFit(szRight);
-
-    // split the two panels
-    m_splitter->SplitVertically(m_panelLeft, m_panelRight);
-    this->SetMinSize(m_splitter->GetBestSize());
-}
-
-void MyFrame::CreateDataViewControls()
-{
-    wxDataViewCtrl *old1 = NULL, *old2 = NULL;
-
-    if (dataview_left)
-        old1 = dataview_left;
-    if (dataview_right)
-        old2 = dataview_right;
-
-    // styles:
-    long style = 0;
-    if (GetMenuBar()->FindItem(ID_MULTIPLE_SEL_MODE)->IsChecked())
-        style |= wxDV_MULTIPLE;
-    if (GetMenuBar()->FindItem(ID_NO_HEADER_MODE)->IsChecked())
-        style |= wxDV_NO_HEADER;
-#if 0
-    if (GetMenuBar()->FindItem(ID_HORIZ_RULES_MODE)->IsChecked())
-        style |= wxDV_HORIZ_RULES;
-    if (GetMenuBar()->FindItem(ID_VERT_RULES_MODE)->IsChecked())
-        style |= wxDV_VERT_RULES;
-#endif
-
-
-    // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( m_panelLeft, wxID_ANY, wxDefaultPosition,
-                                        wxDefaultSize, style );
-
+    m_dataview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
+                                     wxDefaultSize );

 
 

-    wxDataViewTextRenderer *text_renderer;
-    wxDataViewColumn *column;
-    
-    wxObjectDataPtr<MyTextModel> model(new MyTextModel);
-    dataview_left->AssociateModel( model.get() );
+    m_model = new MyMusicModel;
+    m_dataview->AssociateModel( m_model.get() );

 
 

-    dataview_left->AppendTextColumn( wxT("First"), 0, wxDATAVIEW_CELL_INERT, -1, 
+    m_dataview->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, 200, 
+                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
+    m_dataview->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_INERT, 200,
+                                     DEFAULT_ALIGN, wxDATAVIEW_COL_SORTABLE );
+    m_dataview->AppendTextColumn( "Year", 2, wxDATAVIEW_CELL_INERT, 50,

                                      DEFAULT_ALIGN );
                                      DEFAULT_ALIGN );

-    dataview_left->AppendTextColumn( wxT("Second"), 1, wxDATAVIEW_CELL_INERT, -1,
-                                     DEFAULT_ALIGN );
-
-    text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_renderer, 2, -1, DEFAULT_ALIGN );
-    dataview_left->AppendColumn( column );

 
 

-    dataview_left->AppendToggleColumn( wxT("fourth"), 3, wxDATAVIEW_CELL_INERT, -1, 
-                                       DEFAULT_ALIGN );
-
-    MyCustomRenderer *custom_renderer = new MyCustomRenderer;
-    column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4, -1, DEFAULT_ALIGN );
-    dataview_left->AppendColumn( column );
-
-    dataview_left->AppendProgressColumn( wxT("progress"), 5, wxDATAVIEW_CELL_INERT, -1,
-                                         DEFAULT_ALIGN );
-
-    dataview_left->AppendDateColumn( wxT("date"), 6, wxDATAVIEW_CELL_INERT, -1, DEFAULT_ALIGN );
-
-    // Right wxDataViewCtrl using the same model
-    dataview_right = new wxDataViewCtrl( m_panelRight, wxID_ANY );
-    dataview_right->AssociateModel( model.get() );
-
-    text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_renderer, 2 );
-    dataview_right->AppendColumn( column );
-    dataview_right->AppendTextColumn( wxT("first"), 0 );
-    dataview_right->AppendTextColumn( wxT("second"), 1 );
-    wxDataViewToggleRenderer *toggle_renderer = 
-        new wxDataViewToggleRenderer( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE );
-    column = new wxDataViewColumn( wxT("bool"), toggle_renderer, 3, 30 );
-    dataview_right->AppendColumn( column );
-
-    dataview_right->AppendDateColumn( wxT("date"), 6 );
-
-
-    // layout the new dataview controls
-    if (old1)
-    {
-        m_panelLeft->GetSizer()->Replace(old1, dataview_left);
-        delete old1;
-
-        m_panelLeft->Layout();
-    }
-
-    if (old2)
-    {
-        m_panelRight->GetSizer()->Replace(old2, dataview_right);
-        delete old2;
-
-        m_panelRight->Layout();
-    }
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
-{
-    Close(true);
-}
-
-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"));
-
-    wxAboutBox(info);
-}
-
-void MyFrame::OnNewSortingFrame(wxCommandEvent& WXUNUSED(event) )
-{
-    MySortingFrame *frame2 = 
-        new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500);
-    frame2->Show(true);
-}
-
-void MyFrame::OnStyleChange(wxCommandEvent& WXUNUSED(event) )
-{
-    // recreate the wxDataViewCtrl:
-    CreateDataViewControls();
-}
-
-void MyFrame::OnColumnSetting(wxCommandEvent& event)
-{
-    wxArrayInt columns;
-    int flag = 0;
-    bool header = false, minwidth = false;
-    wxString msg;
-
-    switch (event.GetId())
-    {
-    case ID_RESIZEABLE_COLUMNS:
-        flag = wxDATAVIEW_COL_RESIZABLE;
-        columns = GetFlaggedColumns(flag);
-        break;
-    case ID_SORTABLE_COLUMNS:
-        flag = wxDATAVIEW_COL_SORTABLE;
-        columns = GetFlaggedColumns(flag);
-        break;
-    case ID_HIDDEN_COLUMNS:
-        flag = wxDATAVIEW_COL_HIDDEN;
-        columns = GetFlaggedColumns(flag);
-        break;
-
-    case ID_CHOOSE_COLUMN_ALIGNMENT:
-        msg = wxT("Select the columns whose headers' alignment will be modified.");
-        header = true;
-        break;
-    case ID_CHOOSE_CONTENTS_ALIGNMENT:
-        msg = wxT("Select the columns whose contents' alignment will be modified.");
-        header = false;
-        break;
-
-    case ID_SET_MINWIDTH:
-        msg = wxT("Please provide the new minimal width:");
-        minwidth = true;
-        break;
-    case ID_SET_WIDTH:
-        msg = wxT("Please provide the new width:");
-        minwidth = false;
-        break;
-    }
-
-    // get column titles:
-
-    wxArrayString choices;
-    for (size_t i=0; i<dataview_left->GetColumnCount(); i++)
-        choices.Add(dataview_left->GetColumn(i)->GetTitle());
-
-    // ask the user
-    wxGetMultipleChoices(
-        columns,
-        wxT("Choose the columns to which apply the change."),
-        wxT("Choose the column"),
-        choices,
-        this);
-
-    switch (event.GetId())
-    {
-    case ID_RESIZEABLE_COLUMNS:
-    case ID_SORTABLE_COLUMNS:
-    case ID_HIDDEN_COLUMNS:
-        SetFlag(columns, flag);
-        break;
-
-    case ID_CHOOSE_COLUMN_ALIGNMENT:
-    case ID_CHOOSE_CONTENTS_ALIGNMENT:
-        SetAlignment(columns, header, ChooseAlign(msg, header));
-        break;
-
-    case ID_SET_MINWIDTH:
-    case ID_SET_WIDTH:
-        {
-            int def = minwidth ? wxDVC_DEFAULT_MINWIDTH : wxDVC_DEFAULT_WIDTH;
-
-            msg << wxT("\nNOTE: all non-selected columns will be reset to a width of ") 
-                << def << wxT(" pixels.");
-
-            long ret =
-                wxGetNumberFromUser(msg, wxT("New value:"), wxT("Modify width"),
-                                    def, 0, 300, this);
-
-            if (ret != -1)
-                SetWidth(columns, minwidth, ret);
-        }
-        break;
-    }
-
-    dataview_left->Refresh();
-}
-
-wxAlignment MyFrame::ChooseAlign(const wxString &msg, bool onlyHorizontal)
-{
-    const wxString choices[] =
-    {
-        wxT("Left"),
-        wxT("Center horizontally"),
-        wxT("Right"),
-        wxT("Top"),
-        wxT("Center vertically"),
-        wxT("Bottom"),
-        wxT("Center")
-    };
-
-    wxAlignment flags[] =
-    {
-        wxALIGN_LEFT,
-        wxALIGN_CENTER_HORIZONTAL,
-        wxALIGN_RIGHT,
-        wxALIGN_TOP,
-        wxALIGN_CENTER_VERTICAL,
-        wxALIGN_BOTTOM,
-        wxALIGN_CENTER
-    };
-
-    int n = WXSIZEOF(choices);
-    if (onlyHorizontal)
-        n = 3;      // show only the first three choices
-
-    int choice = wxGetSingleChoiceIndex(
-        msg + wxT("\nNOTE: _all_ non-selected column's alignment will be reset to wxALIGN_LEFT!"),
-        wxT("Alignment"),
-        n, choices,
-        this);
-
-    if (choice == wxNOT_FOUND)
-        return wxALIGN_LEFT;
-
-    return flags[choice];
-}
-
-void MyFrame::SetFlag(const wxArrayInt &idx, int toadd)
-{
-    for (size_t i=0; i<dataview_left->GetColumnCount(); i++)
-    {
-        int current = dataview_left->GetColumn(i)->GetFlags();
-
-        if (idx.Index(i) != wxNOT_FOUND)
-            dataview_left->GetColumn(i)->SetFlags(current | toadd);
-        else
-            dataview_left->GetColumn(i)->SetFlags(current & ~toadd);
-    }
-}
-
-wxArrayInt MyFrame::GetFlaggedColumns(int flag)
-{
-    wxArrayInt ret;
-    for (size_t i=0; i<dataview_left->GetColumnCount(); i++)
-        if (dataview_left->GetColumn(i)->GetFlags() & flag)
-            ret.Add(i);
-    return ret;
-}
-
-void MyFrame::SetAlignment(const wxArrayInt &idx, bool header, wxAlignment align)
-{
-    // set to DEFAULT_ALIGN all columns except those
-    // contained in 'idx' which are set to 'align'
-
-    for (size_t i=0; i<dataview_left->GetColumnCount(); i++)
-    {
-        wxAlignment toset = DEFAULT_ALIGN;
-        if (idx.Index(i) != wxNOT_FOUND)
-            toset = align;
-
-        if (header)
-            dataview_left->GetColumn(i)->SetAlignment(toset);
-        else
-            dataview_left->GetColumn(i)->GetRenderer()->SetAlignment(toset);
-    }
-}
-
-void MyFrame::SetWidth(const wxArrayInt &idx, bool minwidth, int width)
-{
-    // set to wxDVC_DEFAULT_WIDTH wide all columns except those
-    // contained in 'idx' which are set to 'width'
-
-    for (size_t i=0; i<dataview_left->GetColumnCount(); i++)
-    {
-        int toset = minwidth ? wxDVC_DEFAULT_MINWIDTH : wxDVC_DEFAULT_WIDTH;
-        if (idx.Index(i) != wxNOT_FOUND)
-            toset = width;
-
-        if (minwidth)
-            dataview_left->GetColumn(i)->SetMinWidth(toset);
-        else
-            dataview_left->GetColumn(i)->SetWidth(toset);
-    }
-}
-
-
-// -------------------------------------
-// MySortingFrame
-// -------------------------------------
-
-BEGIN_EVENT_TABLE(MySortingFrame,wxFrame)
-    EVT_BUTTON( ID_APPEND_ROW_LEFT, MySortingFrame::OnAppendRowLeft )
-    EVT_BUTTON( ID_PREPEND_ROW_LEFT, MySortingFrame::OnPrependRowLeft )
-    EVT_BUTTON( ID_INSERT_ROW_LEFT, MySortingFrame::OnInsertRowLeft )
-    EVT_BUTTON( ID_DELETE_ROW_LEFT, MySortingFrame::OnDeleteRowLeft )
-    EVT_BUTTON( ID_SELECT, MySortingFrame::OnSelect )
-    EVT_BUTTON( ID_UNSELECT_ALL, MySortingFrame::OnUnselectAll )
-    EVT_DATAVIEW_ROW_SELECTED( ID_SORTED, MySortingFrame::OnSelectedSorted )
-    EVT_DATAVIEW_ROW_SELECTED( ID_UNSORTED, MySortingFrame::OnSelectedUnsorted )
-    EVT_DATAVIEW_ROW_ACTIVATED( ID_UNSORTED, MySortingFrame::OnActivatedUnsorted )
-    EVT_DATAVIEW_COLUMN_HEADER_CLICK( ID_SORTED, MySortingFrame::OnHeaderClickSorted )
-    EVT_DATAVIEW_COLUMN_HEADER_CLICK( ID_UNSORTED, MySortingFrame::OnHeaderClickUnsorted )
-END_EVENT_TABLE()
-
-MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
-  wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
-{
-    m_logOld = NULL;
+    main_sizer->Add( m_dataview, 2, wxGROW );

     
     

-    SetIcon(wxICON(sample));
-    CreateStatusBar();
-
-    wxPanel *main = new wxPanel(this);
-
-    // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( main, ID_UNSORTED, wxDefaultPosition, 
-                                        wxDefaultSize, wxDV_MULTIPLE );
-
-    m_unsorted_model = new MyUnsortedTextModel;
-    dataview_left->AssociateModel( m_unsorted_model.get() );
-
-    wxDataViewTextRenderer *text_renderer = 
-        new MyTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 0 );
-    dataview_left->AppendColumn( column );
-    dataview_left->AppendTextColumn( wxT("second"), 1 );
-    dataview_left->AppendColumn( new wxDataViewColumn( wxBitmap(null_xpm), 
-                                 new wxDataViewBitmapRenderer, 2, 25 ) );
-    dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), 
-                                 new wxDataViewBitmapRenderer, 3, 25 ) );
-
-    // Right wxDataViewCtrl using the sorting model
-    dataview_right = new wxDataViewCtrl( main, ID_SORTED );
+    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );

     
     

-    m_sorted_model = new wxDataViewSortedListModel( m_unsorted_model.get() );
-    dataview_right->AssociateModel( m_sorted_model.get() );
-
-    text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, 
-                                   wxALIGN_CENTER,
-                                   wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE );
-    dataview_right->AppendColumn( column );
+    button_sizer->Add( new wxButton( this, ID_ADD, "Add Mozart"), 0, wxALL, 10 );

     
     

-    dataview_right->AppendTextColumn( wxT("second"), 1 );
+    main_sizer->Add( button_sizer, 0, 0, 0 );

     
     

-    MySpinCtrlInPlaceRenderer *sr = new MySpinCtrlInPlaceRenderer;
-    column = new wxDataViewColumn( wxT("spin"), sr, 4, -1, wxALIGN_CENTER );
-    dataview_right->AppendColumn( column );
-
-    // 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( main, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( main, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( main, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( main, ID_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( main, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
-    left_sizer->Add( 5,5 );
-    left_sizer->Add( new wxButton( main, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( main, ID_UNSELECT_ALL, wxT("Unselect all") ), 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( main, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( main, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( main, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( main, ID_DELETE_ROW_RIGHT, wxT("Delete second") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( main, 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 );
+    m_log = new wxTextCtrl( this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );

     
     

-    m_logWindow = new wxTextCtrl(main, wxID_ANY, wxEmptyString,
-                                 wxDefaultPosition, wxDefaultSize,
-                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
-    main_sizer->Add( 20,20 );
-    main_sizer->Add( m_logWindow, 1, wxGROW );
-
-    m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow));
-
-    main->SetSizer( main_sizer );
-}
-
-MySortingFrame::~MySortingFrame()
-{
-    delete wxLog::SetActiveTarget(m_logOld);
-}
-
-void MySortingFrame::OnSelectedUnsorted(wxDataViewEvent &event)
-{
-    int row = event.GetRow();
-    wxLogMessage( wxT("OnSelected from unsorted list, selected %d"), row );
-    if (row >= 0)
-        wxLogMessage( wxT("wxDataViewCtrl::IsSelected( %d ): %d (as int)"), 
-                    row, (int) dataview_right->IsSelected( row ) );
-}
-
-void MySortingFrame::OnSelectedSorted(wxDataViewEvent &event)
-{
-    wxLogMessage( wxT("OnSelected from sorted list, selected %d"), (int) event.GetRow() );
+    main_sizer->Add( m_log, 1, wxGROW );
+    
+    SetSizer( main_sizer );

 }
 
 }
 

-void MySortingFrame::OnActivatedUnsorted(wxDataViewEvent &event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )

 {
 {

-    wxLogMessage( wxT("OnActivated from unsorted list, activated %d"), (int) event.GetRow() );
+    Close(true);

 }
 
 }
 

-void MySortingFrame::OnHeaderClickSorted(wxDataViewEvent &event)
+void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event) )

 {
 {

-    wxDataViewColumn *col = event.GetDataViewColumn();
-    wxLogMessage( wxT("OnHeaderClick from sorted list, column %s"), col->GetTitle().c_str() );
-    
-    if (col->GetTitle() == wxT("editable"))
+#if 0
+    // ignore selection, do something better later
+    wxDataViewItem item = m_dataview->GetSelection();
+    if (item.IsOk())

     {
     {

-        // this is the sorting column
-        if (col->IsSortOrderAscending())
+        if (m_model->HasChildren(item))

         {
         {

-            col->SetSortOrder( false );
-            m_sorted_model->SetAscending( false );
-            m_sorted_model->Resort();

         }
         else
         {
         }
         else
         {

-            col->SetSortOrder( true );
-            m_sorted_model->SetAscending( true );
-            m_sorted_model->Resort();

         }
     }
         }
     }

+#endif    
+  
+    m_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", "1787" );

 }
 
 }
 

-void MySortingFrame::OnHeaderClickUnsorted(wxDataViewEvent &event)
-{
-    wxLogMessage( wxT("OnHeaderClick from unsorted list, column %s"), 
-                  event.GetDataViewColumn()->GetTitle().c_str() );
-}
-
-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);
-
-    dialog.ShowModal();
-}
-
-void MySortingFrame::OnSelect(wxCommandEvent& WXUNUSED(event))
-{
-    dataview_left->SetSelection( 2 );
-}
-
-void MySortingFrame::OnUnselectAll(wxCommandEvent& WXUNUSED(event))
-{
-    dataview_left->ClearSelection();
-}
-
-void MySortingFrame::OnAppendRowLeft(wxCommandEvent& WXUNUSED(event))
-{
-    wxTextEntryDialog dialog( this, wxT("Enter text to append") );
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        wxString value = dialog.GetValue();
-        if (!value.empty())
-            m_unsorted_model->AppendRow( value );
-    }
-}
-
-void MySortingFrame::OnPrependRowLeft(wxCommandEvent& WXUNUSED(event))
-{
-    wxTextEntryDialog dialog( this, wxT("Enter text to prepend") );
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        wxString value = dialog.GetValue();
-        if (!value.empty())
-            m_unsorted_model->PrependRow( value );
-    }
-}
-
-void MySortingFrame::OnInsertRowLeft(wxCommandEvent& WXUNUSED(event))
-{
-    wxTextEntryDialog dialog( this, wxT("Enter text to insert before second") );
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        wxString value = dialog.GetValue();
-        if (!value.empty())
-            m_unsorted_model->InsertRowAt1( value );
-    }
-}
-
-void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& WXUNUSED(event))
-{
-    m_unsorted_model->DeleteRow( 1 );
-}
-
-void MySortingFrame::OnEditRowLeft(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void MySortingFrame::OnAppendRowRight(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void MySortingFrame::OnPrependRowRight(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void MySortingFrame::OnInsertRowRight(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void MySortingFrame::OnDeleteRowRight(wxCommandEvent& WXUNUSED(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& WXUNUSED(event))
-{
+    wxAboutBox(info);

 }
 
 }