Forgot to commit.

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index f3145ac26c604ee75909e1a04fae18c2bbd76f7e..673fe97b9340aabb60ed099c0194a559360410c0 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -17,13 +17,13 @@
 #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
 
 #include "wx/dataview.h"
 #endif
 
 #include "wx/dataview.h"


@@ -34,7 +34,7 @@
 
 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
 {
 
 class MyTextModel: public wxDataViewListModel
 {


@@ -325,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))
 {
 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 +343,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 );


@@ -372,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_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 );
 
     text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
     dataview_right->AssociateModel( model );
 
     text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );


@@ -392,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 );
     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) )


@@ -419,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))
 {
 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;
 
 
     wxMenu *file_menu = new wxMenu;