correct GetBestSize() to return correct best size, i.e. the same size as AutoSize...

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index fdb2c9abeb98c4861599e91a8502eed2c46abdc2..be70dd56be48e8565ed998014756901b7c22577d 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -17,15 +17,17 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #include "wx/datetime.h"
 
 #ifndef __WXMSW__
 #endif
 
 #include "wx/datetime.h"
 
 #ifndef __WXMSW__

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

 #endif
 
 #endif
 

+#include "null.xpm"
+

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


@@ -34,14 +36,14 @@
 
 WX_DECLARE_LIST(wxDateTime,wxArrayDate);
 #include <wx/listimpl.cpp>
 
 WX_DECLARE_LIST(wxDateTime,wxArrayDate);
 #include <wx/listimpl.cpp>

-WX_DEFINE_LIST(wxArrayDate);
+WX_DEFINE_LIST(wxArrayDate)

 
 class MyTextModel: public wxDataViewListModel
 {
 public:
     MyTextModel()
     {
 
 class MyTextModel: public wxDataViewListModel
 {
 public:
     MyTextModel()
     {

-        size_t i;
+        unsigned int i;

         for (i = 0; i < 1000; i++)
             m_list.Add( wxT("Test") );
         for (i = 0; i < 500; i++)
         for (i = 0; i < 1000; i++)
             m_list.Add( wxT("Test") );
         for (i = 0; i < 500; i++)


@@ -57,13 +59,13 @@ public:
             }
     }
 
             }
     }
 

-    virtual size_t GetNumberOfRows()
+    virtual unsigned int GetNumberOfRows()

         { return 1000; }
         { return 1000; }

-    virtual size_t GetNumberOfCols()
+    virtual unsigned int GetNumberOfCols()

         { return 7; }
 
     // as reported by wxVariant
         { return 7; }
 
     // as reported by wxVariant

-    virtual wxString GetColType( size_t col )
+    virtual wxString GetColType( unsigned int col )

         {
             if (col == 6)
                 return wxT("datetime");
         {
             if (col == 6)
                 return wxT("datetime");


@@ -77,7 +79,7 @@ public:
             return wxT("string");
         }
 
             return wxT("string");
         }
 

-    virtual void GetValue( wxVariant &variant, size_t col, size_t row )
+    virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row )

         {
             if (col == 6)
             {
         {
             if (col == 6)
             {


@@ -106,7 +108,7 @@ public:
                 variant = tmp;
             }
         }
                 variant = tmp;
             }
         }

-    virtual bool SetValue( wxVariant &value, size_t col, size_t row )
+    virtual bool SetValue( wxVariant &value, unsigned int col, unsigned int row )

         {
             if (col == 6)
             {
         {
             if (col == 6)
             {


@@ -131,14 +133,14 @@ public:
 };
 
 // -------------------------------------
 };
 
 // -------------------------------------

-// MyCustomCell
+// MyCustomRenderer

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

-class MyCustomCell: public wxDataViewCustomCell
+class MyCustomRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    MyCustomCell() :
-        wxDataViewCustomCell( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE )
+    MyCustomRenderer() :
+        wxDataViewCustomRenderer( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE )

     {
         m_colour = wxT("black");
     }
     {
         m_colour = wxT("black");
     }


@@ -165,8 +167,8 @@ public:
     }
     bool Activate( wxRect WXUNUSED(rect),
                    wxDataViewListModel *WXUNUSED(model),
     }
     bool Activate( wxRect WXUNUSED(rect),
                    wxDataViewListModel *WXUNUSED(model),

-                   size_t WXUNUSED(col),
-                   size_t WXUNUSED(row) )
+                   unsigned int WXUNUSED(col),
+                   unsigned int WXUNUSED(row) )

     {
         return false;
     }
     {
         return false;
     }


@@ -191,23 +193,30 @@ public:
         m_list.Add( wxT("list") );
         m_list.Add( wxT("of") );
         m_list.Add( wxT("words.") );
         m_list.Add( wxT("list") );
         m_list.Add( wxT("of") );
         m_list.Add( wxT("words.") );

+        
+        m_bitmap = wxBitmap( null_xpm );

     }
 
     }
 

-    virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
-    virtual size_t GetNumberOfCols() { return 2; }
-    virtual wxString GetColType( size_t WXUNUSED(col) ) { return wxT("string"); }
-    virtual void GetValue( wxVariant &variant, size_t col, size_t row )
+    virtual unsigned int GetNumberOfRows() { return m_list.GetCount(); }
+    virtual unsigned int GetNumberOfCols() { return 2; }
+    virtual wxString GetColType( unsigned int WXUNUSED(col) ) { return wxT("string"); }
+    virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row )

     {
         if (col == 0)
         {
             variant = m_list[row];
             return;
         }
     {
         if (col == 0)
         {
             variant = m_list[row];
             return;
         }

+        if ((col == 2) || (col == 3))
+        {
+            variant << m_bitmap;
+            return;
+        }

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

-    virtual bool SetValue( wxVariant &variant, size_t col, size_t row )
+    virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row )

     {
         if (col == 0)
         {
     {
         if (col == 0)
         {


@@ -218,7 +227,32 @@ public:
 
     }
 
 
     }
 

+    void AppendRow( const wxString &text )
+    {
+        m_list.Add( text );
+        RowAppended();
+    }
+
+    void PrependRow( const wxString &text )
+    {
+        m_list.Insert( text, 0 );
+        RowPrepended();
+    }
+
+    void InsertRowAt1( const wxString &text )
+    {
+        m_list.Insert( text, 1 );
+        RowInserted( 1 );
+    }
+
+    void DeleteRow( unsigned int index )
+    {
+        m_list.RemoveAt( index );
+        RowDeleted( index );
+    }
+

     wxArrayString m_list;
     wxArrayString m_list;

+    wxBitmap m_bitmap;

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


@@ -260,18 +294,26 @@ enum my_events
     ID_INSERT_ROW_LEFT,
     ID_DELETE_ROW_LEFT,
     ID_EDIT_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_APPEND_ROW_RIGHT,
     ID_PREPEND_ROW_RIGHT,
     ID_INSERT_ROW_RIGHT,
     ID_DELETE_ROW_RIGHT,

-    ID_EDIT_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);
 };
 
 class MySortingFrame: public wxFrame
 {
 public:
     MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);

+    ~MySortingFrame();

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


@@ -289,9 +331,25 @@ public:
     void OnDeleteRowRight(wxCommandEvent& event);
     void OnEditRowRight(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;
 private:
     wxDataViewCtrl* dataview_left;
     wxDataViewCtrl* dataview_right;

+    
+    wxLog          *m_logOld;
+    wxTextCtrl     *m_logWindow;
+
+    MyUnsortedTextModel        *m_unsorted_model;
+    wxDataViewSortedListModel  *m_sorted_model;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -310,11 +368,11 @@ bool MyApp::OnInit(void)
     MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
     frame->Show(true);
 
     MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
     frame->Show(true);
 

-    MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 350, 600, 300);
+    MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500);

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

-
+    

     return true;
 }
 
     return true;
 }
 


@@ -325,11 +383,7 @@ bool MyApp::OnInit(void)
 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))
 {
 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))
 {

-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#else
-    SetIcon(wxIcon(mondrian_xpm));
-#endif
+    SetIcon(wxICON(sample));

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


@@ -347,9 +401,11 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 
     CreateStatusBar();
 
 
     CreateStatusBar();
 

+    wxPanel *panel = new wxPanel( this, wxID_ANY );
+

 
     // Left wxDataViewCtrl
 
     // Left wxDataViewCtrl

-    dataview_left = new wxDataViewCtrl( this, wxID_ANY );
+    dataview_left = new wxDataViewCtrl( panel, wxID_ANY );

 
     MyTextModel *model = new MyTextModel;
     dataview_left->AssociateModel( model );
 
     MyTextModel *model = new MyTextModel;
     dataview_left->AssociateModel( model );


@@ -357,14 +413,14 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     dataview_left->AppendTextColumn( wxT("first"), 0 );
     dataview_left->AppendTextColumn( wxT("second"), 1 );
 
     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 );
+    wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 2 );

     dataview_left->AppendColumn( column );
 
     dataview_left->AppendToggleColumn( wxT("fourth"), 3 );
 
     dataview_left->AppendColumn( column );
 
     dataview_left->AppendToggleColumn( wxT("fourth"), 3 );
 

-    MyCustomCell *custom_cell = new MyCustomCell;
-    column = new wxDataViewColumn( wxT("custom"), custom_cell, 4 );
+    MyCustomRenderer *custom_renderer = new MyCustomRenderer;
+    column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4 );

     dataview_left->AppendColumn( column );
 
     dataview_left->AppendProgressColumn( wxT("progress"), 5 );
     dataview_left->AppendColumn( column );
 
     dataview_left->AppendProgressColumn( wxT("progress"), 5 );


@@ -372,16 +428,16 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     dataview_left->AppendDateColumn( wxT("date"), 6 );
 
     // Right wxDataViewCtrl using the same model
     dataview_left->AppendDateColumn( wxT("date"), 6 );
 
     // Right wxDataViewCtrl using the same model

-    dataview_right = new wxDataViewCtrl( this, wxID_ANY );
+    dataview_right = new wxDataViewCtrl( panel, wxID_ANY );

     dataview_right->AssociateModel( model );
 
     dataview_right->AssociateModel( model );
 

-    text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_cell, 2 );
+    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 );
     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_ACTIVATABLE );
-    column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3 );
+    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 );
     dataview_right->AppendColumn( column );
 
     dataview_right->AppendDateColumn( wxT("date"), 6 );


@@ -392,7 +448,7 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     sizer->Add( dataview_left, 3, wxGROW );
     sizer->Add(10,10);
     sizer->Add( dataview_right, 2, wxGROW );
     sizer->Add( dataview_left, 3, wxGROW );
     sizer->Add(10,10);
     sizer->Add( dataview_right, 2, wxGROW );

-    SetSizer( sizer );
+    panel->SetSizer( sizer );

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


@@ -414,16 +470,24 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 
 BEGIN_EVENT_TABLE(MySortingFrame,wxFrame)
     EVT_BUTTON( ID_APPEND_ROW_LEFT, MySortingFrame::OnAppendRowLeft )
 
 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))
 {
 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))
 {

-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#else
-    SetIcon(wxIcon(mondrian_xpm));
-#endif
+    m_logOld = NULL;
+    
+    SetIcon(wxICON(sample));

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


@@ -443,23 +507,26 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
 
 
     // Left wxDataViewCtrl
 
 
     // Left wxDataViewCtrl

-    dataview_left = new wxDataViewCtrl( this, wxID_ANY );
+    dataview_left = new wxDataViewCtrl( this, ID_UNSORTED, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE );

 
 

-    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 );
+    m_unsorted_model = new MyUnsortedTextModel;
+    dataview_left->AssociateModel( m_unsorted_model );
+    wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( 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( 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
 
     // Right wxDataViewCtrl using the sorting model

-    dataview_right = new wxDataViewCtrl( this, wxID_ANY );
-    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 = new wxDataViewCtrl( this, ID_SORTED );
+    
+    m_sorted_model = new wxDataViewSortedListModel( m_unsorted_model );
+    dataview_right->AssociateModel( m_sorted_model );
+    text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE );

     dataview_right->AppendColumn( column );
     dataview_right->AppendColumn( column );

+    

     dataview_right->AppendTextColumn( wxT("second"), 1 );
 
     // layout dataview controls.
     dataview_right->AppendTextColumn( wxT("second"), 1 );
 
     // layout dataview controls.


@@ -475,15 +542,18 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     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_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_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 );

     left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
     left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );

+    left_sizer->Add( 5,5 );
+    left_sizer->Add( new wxButton( this, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( this, 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( 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 );
     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_DELETE_ROW_RIGHT, wxT("Delete second") ), 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 );
     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 );


@@ -491,10 +561,70 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     main_sizer->Add( top_sizer, 1, wxGROW );
     main_sizer->Add( button_sizer, 0, wxGROW );
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     main_sizer->Add( top_sizer, 1, wxGROW );
     main_sizer->Add( button_sizer, 0, wxGROW );

+    
+    m_logWindow = new wxTextCtrl(this, 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));

 
     SetSizer( main_sizer );
 }
 
 
     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() );
+}
+
+void MySortingFrame::OnActivatedUnsorted(wxDataViewEvent &event)
+{
+    wxLogMessage( wxT("OnActivated from unsorted list, activated %d"), (int) event.GetRow() );
+}
+
+void MySortingFrame::OnHeaderClickSorted(wxDataViewEvent &event)
+{
+    wxDataViewColumn *col = event.GetDataViewColumn();
+    wxLogMessage( wxT("OnHeaderClick from sorted list, column %s"), col->GetTitle().c_str() );
+    
+    if (col->GetTitle() == wxT("editable"))
+    {
+        // this is the sorting column
+        if (col->IsSortOrderAscending())
+        {
+            col->SetSortOrder( false );
+            m_sorted_model->SetAscending( false );
+            m_sorted_model->Resort();
+        }
+        else
+        {
+            col->SetSortOrder( true );
+            m_sorted_model->SetAscending( true );
+            m_sorted_model->Resort();
+        }
+    }
+}
+
+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::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(true);


@@ -508,20 +638,52 @@ void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     dialog.ShowModal();
 }
 
     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))
 {
 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))
 {
 }
 
 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))
 {
 }
 
 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))
 {
 }
 
 void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& WXUNUSED(event))
 {

+    m_unsorted_model->DeleteRow( 1 );

 }
 
 void MySortingFrame::OnEditRowLeft(wxCommandEvent& WXUNUSED(event))
 }
 
 void MySortingFrame::OnEditRowLeft(wxCommandEvent& WXUNUSED(event))