fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 3fb311897b8f631bacb7910ef2036473bc42fa29..be407a5b51798eacf295bd29e1d704b600e29229 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -20,6 +20,8 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#include "wx/datetime.h"
+

 #ifndef __WXMSW__
 #include "mondrian.xpm"
 #endif
 #ifndef __WXMSW__
 #include "mondrian.xpm"
 #endif


@@ -30,10 +32,14 @@
 // MyTextModel
 // -------------------------------------
 
 // MyTextModel
 // -------------------------------------
 

+WX_DECLARE_LIST(wxDateTime,wxArrayDate);
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxArrayDate);
+

 class MyTextModel: public wxDataViewListModel
 {
 public:
 class MyTextModel: public wxDataViewListModel
 {
 public:

-    MyTextModel() 
+    MyTextModel()

     {
         size_t i;
         for (i = 0; i < 1000; i++)
     {
         size_t i;
         for (i = 0; i < 1000; i++)


@@ -42,45 +48,70 @@ public:
             { m_bools.Add( 0 ); m_bools.Add( 1 ); }
         for (i = 0; i < 500; i++)
             { m_colours.Add( wxT("red") ); m_colours.Add( wxT("green") ); }
             { m_bools.Add( 0 ); m_bools.Add( 1 ); }
         for (i = 0; i < 500; i++)
             { m_colours.Add( wxT("red") ); m_colours.Add( wxT("green") ); }

+        for (i = 0; i < 1000; i++)
+            { m_progress.Add( i/10 ); }
+        for (i = 0; i < 1000; i++)
+            {
+                wxDateTime *date = new wxDateTime( wxDateTime::Now() );
+                m_dates.Append( date );
+            }

     }
     }

-    
-    virtual size_t GetNumberOfRows() 
+
+    virtual size_t GetNumberOfRows()

         { return 1000; }
     virtual size_t GetNumberOfCols()
         { return 1000; }
     virtual size_t GetNumberOfCols()

-        { return 5; }
-        
+        { return 7; }
+

     // as reported by wxVariant
     virtual wxString GetColType( size_t col )
         {
     // as reported by wxVariant
     virtual wxString GetColType( size_t col )
         {

+            if (col == 6)
+                return wxT("datetime");
+
+            if (col == 5)
+                return wxT("long");
+

             if (col == 3)
                 return wxT("bool");
             if (col == 3)
                 return wxT("bool");

-                 
-            return wxT("string"); 
+
+            return wxT("string");

         }
         }

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

         {
         {

-            if (col == 3)
+            if (col == 6)

             {
             {

-                return (bool) m_bools[row];
-            } else 
+                variant = (wxDateTime) *m_dates[row];
+            } else
+            if (col == 5)
+            {
+                variant = (long) m_progress[row];
+            } else

             if (col == 4)
             {
             if (col == 4)
             {

-                return m_colours[row];
-            }
+                variant = m_colours[row];
+            } else
+            if (col == 3)
+            {
+                variant = (bool) m_bools[row];
+            } else

             if (col == 2)
             {
             if (col == 2)
             {

-                return m_list[row];
+                variant = m_list[row];

             }
             else
             {
             }
             else
             {

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

             }
         }
     virtual bool SetValue( wxVariant &value, size_t col, size_t row )
         {
             }
         }
     virtual bool SetValue( wxVariant &value, size_t col, size_t row )
         {

+            if (col == 6)
+            {
+                *m_dates[row] = value.GetDateTime();
+            } else

             if (col == 3)
             {
                 m_bools[row] = (int) value.GetBool();
             if (col == 3)
             {
                 m_bools[row] = (int) value.GetBool();


@@ -91,10 +122,12 @@ public:
             }
             return true;
         }
             }
             return true;
         }

-    
+

     wxArrayString m_list;
     wxArrayInt    m_bools;
     wxArrayString m_colours;
     wxArrayString m_list;
     wxArrayInt    m_bools;
     wxArrayString m_colours;

+    wxArrayInt    m_progress;
+    wxArrayDate   m_dates;

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


@@ -105,23 +138,23 @@ class MyCustomCell: public wxDataViewCustomCell
 {
 public:
     MyCustomCell() :
 {
 public:
     MyCustomCell() :

-        wxDataViewCustomCell( wxT("string"), wxDATAVIEW_CELL_INERT ) 
-    { 
-        m_colour = wxT("black"); 
+        wxDataViewCustomCell( wxT("string"), wxDATAVIEW_CELL_ACTIVATABLE )
+    {
+        m_colour = wxT("black");

     }
     bool SetValue( const wxVariant &value )
     {
         m_colour = value.GetString();
         return true;
     }
     }
     bool SetValue( const wxVariant &value )
     {
         m_colour = value.GetString();
         return true;
     }

-    bool Render( wxRect rect, wxDC *dc, int state )
+    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 );
     {
         dc->SetPen( *wxBLACK_PEN );
         if (m_colour == wxT("red"))
             dc->SetBrush( *wxRED_BRUSH );
         else if (m_colour == wxT("green"))
             dc->SetBrush( *wxGREEN_BRUSH );

-        else 
+        else

             dc->SetBrush( *wxBLACK_BRUSH );
         dc->DrawRectangle( rect );
         return true;
             dc->SetBrush( *wxBLACK_BRUSH );
         dc->DrawRectangle( rect );
         return true;


@@ -130,9 +163,62 @@ public:
     {
         return wxSize(20,8);
     }
     {
         return wxSize(20,8);
     }

+    bool Activate( wxRect WXUNUSED(rect),
+                   wxDataViewListModel *WXUNUSED(model),
+                   size_t WXUNUSED(col),
+                   size_t WXUNUSED(row) )
+    {
+        return false;
+    }

 
 private:
 
 private:

-    wxString m_colour;    
+    wxString m_colour;
+};
+
+// -------------------------------------
+// MyUnsortedTextModel
+// -------------------------------------
+
+class MyUnsortedTextModel: public wxDataViewListModel
+{
+public:
+    MyUnsortedTextModel()
+    {
+        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.") );
+    }
+
+    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 )
+    {
+        if (col == 0)
+        {
+            variant = m_list[row];
+            return;
+        }
+        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 )
+    {
+        if (col == 0)
+        {
+            m_list[row] = variant.GetString();
+            return true;
+        }
+        return false;
+
+    }
+
+    wxArrayString m_list;

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


@@ -157,10 +243,57 @@ public:
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

-    
+
+private:
+    wxDataViewCtrl* dataview_left;
+    wxDataViewCtrl* dataview_right;
+};
+
+// -------------------------------------
+// MySortingFrame
+// -------------------------------------
+
+enum my_events
+{
+    ID_APPEND_ROW_LEFT = 1000,
+    ID_PREPEND_ROW_LEFT,
+    ID_INSERT_ROW_LEFT,
+    ID_DELETE_ROW_LEFT,
+    ID_EDIT_ROW_LEFT,
+
+    ID_APPEND_ROW_RIGHT,
+    ID_PREPEND_ROW_RIGHT,
+    ID_INSERT_ROW_RIGHT,
+    ID_DELETE_ROW_RIGHT,
+    ID_EDIT_ROW_RIGHT
+};
+
+class MySortingFrame: public wxFrame
+{
+public:
+    MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
+
+public:
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+
+    void OnAppendRowLeft(wxCommandEvent& event);
+    void OnPrependRowLeft(wxCommandEvent& event);
+    void OnInsertRowLeft(wxCommandEvent& event);
+    void OnDeleteRowLeft(wxCommandEvent& event);
+    void OnEditRowLeft(wxCommandEvent& event);
+
+    void OnAppendRowRight(wxCommandEvent& event);
+    void OnPrependRowRight(wxCommandEvent& event);
+    void OnInsertRowRight(wxCommandEvent& event);
+    void OnDeleteRowRight(wxCommandEvent& event);
+    void OnEditRowRight(wxCommandEvent& event);
+

 private:
     wxDataViewCtrl* dataview_left;
     wxDataViewCtrl* dataview_right;
 private:
     wxDataViewCtrl* dataview_left;
     wxDataViewCtrl* dataview_right;

+
+    DECLARE_EVENT_TABLE()

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


@@ -174,10 +307,12 @@ IMPLEMENT_APP  (MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWidgets App"), 50, 50, 600, 340);
-
+    MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);

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

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

     SetTopWindow(frame);
 
     return true;
     SetTopWindow(frame);
 
     return true;


@@ -211,45 +346,55 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
                     wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
 
     CreateStatusBar();
                     wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
 
     CreateStatusBar();

-    
-    
+
+    wxPanel *panel = new wxPanel( this, -1 );
+
+

     // Left wxDataViewCtrl
     // Left wxDataViewCtrl

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

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

-    
+

     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 );
     dataview_left->AppendColumn( column );
     wxDataViewTextCell *text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
     wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 2 );
     dataview_left->AppendColumn( column );

-    
+

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

-    
+

     MyCustomCell *custom_cell = new MyCustomCell;
     column = new wxDataViewColumn( wxT("custom"), custom_cell, 4 );
     dataview_left->AppendColumn( column );
     MyCustomCell *custom_cell = new MyCustomCell;
     column = new wxDataViewColumn( wxT("custom"), custom_cell, 4 );
     dataview_left->AppendColumn( column );

-    
+
+    dataview_left->AppendProgressColumn( wxT("progress"), 5 );
+
+    dataview_left->AppendDateColumn( wxT("date"), 6 );
+

     // Right wxDataViewCtrl using the same model
     // Right wxDataViewCtrl using the same model

-    dataview_right = new wxDataViewCtrl( this, -1 );
+    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 );
     dataview_right->AppendColumn( column );
     dataview_right->AppendTextColumn( wxT("first"), 0 );
     dataview_right->AppendTextColumn( wxT("second"), 1 );
     text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
     column = new wxDataViewColumn( wxT("editable"), text_cell, 2 );
     dataview_right->AppendColumn( column );
     dataview_right->AppendTextColumn( wxT("first"), 0 );
     dataview_right->AppendTextColumn( wxT("second"), 1 );

-    wxDataViewToggleCell *toggle_cell = new wxDataViewToggleCell( wxT("bool"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3 );
+    wxDataViewToggleCell *toggle_cell = new wxDataViewToggleCell( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE );
+    column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3, 30 );

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

-    
+
+    dataview_right->AppendDateColumn( wxT("date"), 6 );
+
+    // layout dataview controls.
+

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

-    sizer->Add( dataview_left, 1, wxGROW );
+    sizer->Add( dataview_left, 3, wxGROW );

     sizer->Add(10,10);
     sizer->Add(10,10);

-    sizer->Add( dataview_right, 1, wxGROW );
-    SetSizer( sizer );
+    sizer->Add( dataview_right, 2, wxGROW );
+    panel->SetSizer( sizer );

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


@@ -265,4 +410,143 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }
 

+// -------------------------------------
+// MySortingFrame
+// -------------------------------------
+
+BEGIN_EVENT_TABLE(MySortingFrame,wxFrame)
+    EVT_BUTTON( ID_APPEND_ROW_LEFT, MySortingFrame::OnAppendRowLeft )
+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
+
+    wxMenu *file_menu = new wxMenu;
+
+    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
+    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, _T("&File"));
+    SetMenuBar(menu_bar);
+
+    // You used to have to do some casting for param 4, but now there are type-safe handlers
+    Connect( DYNAMIC_QUIT,  wxID_ANY,
+                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnQuit) );
+    Connect( DYNAMIC_ABOUT, wxID_ANY,
+                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnAbout) );
+
+    CreateStatusBar();
+
+
+    // Left wxDataViewCtrl
+    dataview_left = new wxDataViewCtrl( this, wxID_ANY, 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 );
+    dataview_left->AppendColumn( column );
+    dataview_left->AppendTextColumn( wxT("second"), 1 );
+
+    // 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->AppendColumn( column );
+    dataview_right->AppendTextColumn( wxT("second"), 1 );
+
+    // layout dataview controls.
+
+    wxBoxSizer *top_sizer = new wxBoxSizer( wxHORIZONTAL );
+    top_sizer->Add( dataview_left, 1, wxGROW );
+    top_sizer->Add(10,10);
+    top_sizer->Add( dataview_right, 1, wxGROW );
+
+    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+    button_sizer->Add( 10, 10, 1 );
+    wxFlexGridSizer *left_sizer = new wxFlexGridSizer( 2 );
+    left_sizer->Add( new wxButton( this, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( this, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( this, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( this, ID_DELETE_ROW_LEFT, wxT("Delete") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
+    button_sizer->Add( left_sizer );
+    button_sizer->Add( 10, 10, 2 );
+    wxFlexGridSizer *right_sizer = new wxFlexGridSizer( 2 );
+    right_sizer->Add( new wxButton( this, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( this, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( this, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( this, ID_DELETE_ROW_RIGHT, wxT("Delete") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( this, ID_EDIT_ROW_RIGHT, wxT("Edit") ), 0, wxALL, 5 );
+    button_sizer->Add( right_sizer );
+    button_sizer->Add( 10, 10, 1 );
+
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+    main_sizer->Add( top_sizer, 1, wxGROW );
+    main_sizer->Add( button_sizer, 0, wxGROW );
+
+    SetSizer( main_sizer );
+}
+
+void MySortingFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
+{
+    Close(true);
+}
+
+void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+{
+    wxMessageDialog dialog(this, _T("This demonstrates the dataview control sorting"),
+        _T("About DataView"), wxOK);
+
+    dialog.ShowModal();
+}
+
+void MySortingFrame::OnAppendRowLeft(wxCommandEvent& WXUNUSED(event))
+{
+}
+
+void MySortingFrame::OnPrependRowLeft(wxCommandEvent& WXUNUSED(event))
+{
+}
+
+void MySortingFrame::OnInsertRowLeft(wxCommandEvent& WXUNUSED(event))
+{
+}
+
+void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& WXUNUSED(event))
+{
+}
+
+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 MySortingFrame::OnEditRowRight(wxCommandEvent& WXUNUSED(event))
+{
+}