X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b910a8add446261996bc8d22e6545e6bdb373b8b..936425786109f020d1e26b329a9c7626977eb25d:/samples/dataview/dataview.cpp

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 63cbb69d38..0f96a10c0d 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -17,13 +17,13 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/wx.h"
 #endif
 
 #include "wx/datetime.h"
 
 #ifndef __WXMSW__
-#include "mondrian.xpm"
+    #include "../sample.xpm"
 #endif
 
 #include "wx/dataview.h"
@@ -147,7 +147,7 @@ public:
         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"))
@@ -163,8 +163,10 @@ public:
     {
         return wxSize(20,8);
     }
-    bool Activate( wxRect rect,
-                   wxDataViewListModel *model, size_t col, size_t row )
+    bool Activate( wxRect WXUNUSED(rect),
+                   wxDataViewListModel *WXUNUSED(model),
+                   size_t WXUNUSED(col),
+                   size_t WXUNUSED(row) )
     {
         return false;
     }
@@ -193,7 +195,7 @@ public:
 
     virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
     virtual size_t GetNumberOfCols() { return 2; }
-    virtual wxString GetColType( size_t col ) { return wxT("string"); }
+    virtual wxString GetColType( size_t WXUNUSED(col) ) { return wxT("string"); }
     virtual void GetValue( wxVariant &variant, size_t col, size_t row )
     {
         if (col == 0)
@@ -323,11 +325,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))
 {
-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#else
-    SetIcon(wxIcon(mondrian_xpm));
-#endif
+    SetIcon(wxICON(sample));
 
     wxMenu *file_menu = new wxMenu;
 
@@ -345,9 +343,11 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 
     CreateStatusBar();
 
+    wxPanel *panel = new wxPanel( this, wxID_ANY );
+
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, -1 );
+    dataview_left = new wxDataViewCtrl( panel, wxID_ANY );
 
     MyTextModel *model = new MyTextModel;
     dataview_left->AssociateModel( model );
@@ -370,7 +370,7 @@ 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_right = new wxDataViewCtrl( this, -1 );
+    dataview_right = new wxDataViewCtrl( panel, wxID_ANY );
     dataview_right->AssociateModel( model );
 
     text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
@@ -379,7 +379,7 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     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 );
+    column = new wxDataViewColumn( wxT("bool"), toggle_cell, 3, 30 );
     dataview_right->AppendColumn( column );
 
     dataview_right->AppendDateColumn( wxT("date"), 6 );
@@ -390,7 +390,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 );
-    SetSizer( sizer );
+    panel->SetSizer( sizer );
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
@@ -417,11 +417,7 @@ 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
+    SetIcon(wxICON(sample));
 
     wxMenu *file_menu = new wxMenu;
 
@@ -441,7 +437,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
 
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, -1 );
+    dataview_left = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE );
 
     MyUnsortedTextModel *model = new MyUnsortedTextModel;
     dataview_left->AssociateModel( model );
@@ -451,7 +447,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     dataview_left->AppendTextColumn( wxT("second"), 1 );
 
     // Right wxDataViewCtrl using the sorting model
-    dataview_right = new wxDataViewCtrl( this, -1 );
+    dataview_right = new wxDataViewCtrl( this, wxID_ANY );
     wxDataViewSortedListModel *sorted_model =
         new wxDataViewSortedListModel( model );
     dataview_right->AssociateModel( sorted_model );
@@ -506,43 +502,43 @@ void MySortingFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     dialog.ShowModal();
 }
 
-void MySortingFrame::OnAppendRowLeft(wxCommandEvent& event)
+void MySortingFrame::OnAppendRowLeft(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnPrependRowLeft(wxCommandEvent& event)
+void MySortingFrame::OnPrependRowLeft(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnInsertRowLeft(wxCommandEvent& event)
+void MySortingFrame::OnInsertRowLeft(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& event)
+void MySortingFrame::OnDeleteRowLeft(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnEditRowLeft(wxCommandEvent& event)
+void MySortingFrame::OnEditRowLeft(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnAppendRowRight(wxCommandEvent& event)
+void MySortingFrame::OnAppendRowRight(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnPrependRowRight(wxCommandEvent& event)
+void MySortingFrame::OnPrependRowRight(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnInsertRowRight(wxCommandEvent& event)
+void MySortingFrame::OnInsertRowRight(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnDeleteRowRight(wxCommandEvent& event)
+void MySortingFrame::OnDeleteRowRight(wxCommandEvent& WXUNUSED(event))
 {
 }
 
-void MySortingFrame::OnEditRowRight(wxCommandEvent& event)
+void MySortingFrame::OnEditRowRight(wxCommandEvent& WXUNUSED(event))
 {
 }