some docs enhancements, in particular to wxDataViewListCtrl.

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index d9c9acb851b3417f23c0c03ac98a1ae5fce003d3..3b5774ba7d87b0705fddc9b52eeb38fc18db8c0d 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -2,13 +2,17 @@
 // 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
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     06/01/06
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -20,316 +24,478 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#include "wx/dataview.h"

 #include "wx/datetime.h"
 #include "wx/splitter.h"
 #include "wx/aboutdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/numdlg.h"
 #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"
 #include "wx/spinctrl.h"

+#include "wx/imaglist.h"
+#include "wx/notebook.h"
+
+#include "mymodels.h"
+
+// ----------------------------------------------------------------------------
+// resources
+// ----------------------------------------------------------------------------

 
 #ifndef __WXMSW__
     #include "../sample.xpm"
 #endif
 
 
 #ifndef __WXMSW__
     #include "../sample.xpm"
 #endif
 

-#include "null.xpm"
+#include "wx_small.xpm"
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------
+
+class MyApp: public wxApp
+{
+public:
+    virtual bool OnInit();
+};
+
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
+class MyFrame : public wxFrame
+{
+public:
+    MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h);
+    ~MyFrame();
+
+public:
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+
+    void OnAddMozart(wxCommandEvent& event);
+    void OnDeleteMusic(wxCommandEvent& event);
+    void OnDeleteYear(wxCommandEvent& event);
+    void OnSelectNinth(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);
+
+    void OnBeginDrag( wxDataViewEvent &event );
+    void OnDropPossible( wxDataViewEvent &event );
+    void OnDrop( wxDataViewEvent &event );
+
+private:
+    wxNotebook* m_notebook;

 
 

+    // the controls stored in the various tabs of the main notebook:

 
 

-#define DEFAULT_ALIGN                   wxALIGN_LEFT
-#define DATAVIEW_DEFAULT_STYLE          (wxDV_MULTIPLE|wxDV_HORIZ_RULES|wxDV_VERT_RULES)
+    wxDataViewCtrl* m_myMusicModelViewCtrl;
+    wxObjectDataPtr<MyMusicTreeModel> m_music_model;

 
 

+    wxDataViewCtrl* m_myListModelViewCtrl;
+    wxObjectDataPtr<MyListModel> m_list_model;

 
 

+    wxDataViewListCtrl* m_listctrl;
+    wxDataViewTreeCtrl* m_treectrl;

 
 

-// -------------------------------------
-// MyMusicModel
-// -------------------------------------
+    // other data:

 
 

-/*
-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
-*/
+    wxDataViewColumn* m_col;

 
 

+    wxTextCtrl* m_log;
+    wxLog *m_logOld;

 
 

-class MyMusicModel: public wxDataViewModel
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
+// ----------------------------------------------------------------------------
+// MyCustomRenderer
+// ----------------------------------------------------------------------------
+
+class MyCustomRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    MyMusicModel() {}
-    
-    virtual unsigned int GetColumnCount() const
-    {
-        return 2;
-    }
+    MyCustomRenderer( wxDataViewCellMode mode, int alignment ) :
+       wxDataViewCustomRenderer( wxString("long"), mode, alignment )
+       { m_height = 25; }

 
 

-    virtual wxString GetColumnType( unsigned int col ) const
+    virtual bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) )

     {
     {

-        return "string";
+        dc->SetBrush( *wxRED_BRUSH );
+        dc->SetPen( *wxTRANSPARENT_PEN );
+        dc->DrawRectangle( rect );
+        return true;

     }
 
     }
 

-    virtual void GetValue( wxVariant &variant, 
-                           const wxDataViewItem &item, unsigned int col ) const
-    {
-        int ID = item.GetID();
-        switch (ID)
-        {
-            case 1: variant = "My Music"; break;
-            case 2: variant = "Pop music"; break;
-            case 5: variant = "Classical music"; break;
-            case 3:
-            {
-                switch (col)
-                {
-                    case 0: variant = "You are not alone"; break;
-                    case 1: variant = "Michael Jackson"; break;
-                    case 2: variant = "1995";
-                }
-            }
-            break;
-            case 4:
-            {
-                switch (col)
-                {
-                    case 0: variant = "Take a bow"; break;
-                    case 1: variant = "Madonna"; break;
-                    case 2: variant = "1994";
-                }
-            }
-            break;
-            case 6:
-            {
-                switch (col)
-                {
-                    case 0: variant = "Ninth symphony"; break;
-                    case 1: variant = "Ludwig v. Beethoven"; break;
-                    case 2: variant = "1824";
-                }
-            }
-            break;
-            case 7:
-            {
-                switch (col)
-                {
-                    case 0: variant = "German requiem"; break;
-                    case 1: variant = "Johannes Brahms"; break;
-                    case 2: variant = "1868";
-                }
-            }
-            break;
-        }
-            
-    }

 
 

-    virtual bool SetValue( const wxVariant &variant, 
-                           const wxDataViewItem &item, unsigned int col )
+    virtual bool Activate( wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), 
+                           const wxDataViewItem &WXUNUSED(item), 
+                           unsigned int WXUNUSED(col) )

     {
     {

-        // readonly
-        return true;
+        wxLogMessage( wxT("MyCustomRenderer Activate()") );
+        return false;

     }
 
     }
 

-    virtual bool HasChildren( const wxDataViewItem &item ) const
-    {
-        int ID = item.GetID();
-        return ((ID == 1) || (ID == 2) || (ID == 5));
-    }
-    
-    virtual int GetChildCount( const wxDataViewItem &item ) const
-    {
-        int ID = item.GetID();
-        switch (ID)
-        {
-            case 1: return 2;
-            case 2: return 2;
-            case 5: return 2;
-        }
-        return 0;
-    }
-    virtual wxDataViewItem GetParent( const wxDataViewItem &child ) const
-    {
-        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 wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const
+    virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), 
+                           const wxDataViewItem &WXUNUSED(item), 
+                           unsigned int WXUNUSED(col) )

     {
     {

-        int ID = parent.GetID();
-        switch (ID)
-        {
-            case 1: return wxDataViewItem( 2 );
-            case 2: return wxDataViewItem( 3 );
-            case 5: return wxDataViewItem( 6 );
-        }
-        
-        return wxDataViewItem(0);
+        wxLogMessage( wxT("MyCustomRenderer LeftClick( %d, %d )"), cursor.x, cursor.y );
+        return false;

     }
     }

-    virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const
+
+    virtual wxSize GetSize() const

     {
     {

-        int ID = item.GetID();
-        switch (ID)
-        {
-            case 2: return wxDataViewItem( 5 );
-            case 3: return wxDataViewItem( 4 );
-            case 6: return wxDataViewItem( 7 );
-        }
-        
-        return wxDataViewItem(0);
+        //return wxSize(60,m_height);
+        return wxSize(60,20);

     }
     }

-    virtual wxDataViewItem GetNthChild(  const wxDataViewItem &parent, unsigned int n ) const
+
+    virtual bool SetValue( const wxVariant &value )

     {
     {

-        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);
+        m_height = value;
+        return true;

     }
     }

-};

 
 

-// -------------------------------------
-// MyApp
-// -------------------------------------
+    virtual bool GetValue( wxVariant &WXUNUSED(value) ) const { return true; }

 
 

-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-    int OnExit();
+private:
+    long m_height;

 };
 
 };
 

-// -------------------------------------
-// MyFrame
-// -------------------------------------
-
-class MyFrame : public wxFrame
-{
-public:
-    MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
-
-public:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-private:
-    wxDataViewCtrl* m_dataview;

 
 

-private:
-    DECLARE_EVENT_TABLE()
-};
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-// -------------------------------------
+// ----------------------------------------------------------------------------

 // MyApp
 // MyApp

-// -------------------------------------
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
     if ( !wxApp::OnInit() )
         return false;
 
 {
     if ( !wxApp::OnInit() )
         return false;
 

-    // build the first frame
-    MyFrame *frame = 
-        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
-    frame->Show(true);
-
+    MyFrame *frame =
+        new MyFrame(NULL, wxT("wxDataViewCtrl sample"), 40, 40, 1000, 540);

     SetTopWindow(frame);
     SetTopWindow(frame);

-    return true;
-}

 
 

-int MyApp::OnExit()
-{
-    return 0;
+    frame->Show(true);
+    return true;

 }
 
 
 }
 
 

-// -------------------------------------
+// ----------------------------------------------------------------------------

 // MyFrame
 // MyFrame

-// -------------------------------------
+// ----------------------------------------------------------------------------

 
 enum
 {
     // file menu
     ID_ABOUT = wxID_ABOUT,
     ID_EXIT = wxID_EXIT,
 
 enum
 {
     // file menu
     ID_ABOUT = wxID_ABOUT,
     ID_EXIT = wxID_EXIT,

+
+    ID_MUSIC_CTRL       = 50,
+
+    ID_ADD_MOZART       = 100,
+    ID_DELETE_MUSIC     = 101,
+    ID_DELETE_YEAR      = 102,
+    ID_SELECT_NINTH     = 103,
+
+    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_MOZART, MyFrame::OnAddMozart )
+    EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic )
+    EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear )
+    EVT_BUTTON( ID_SELECT_NINTH, MyFrame::OnSelectNinth )
+    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_DATAVIEW_ITEM_BEGIN_DRAG( ID_MUSIC_CTRL, MyFrame::OnBeginDrag )
+    EVT_DATAVIEW_ITEM_DROP_POSSIBLE( ID_MUSIC_CTRL, MyFrame::OnDropPossible )
+    EVT_DATAVIEW_ITEM_DROP( ID_MUSIC_CTRL, MyFrame::OnDrop )
+
+    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));
 
     SetIcon(wxICON(sample));
 

-    // build the menus:
+
+    // build the menus
+    // ----------------

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

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

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

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

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

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

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

-    m_dataview = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition,
-                                     wxDefaultSize );

 
 

-    wxObjectDataPtr<MyMusicModel> model(new MyMusicModel);
-    m_dataview->AssociateModel( model.get() );
+    // first page of the notebook
+    // --------------------------
+    
+    m_notebook = new wxNotebook( this, wxID_ANY );
+
+    wxPanel *firstPanel = new wxPanel( m_notebook, wxID_ANY );
+    m_myMusicModelViewCtrl = 
+        new wxDataViewCtrl( firstPanel, ID_MUSIC_CTRL, wxDefaultPosition,
+                            wxDefaultSize, wxDV_MULTIPLE|wxDV_VARIABLE_LINE_HEIGHT );
+
+    m_music_model = new MyMusicTreeModel;
+    m_myMusicModelViewCtrl->AssociateModel( m_music_model.get() );
+
+    m_myMusicModelViewCtrl->EnableDragSource( wxDF_UNICODETEXT );
+    m_myMusicModelViewCtrl->EnableDropTarget( wxDF_UNICODETEXT );
+
+    // column 0 of the view control:
+
+    wxDataViewTextRenderer *tr = 
+        new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT );
+    wxDataViewColumn *column0 = 
+        new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT,
+                              wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE );
+    m_myMusicModelViewCtrl->AppendColumn( column0 );
+#if 0
+    // Call this and sorting is enabled
+    // immediatly upon start up.
+    column0->SetAsSortKey();
+#endif
+
+    // column 1 of the view control:
+
+    tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    wxDataViewColumn *column1 = 
+        new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT,
+                              wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | 
+                              wxDATAVIEW_COL_RESIZABLE );
+    column1->SetMinWidth(150); // this column can't be resized to be smaller
+    m_myMusicModelViewCtrl->AppendColumn( column1 );
+
+    // column 2 of the view control:
+
+    wxDataViewSpinRenderer *sr = 
+        new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
+    wxDataViewColumn *column2 = 
+        new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT,
+                              wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE );
+    m_myMusicModelViewCtrl->AppendColumn( column2 );
+
+    // column 3 of the view control:
+
+    wxArrayString choices;
+    choices.Add( "good" );
+    choices.Add( "bad" );
+    choices.Add( "lousy" );
+    wxDataViewChoiceRenderer *c = 
+        new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT );
+    wxDataViewColumn *column3 = 
+        new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT,
+                              wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
+    m_myMusicModelViewCtrl->AppendColumn( column3 );
+
+    // column 4 of the view control:
+
+    m_myMusicModelViewCtrl->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 );
+
+    // column 5 of the view control:
+
+    MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT );
+    wxDataViewColumn *column5 = 
+        new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT,
+                              wxDATAVIEW_COL_RESIZABLE );
+    m_myMusicModelViewCtrl->AppendColumn( column5 );
+
+    // complete this page:
+
+    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+    button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART,  _("Add Mozart")),             0, wxALL, 10 );
+    button_sizer->Add( new wxButton( firstPanel, ID_DELETE_MUSIC,_("Delete selected")),        0, wxALL, 10 );
+    button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, _("Delete \"Year\" column")), 0, wxALL, 10 );
+    button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,_("Select Ninth")),           0, wxALL, 10 );
+
+    wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL );
+    m_myMusicModelViewCtrl->SetMinSize(wxSize(-1, 200));
+    firstPanelSz->Add(m_myMusicModelViewCtrl, 1, wxGROW|wxALL, 5);
+    firstPanelSz->Add(button_sizer);
+    firstPanel->SetSizerAndFit(firstPanelSz);
+
+
+    // second page of the notebook
+    // ---------------------------
+
+    wxPanel *secondPanel = new wxPanel( m_notebook, wxID_ANY );
+
+    m_myListModelViewCtrl = new wxDataViewCtrl( secondPanel, wxID_ANY, wxDefaultPosition,
+                                                wxDefaultSize, wxDV_MULTIPLE | wxDV_ROW_LINES);
+
+    m_list_model = new MyListModel;
+    m_myListModelViewCtrl->AssociateModel( m_list_model.get() );
+
+    // the various columns
+#if 1
+    m_myListModelViewCtrl->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 );
+    m_myListModelViewCtrl->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") );
+#else
+    m_myListModelViewCtrl->AppendTextColumn    (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE );
+    m_myListModelViewCtrl->AppendIconTextColumn(wxT("icon"),            1, wxDATAVIEW_CELL_INERT );
+#endif
+    m_myListModelViewCtrl->AppendColumn(
+        new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 ));
+
+    // complete this page:
+
+    wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL );
+    button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,_("Prepend")),         0, wxALL, 10 );
+    button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 10 );
+    button_sizer2->Add( new wxButton( secondPanel, ID_GOTO,        _("Goto 50")),         0, wxALL, 10 );
+    button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY,    _("Add 1000")),        0, wxALL, 10 );
+
+    wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL );
+    secondPanelSz->Add(m_myListModelViewCtrl, 1, wxGROW|wxALL, 5);
+    secondPanelSz->Add(button_sizer2);
+    secondPanel->SetSizerAndFit(secondPanelSz);
+
+
+
+    // third page of the notebook
+    // ---------------------------
+
+    wxPanel *thirdPanel = new wxPanel( m_notebook, wxID_ANY );
+
+    m_listctrl = new wxDataViewListCtrl( thirdPanel, wxID_ANY );
+    m_listctrl->AppendToggleColumn( wxT("Toggle") );
+    m_listctrl->AppendTextColumn( wxT("Text") );
+
+    wxVector<wxVariant> data;
+    data.push_back( true );
+    data.push_back( "row 1" );
+    m_listctrl->AppendItem( data );
+
+    data.clear();
+    data.push_back( false );
+    data.push_back( "row 3" );
+    m_listctrl->AppendItem( data );
+
+    // complete this page:
+
+    wxSizer *thirdPanelSz = new wxBoxSizer( wxVERTICAL );
+    thirdPanelSz->Add(m_listctrl, 1, wxGROW|wxALL, 5);
+    thirdPanel->SetSizerAndFit(thirdPanelSz);
+
+
+    // fourth page of the notebook
+    // ---------------------------
+    
+    wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY );
+
+    m_treectrl = new wxDataViewTreeCtrl( fourthPanel, wxID_ANY );
+
+    wxImageList *ilist = new wxImageList( 16, 16 );
+    ilist->Add( wxIcon(wx_small_xpm) );
+    m_treectrl->SetImageList( ilist );
+
+    wxDataViewItem parent2 = m_treectrl->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 );
+    m_treectrl->AppendItem( parent2, wxT("Child 1"), 0 );
+    m_treectrl->AppendItem( parent2, wxT("Child 2"), 0 );
+    m_treectrl->AppendItem( parent2, wxT("Child 3, very long, long, long, long"), 0 );
+
+    // complete this page:
+
+    wxSizer *fourthPanelSz = new wxBoxSizer( wxVERTICAL );
+    fourthPanelSz->Add(m_treectrl, 1, wxGROW|wxALL, 5);
+    fourthPanel->SetSizerAndFit(fourthPanelSz);
+
+
+    
+    // complete GUI
+    // ------------
+
+    m_notebook->AddPage(firstPanel, "MyMusicTreeModel");
+    m_notebook->AddPage(secondPanel, "MyListModel");
+    m_notebook->AddPage(thirdPanel, "wxDataViewListCtrl");
+    m_notebook->AddPage(fourthPanel, "wxDataViewTreeCtrl");

 
 

-    m_dataview->AppendTextColumn( "Title", 0, wxDATAVIEW_CELL_INERT, -1, 
-                                     DEFAULT_ALIGN );
-    m_dataview->AppendTextColumn( "Artist", 1, wxDATAVIEW_CELL_INERT, -1,
-                                     DEFAULT_ALIGN );
-    m_dataview->AppendTextColumn( "Year", 1, wxDATAVIEW_CELL_INERT, -1,
-                                     DEFAULT_ALIGN );
+    wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
+    
+    m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition, 
+                            wxDefaultSize, wxTE_MULTILINE );
+    m_log->SetMinSize(wxSize(-1, 100));
+    m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
+    wxLogMessage(_("This is the log window"));
+
+    mainSizer->Add( m_notebook, 1, wxGROW );
+    mainSizer->Add( m_log, 0, wxGROW );
+
+    SetSizerAndFit(mainSizer);
+}
+
+MyFrame::~MyFrame()
+{
+    delete wxLog::SetActiveTarget(m_logOld);

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


@@ -337,13 +503,267 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
     Close(true);
 }
 
     Close(true);
 }
 

+void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) )
+{
+    m_music_model->AddToClassical( wxT("Kleine Nachtmusik"), wxT("Wolfgang Mozart"), 1787 );
+}
+
+void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) )
+{
+    wxDataViewItemArray items;
+    int len = m_myMusicModelViewCtrl->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_myMusicModelViewCtrl->DeleteColumn( m_myMusicModelViewCtrl->GetColumn( 2 ) );
+    FindWindow( ID_DELETE_YEAR )->Disable();
+}
+
+void MyFrame::OnSelectNinth( wxCommandEvent& WXUNUSED(event) )
+{
+    m_myMusicModelViewCtrl->Select( m_music_model->GetNinthItem() );
+}
+
+void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) )
+{
+    m_list_model->Prepend(wxT("Test"));
+}
+
+void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) )
+{
+    wxDataViewItemArray items;
+    int len = m_myListModelViewCtrl->GetSelections( items );
+    if (len > 0)
+        m_list_model->DeleteItems( items );
+}
+
+void MyFrame::OnValueChanged( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+
+    wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d;  Column: %d"), 
+                  event.GetItem().GetID(), event.GetColumn() );
+}
+
+void MyFrame::OnActivated( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title );
+
+    if (m_myMusicModelViewCtrl->IsExpanded( event.GetItem() ))
+        wxLogMessage(wxT("Item: %s is expanded"), title );
+}
+
+void MyFrame::OnSelectionChanged( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    if (title.empty())
+        title = wxT("None");
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, First selected Item: %s"), title );
+}
+
+void MyFrame::OnExpanding( wxDataViewEvent &event )
+{
+    if (!m_log)
+        return;
+
+    wxString title = m_music_model->GetTitle( event.GetItem() );
+    wxLogMessage(wxT("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(wxT("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(wxT("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(wxT("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(wxT("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(wxT("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(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title );
+
+    wxMenu menu;
+    menu.Append( 1, wxT("entry 1") );
+    menu.Append( 2, wxT("entry 2") );
+    menu.Append( 3, wxT("entry 3") );
+
+    m_myMusicModelViewCtrl->PopupMenu(&menu);
+
+//    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),
+//                 title.GetData(), event.GetValue().GetString());
+}
+
+void MyFrame::OnHeaderClick( wxDataViewEvent &event )
+{
+    // we need to skip the event to let the default behaviour of sorting by
+    // this column when it is clicked to take place
+    event.Skip();
+
+    if(!m_log)
+        return;
+
+    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos );
+}
+
+void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos );
+}
+
+void MyFrame::OnSorted( wxDataViewEvent &event )
+{
+    if(!m_log)
+        return;
+
+    int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() );
+
+    wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos );
+}
+
+void MyFrame::OnRightClick( wxMouseEvent &event )
+{
+    if(!m_log)
+        return;
+
+    wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), 
+                 event.GetX(), event.GetY());
+}
+
+void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event))
+{
+    wxDataViewItem item = m_list_model->GetItem( 50 );
+    m_myListModelViewCtrl->EnsureVisible(item,m_col);
+}
+
+void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event))
+{
+    m_list_model->AddMany();
+}
+
+

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
     wxAboutDialogInfo info;
     info.SetName(_("DataView sample"));
 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"));
+    info.SetDescription(_("This sample demonstrates wxDataViewCtrl"));
+    info.SetCopyright(_T("(C) 2007-2009 Robert Roebling"));
+    info.AddDeveloper("Robert Roebling");
+    info.AddDeveloper("Francesco Montorsi");

 
     wxAboutBox(info);
 }
 
 
     wxAboutBox(info);
 }
 

+void MyFrame::OnBeginDrag( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drags for item, not containers
+    if (m_music_model->IsContainer( item ) )
+    {
+        event.Veto();
+        return;
+    }
+
+    MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID();
+    wxTextDataObject *obj = new wxTextDataObject;
+    obj->SetText( node->m_title );
+    event.SetDataObject( obj );
+}
+
+void MyFrame::OnDropPossible( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drags for item, not containers
+    if (m_music_model->IsContainer( item ) )
+        event.Veto();
+
+    if (event.GetDataFormat() != wxDF_UNICODETEXT)
+        event.Veto();
+}
+
+void MyFrame::OnDrop( wxDataViewEvent &event )
+{
+    wxDataViewItem item( event.GetItem() );
+
+    // only allow drops for item, not containers
+    if (m_music_model->IsContainer( item ) )
+    {
+        event.Veto();
+        return;
+    }
+
+    if (event.GetDataFormat() != wxDF_UNICODETEXT)
+    {
+        event.Veto();
+        return;
+    }
+
+    wxTextDataObject obj;
+    obj.SetData( wxDF_TEXT, event.GetDataSize(), event.GetDataBuffer() );
+
+    wxLogMessage(wxT("Text dropped: %s"), obj.GetText() );
+}
+