diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index c3bfb5e58d..5effcb4f1f 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -45,7 +45,7 @@ MyApp::MyApp() bool MyApp::OnInit() { // Create the main frame window - frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500); + frame = new MyFrame(NULL, "wxWindows Layout Demo", -1, -1, 400, 300); frame->SetAutoLayout(TRUE); @@ -55,7 +55,6 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(LAYOUT_LOAD_FILE, "&Load file", "Load a text file"); file_menu->Append(LAYOUT_TEST_SIZER, "&Test sizers", "Test sizer"); file_menu->Append(LAYOUT_TEST_NB, "&Test notebook sizers", "Test notebook sizer"); @@ -74,21 +73,19 @@ bool MyApp::OnInit() frame->SetMenuBar(menu_bar); // Make a panel - frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL); - frame->panel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); -// frame->panel->SetAutoLayout(TRUE); + wxPanel *panel = new wxPanel(frame); // Create some panel items - wxButton *btn1 = new wxButton(frame->panel, -1, "A button (1)") ; + wxButton *btn1 = new wxButton(panel, -1, "A button (1)") ; wxLayoutConstraints *b1 = new wxLayoutConstraints; - b1->centreX.SameAs (frame->panel, wxCentreX); - b1->top.SameAs (frame->panel, wxTop, 5); - b1->width.PercentOf (frame->panel, wxWidth, 80); - b1->height.PercentOf (frame->panel, wxHeight, 10); + b1->centreX.SameAs (panel, wxCentreX); + b1->top.SameAs (panel, wxTop, 5); + b1->width.PercentOf (panel, wxWidth, 80); + b1->height.AsIs (); btn1->SetConstraints(b1); - wxListBox *list = new wxListBox(frame->panel, -1, + wxListBox *list = new wxListBox(panel, -1, wxPoint(-1, -1), wxSize(200, 100)); list->Append("Apple"); list->Append("Pear"); @@ -98,28 +95,24 @@ bool MyApp::OnInit() wxLayoutConstraints *b2 = new wxLayoutConstraints; b2->top.Below (btn1, 5); - b2->left.SameAs (frame->panel, wxLeft, 5); - b2->width.PercentOf (frame->panel, wxWidth, 40); - b2->bottom.SameAs (frame->panel, wxBottom, 5); + b2->left.SameAs (panel, wxLeft, 5); + b2->width.PercentOf (panel, wxWidth, 40); + b2->bottom.SameAs (panel, wxBottom, 5); list->SetConstraints(b2); - wxTextCtrl *mtext = new wxTextCtrl(frame->panel, -1, "Some text", - wxPoint(-1, -1), wxSize(150, 100)); + wxTextCtrl *mtext = new wxTextCtrl(panel, -1, "Some text"); wxLayoutConstraints *b3 = new wxLayoutConstraints; b3->top.Below (btn1, 5); b3->left.RightOf (list, 5); - b3->right.SameAs (frame->panel, wxRight, 5); - b3->bottom.SameAs (frame->panel, wxBottom, 5); + b3->right.SameAs (panel, wxRight, 5); + b3->bottom.SameAs (panel, wxBottom, 5); mtext->SetConstraints(b3); - frame->canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED); - - // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction -// canvas->SetScrollbars(20, 20, 50, 50, 4, 4); + MyWindow *canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED); // Make a text window - frame->text_window = new MyTextWindow(frame, 0, 250, 400, 250); + MyTextWindow *text_window = new MyTextWindow(frame, 0, 250, 400, 150); // Set constraints for panel subwindow wxLayoutConstraints *c1 = new wxLayoutConstraints; @@ -129,32 +122,33 @@ bool MyApp::OnInit() c1->right.PercentOf (frame, wxWidth, 50); c1->height.PercentOf (frame, wxHeight, 50); - frame->panel->SetConstraints(c1); + panel->SetConstraints(c1); // Set constraints for canvas subwindow wxLayoutConstraints *c2 = new wxLayoutConstraints; - c2->left.SameAs (frame->panel, wxRight); + c2->left.SameAs (panel, wxRight); c2->top.SameAs (frame, wxTop); c2->right.SameAs (frame, wxRight); c2->height.PercentOf (frame, wxHeight, 50); - frame->canvas->SetConstraints(c2); + canvas->SetConstraints(c2); // Set constraints for text subwindow wxLayoutConstraints *c3 = new wxLayoutConstraints; c3->left.SameAs (frame, wxLeft); - c3->top.Below (frame->panel); + c3->top.Below (panel); c3->right.SameAs (frame, wxRight); c3->bottom.SameAs (frame, wxBottom); - frame->text_window->SetConstraints(c3); + text_window->SetConstraints(c3); frame->Show(TRUE); frame->SetStatusText("wxWindows layout demo"); SetTopWindow(frame); + return TRUE; } @@ -163,43 +157,26 @@ bool MyApp::OnInit() //----------------------------------------------------------------- // Define my frame constructor -MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): - wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) +MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h) + : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) { - panel = (wxPanel *) NULL; - text_window = (MyTextWindow *) NULL; - canvas = (MyWindow *) NULL; } BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile) - EVT_MENU(LAYOUT_QUIT, MyFrame::Quit) + EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit) EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestSizers) EVT_MENU(LAYOUT_TEST_NB, MyFrame::TestNotebookSizers) EVT_MENU(LAYOUT_ABOUT, MyFrame::About) - EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() -void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { - wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, - (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") ); - if (s != "") - { -#ifdef __WXMSW__ - frame->text_window->LoadFile(s); -#endif - } -} - -void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) ) -{ - this->Close(TRUE); + Close(TRUE); } void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) ) { - MySizerFrame *newFrame = new MySizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 ); + MySizerFrame *newFrame = new MySizerFrame(NULL, "Sizer Test Frame", 50, 50); newFrame->Show(TRUE); } @@ -256,14 +233,28 @@ void MyFrame::About(wxCommandEvent& WXUNUSED(event) ) "About Layout Demo", wxOK|wxCENTRE); } -// Size the subwindows when the frame is resized -void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) ) +//----------------------------------------------------------------- +// MyWindow +//----------------------------------------------------------------- + +BEGIN_EVENT_TABLE(MyWindow, wxWindow) + EVT_PAINT(MyWindow::OnPaint) +END_EVENT_TABLE() + +// Define a constructor for my canvas +MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style) + : wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style) { - Layout(); } -void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) ) +MyWindow::~MyWindow() { +} + +// Define the repainting behaviour +void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); dc.SetPen(* wxGREEN_PEN); dc.DrawLine(0, 0, 200, 200); dc.DrawLine(200, 0, 0, 200); @@ -284,37 +275,12 @@ void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) ) dc.DrawArc(50, 300, 100, 250, 100, 300 ); } -//----------------------------------------------------------------- -// MyWindow -//----------------------------------------------------------------- - -BEGIN_EVENT_TABLE(MyWindow, wxWindow) - EVT_PAINT(MyWindow::OnPaint) -END_EVENT_TABLE() - -// Define a constructor for my canvas -MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style): - wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style) -{ -} - -MyWindow::~MyWindow() -{ -} - -// Define the repainting behaviour -void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - frame->Draw(dc,TRUE); -} - //----------------------------------------------------------------- // MySizerFrame //----------------------------------------------------------------- -MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): - wxFrame(frame, -1, title, wxPoint(x, y) ) +MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ) + : wxFrame(frame, -1, title, wxPoint(x, y) ) { // we want to get a dialog that is stretchable because it // has a text ctrl in the middle. at the bottom, we have @@ -394,12 +360,8 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): 0, // make vertically unstretchable wxCENTER ); // no border and centre horizontally - SetAutoLayout( TRUE ); - - // set frame to minimum size - topsizer->Fit( this ); - - // don't allow frame to get smaller than what the sizers tell ye + // don't allow frame to get smaller than what the sizers tell it and also set + // the initial size as calculated by the sizers topsizer->SetSizeHints( this ); SetSizer( topsizer ); diff --git a/samples/layout/layout.h b/samples/layout/layout.h index eba0332e16..e70addbe1a 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -24,15 +24,10 @@ class MyWindow; class MyFrame: public wxFrame { public: - wxPanel *panel; - MyTextWindow *text_window; - MyWindow *canvas; - MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h); - void OnSize(wxSizeEvent& event); - void Draw(wxDC& dc, bool draw_bitmaps = TRUE); + MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h); + + void OnQuit(wxCommandEvent& event); - void LoadFile(wxCommandEvent& event); - void Quit(wxCommandEvent& event); void TestSizers(wxCommandEvent& event); void TestNotebookSizers(wxCommandEvent& event); void About(wxCommandEvent& event); @@ -61,7 +56,7 @@ public: ~MyWindow(); void OnPaint(wxPaintEvent& event); -private: +private: DECLARE_EVENT_TABLE() }; @@ -75,6 +70,5 @@ public: #define LAYOUT_QUIT 100 #define LAYOUT_TEST 101 #define LAYOUT_ABOUT 102 -#define LAYOUT_LOAD_FILE 103 #define LAYOUT_TEST_SIZER 104 #define LAYOUT_TEST_NB 105