allow adjusting the combo button size (patch 1489452)

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 0e4b0d7d412d9ca32611b4e2b12a2e8121b35733..be407a5b51798eacf295bd29e1d704b600e29229 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -347,9 +347,11 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
 
     CreateStatusBar();
 
+    wxPanel *panel = new wxPanel( this, -1 );
+
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, wxID_ANY );
+    dataview_left = new wxDataViewCtrl( panel, wxID_ANY );
 
     MyTextModel *model = new MyTextModel;
     dataview_left->AssociateModel( model );
@@ -372,7 +374,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, wxID_ANY );
+    dataview_right = new wxDataViewCtrl( panel, wxID_ANY );
     dataview_right->AssociateModel( model );
 
     text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
@@ -392,7 +394,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) )
@@ -443,7 +445,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
 
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, wxID_ANY );
+    dataview_left = new wxDataViewCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE );
 
     MyUnsortedTextModel *model = new MyUnsortedTextModel;
     dataview_left->AssociateModel( model );