From 9e023db73b44392a07c52f88c9b11d34d312e89f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 27 Feb 2003 12:02:22 +0000 Subject: [PATCH] updated the sample to show the sizers, not constraints, in the main frame; also demonstrate flex grid sizer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/layout/layout.cpp | 502 ++++++++++++++++++++++---------------- samples/layout/layout.h | 60 +++-- 2 files changed, 319 insertions(+), 243 deletions(-) diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index c849af51ae..c2e29eced2 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -24,17 +28,15 @@ #error You must set wxUSE_CONSTRAINTS to 1 in setup.h! #endif -#include - #include "wx/sizer.h" #include "wx/statline.h" #include "wx/notebook.h" #include "layout.h" -// Declare two frames -MyFrame *frame = (MyFrame *) NULL; -wxMenuBar *menu_bar = (wxMenuBar *) NULL; +// ---------------------------------------------------------------------------- +// MyApp +// ---------------------------------------------------------------------------- IMPLEMENT_APP(MyApp) @@ -45,35 +47,183 @@ MyApp::MyApp() bool MyApp::OnInit() { // Create the main frame window - frame = new MyFrame(NULL, _T("wxWindows Layout Demo"), -1, -1, 400, 300); + MyFrame *frame = new MyFrame; + + frame->Show(TRUE); + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// MyFrame +// ---------------------------------------------------------------------------- - frame->SetAutoLayout(TRUE); +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout) + EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit) - // Give it a status line - frame->CreateStatusBar(2); + EVT_MENU(LAYOUT_TEST_CONSTRAINTS, MyFrame::TestConstraints) + EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestFlexSizers) + EVT_MENU(LAYOUT_TEST_NB_SIZER, MyFrame::TestNotebookSizers) +END_EVENT_TABLE() +// Define my frame constructor +MyFrame::MyFrame() + : wxFrame(NULL, -1, _T("wxWindows Layout Demo"), + wxDefaultPosition, wxDefaultSize, + wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) +{ // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(LAYOUT_TEST_SIZER, _T("&Test sizers"), _T("Test sizer")); - file_menu->Append(LAYOUT_TEST_NB, _T("&Test notebook sizers"), _T("Test notebook sizer")); + file_menu->Append(LAYOUT_TEST_CONSTRAINTS, _T("Test &constraints")); + file_menu->Append(LAYOUT_TEST_SIZER, _T("Test wx&FlexSizer")); + file_menu->Append(LAYOUT_TEST_NB_SIZER, _T("&Test notebook sizers")); file_menu->AppendSeparator(); - file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program")); + file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program")); wxMenu *help_menu = new wxMenu; - help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo")); + help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo")); - menu_bar = new wxMenuBar; + wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(file_menu, _T("&File")); menu_bar->Append(help_menu, _T("&Help")); // Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + SetMenuBar(menu_bar); + + CreateStatusBar(2); + SetStatusText(_T("wxWindows layout demo")); + + + // we want to get a dialog that is stretchable because it + // has a text ctrl in the middle. at the bottom, we have + // two buttons which. + + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + + // 1) top: create wxStaticText with minimum size equal to its default size + topsizer->Add( + new wxStaticText( this, -1, _T("An explanation (wxALIGN_RIGHT).") ), + 0, // make vertically unstretchable + wxALIGN_RIGHT | // right align text + wxTOP | wxLEFT | wxRIGHT, // make border all around except wxBOTTOM + 5 ); // set border width to 5 + + // 2) top: create wxTextCtrl with minimum size (100x60) + topsizer->Add( + new wxTextCtrl( this, -1, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), + 1, // make vertically stretchable + wxEXPAND | // make horizontally stretchable + wxALL, // and make border all around + 5 ); // set border width to 5 + + // 2.5) Gratuitous test of wxStaticBoxSizers + wxBoxSizer *statsizer = new wxStaticBoxSizer( + new wxStaticBox(this, -1, _T("A wxStaticBoxSizer")), + wxVERTICAL ); + statsizer->Add( + new wxStaticText(this, -1, _T("And some TEXT inside it")), + 0, + wxCENTER | + wxALL, + 30); + topsizer->Add(statsizer, 1, wxEXPAND | wxALL, 10); + + // 2.7) And a test of wxGridSizer + wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5); + gridsizer->Add(new wxStaticText(this, -1, _T("Label")), 0, + wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); + gridsizer->Add(new wxTextCtrl(this, -1, _T("Grid sizer demo")), 1, + wxGROW | wxALIGN_CENTER_VERTICAL); + gridsizer->Add(new wxStaticText(this, -1, _T("Another label")), 0, + wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); + gridsizer->Add(new wxTextCtrl(this, -1, _T("More text")), 1, + wxGROW | wxALIGN_CENTER_VERTICAL); + gridsizer->Add(new wxStaticText(this, -1, _T("Final label")), 0, + wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); + gridsizer->Add(new wxTextCtrl(this, -1, _T("And yet more text")), 1, + wxGROW | wxALIGN_CENTER_VERTICAL); + topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10); + + + // 3) middle: create wxStaticLine with minimum size (3x3) + topsizer->Add( + new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), + 0, // make vertically unstretchable + wxEXPAND | // make horizontally stretchable + wxALL, // and make border all around + 5 ); // set border width to 5 + + + // 4) bottom: create two centred wxButtons + wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); + button_box->Add( + new wxButton( this, -1, _T("Two buttons in a box") ), + 0, // make horizontally unstretchable + wxALL, // make border all around + 7 ); // set border width to 7 + button_box->Add( + new wxButton( this, -1, _T("(wxCENTER)") ), + 0, // make horizontally unstretchable + wxALL, // make border all around + 7 ); // set border width to 7 + + topsizer->Add( + button_box, + 0, // make vertically unstretchable + wxCENTER ); // no border and centre horizontally + + // 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 ); +} + +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) +{ + Close(TRUE); +} + +void MyFrame::TestConstraints(wxCommandEvent& WXUNUSED(event) ) +{ + MyConstraintsFrame * + newFrame = new MyConstraintsFrame(_T("Constraints Test Frame"), 100, 100); + newFrame->Show(TRUE); +} + +void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) ) +{ + MyFlexSizerFrame *newFrame = new MyFlexSizerFrame(_T("Flex Sizer Test Frame"), 50, 50); + newFrame->Show(TRUE); +} + +void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) +{ + MySizerDialog dialog( this, _T("Notebook Sizer Test Dialog") ); + + dialog.ShowModal(); +} + +void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) +{ + (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"), + _T("About Layout Demo"), wxOK|wxICON_INFORMATION); +} + +// ---------------------------------------------------------------------------- +// MyConstraintsFrame +// ---------------------------------------------------------------------------- + +MyConstraintsFrame::MyConstraintsFrame(const wxChar *title, int x, int y) + : wxFrame(NULL, -1, title, wxPoint(x, y) ) +{ // Make a panel - wxPanel *panel = new wxPanel(frame); + wxPanel *panel = new wxPanel(this); // Create some panel items wxButton *btn1 = new wxButton(panel, -1, _T("A button (1)")) ; @@ -100,7 +250,13 @@ bool MyApp::OnInit() b2->bottom.SameAs (panel, wxBottom, 5); list->SetConstraints(b2); - wxTextCtrl *mtext = new wxTextCtrl(panel, -1, _T("Some text")); + wxTextCtrl *mtext = new wxTextCtrl(panel, -1, + _T("This frame is laid out using\n" + "constraints, but the preferred\n" + "layout mechanism now are sizers."), + wxDefaultPosition, + wxDefaultSize, + wxTE_MULTILINE); wxLayoutConstraints *b3 = new wxLayoutConstraints; b3->top.Below (btn1, 5); @@ -109,18 +265,21 @@ bool MyApp::OnInit() b3->bottom.SameAs (panel, wxBottom, 5); mtext->SetConstraints(b3); - MyWindow *canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED); + wxTextCtrl *canvas = new wxTextCtrl(this, -1, _T("yet another window")); // Make a text window - MyTextWindow *text_window = new MyTextWindow(frame, 0, 250, 400, 150); + wxTextCtrl *text_window = new wxTextCtrl(this, -1, _T(""), + wxDefaultPosition, + wxDefaultSize, + wxTE_MULTILINE); // Set constraints for panel subwindow wxLayoutConstraints *c1 = new wxLayoutConstraints; - c1->left.SameAs (frame, wxLeft); - c1->top.SameAs (frame, wxTop); - c1->right.PercentOf (frame, wxWidth, 50); - c1->height.PercentOf (frame, wxHeight, 50); + c1->left.SameAs (this, wxLeft); + c1->top.SameAs (this, wxTop); + c1->right.PercentOf (this, wxWidth, 50); + c1->height.PercentOf (this, wxHeight, 50); panel->SetConstraints(c1); @@ -128,72 +287,141 @@ bool MyApp::OnInit() wxLayoutConstraints *c2 = new wxLayoutConstraints; c2->left.SameAs (panel, wxRight); - c2->top.SameAs (frame, wxTop); - c2->right.SameAs (frame, wxRight); - c2->height.PercentOf (frame, wxHeight, 50); + c2->top.SameAs (this, wxTop); + c2->right.SameAs (this, wxRight); + c2->height.PercentOf (this, wxHeight, 50); canvas->SetConstraints(c2); // Set constraints for text subwindow wxLayoutConstraints *c3 = new wxLayoutConstraints; - c3->left.SameAs (frame, wxLeft); + c3->left.SameAs (this, wxLeft); c3->top.Below (panel); - c3->right.SameAs (frame, wxRight); - c3->bottom.SameAs (frame, wxBottom); + c3->right.SameAs (this, wxRight); + c3->bottom.SameAs (this, wxBottom); text_window->SetConstraints(c3); - frame->Show(TRUE); - - frame->SetStatusText(_T("wxWindows layout demo")); - - SetTopWindow(frame); - - return TRUE; + SetAutoLayout(TRUE); } -//----------------------------------------------------------------- -// MyFrame -//----------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// MyFlexSizerFrame +// ---------------------------------------------------------------------------- -// Define my frame constructor -MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h) - : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) +void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer) { + for ( int i = 0; i < 3; i++ ) + { + for ( int j = 0; j < 3; j++ ) + { + sizer->Add(new wxStaticText + ( + this, + -1, + wxString::Format(_T("(%d, %d)"), i + 1, j + 1), + wxDefaultPosition, + wxDefaultSize, + wxALIGN_CENTER + ), + 0, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 3); + } + } } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) - 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) -END_EVENT_TABLE() - -void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) +MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y ) + : wxFrame(NULL, -1, title, wxPoint(x, y) ) { - Close(TRUE); + wxFlexGridSizer *sizerFlex; + + // consttuct the first column + wxSizer *sizerCol1 = new wxBoxSizer(wxVERTICAL); + sizerCol1->Add(new wxStaticText(this, -1, _T("Ungrowable:")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol1->Add(new wxStaticText(this, -1, _T("Growable middle column:")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(1); + sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol1->Add(new wxStaticText(this, -1, _T("Growable middle row:")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableRow(1); + sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol1->Add(new wxStaticText(this, -1, _T("All growable columns:")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(0, 1); + sizerFlex->AddGrowableCol(1, 2); + sizerFlex->AddGrowableCol(2, 3); + sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + // the second one + wxSizer *sizerCol2 = new wxBoxSizer(wxVERTICAL); + sizerCol2->Add(new wxStaticText(this, -1, _T("Growable middle row and column:")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(1); + sizerFlex->AddGrowableRow(1); + sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol2->Add(new wxStaticText(this, -1, _T("Same with horz flex direction")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(1); + sizerFlex->AddGrowableRow(1); + sizerFlex->SetFlexibleDirection(wxHORIZONTAL); + sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol2->Add(new wxStaticText(this, -1, _T("Same with grow mode == \"none\"")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(1); + sizerFlex->AddGrowableRow(1); + sizerFlex->SetFlexibleDirection(wxHORIZONTAL); + sizerFlex->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_NONE); + sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + sizerCol2->Add(new wxStaticText(this, -1, _T("Same with grow mode == \"all\"")), 0, wxCENTER | wxTOP, 20); + sizerFlex = new wxFlexGridSizer(3, 3); + InitFlexSizer(sizerFlex); + sizerFlex->AddGrowableCol(1); + sizerFlex->AddGrowableRow(1); + sizerFlex->SetFlexibleDirection(wxHORIZONTAL); + sizerFlex->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_ALL); + sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); + + // add both columns to grid sizer + wxGridSizer *sizerTop = new wxGridSizer(2, 0, 20); + sizerTop->Add(sizerCol1, 1, wxEXPAND); + sizerTop->Add(sizerCol2, 1, wxEXPAND); + + SetSizer(sizerTop); + sizerTop->SetSizeHints(this); } -void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) ) -{ - MySizerFrame *newFrame = new MySizerFrame(NULL, _T("Sizer Test Frame"), 50, 50); - newFrame->Show(TRUE); -} +// ---------------------------------------------------------------------------- +// MySizerDialog +// ---------------------------------------------------------------------------- -void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) +MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title) + : wxDialog(parent, -1, wxString(title)) { - wxDialog dialog( this, -1, wxString(_T("Notebook Sizer Test Dialog")) ); - // Begin with first hierarchy: a notebook at the top and // and OK button at the bottom. wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - wxNotebook *notebook = new wxNotebook( &dialog, -1 ); + wxNotebook *notebook = new wxNotebook( this, -1 ); wxNotebookSizer *nbs = new wxNotebookSizer( notebook ); topsizer->Add( nbs, 1, wxGROW ); - wxButton *button = new wxButton( &dialog, wxID_OK, _T("OK") ); + wxButton *button = new wxButton( this, wxID_OK, _T("OK") ); topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 ); // First page: one big text ctrl @@ -217,155 +445,7 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) panel->SetSizer( panelsizer ); // Tell dialog to use sizer - - dialog.SetAutoLayout( TRUE ); - dialog.SetSizer( topsizer ); - topsizer->Fit( &dialog ); - topsizer->SetSizeHints( &dialog ); - - dialog.ShowModal(); -} - - -void MyFrame::About(wxCommandEvent& WXUNUSED(event) ) -{ - (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"), - _T("About Layout Demo"), wxOK|wxCENTRE); -} - -//----------------------------------------------------------------- -// 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); - dc.SetPen(* wxGREEN_PEN); - dc.DrawLine(0, 0, 200, 200); - dc.DrawLine(200, 0, 0, 200); - - dc.SetBrush(* wxCYAN_BRUSH); - dc.SetPen(* wxRED_PEN); - - dc.DrawRectangle(100, 100, 100, 50); - dc.DrawRoundedRectangle(150, 150, 100, 50, 20); - - dc.DrawEllipse(250, 250, 100, 50); -#if wxUSE_SPLINES - dc.DrawSpline(50, 200, 50, 100, 200, 10); -#endif // wxUSE_SPLINES - dc.DrawLine(50, 230, 200, 230); - - dc.SetPen(* wxBLACK_PEN); - dc.DrawArc(50, 300, 100, 250, 100, 300 ); -} - -//----------------------------------------------------------------- -// MySizerFrame -//----------------------------------------------------------------- - -MySizerFrame::MySizerFrame(wxFrame *frame, wxChar *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 - // two buttons which. - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - // 1) top: create wxStaticText with minimum size equal to its default size - topsizer->Add( - new wxStaticText( this, -1, _T("An explanation (wxALIGN_RIGHT).") ), - 0, // make vertically unstretchable - wxALIGN_RIGHT | // right align text - wxTOP | wxLEFT | wxRIGHT, // make border all around except wxBOTTOM - 5 ); // set border width to 5 - - // 2) top: create wxTextCtrl with minimum size (100x60) - topsizer->Add( - new wxTextCtrl( this, -1, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), - 1, // make vertically stretchable - wxEXPAND | // make horizontally stretchable - wxALL, // and make border all around - 5 ); // set border width to 5 - - // 2.5) Gratuitous test of wxStaticBoxSizers - wxBoxSizer *statsizer = new wxStaticBoxSizer( - new wxStaticBox(this, -1, _T("A wxStaticBoxSizer")), - wxVERTICAL ); - statsizer->Add( - new wxStaticText(this, -1, _T("And some TEXT inside it")), - 0, - wxCENTER | - wxALL, - 30); - topsizer->Add(statsizer, 1, wxEXPAND | wxALL, 10); - - // 2.7) And a test of wxGridSizer - wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5); - gridsizer->Add(new wxStaticText(this, -1, _T("Label")), 0, - wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, _T("Grid sizer demo")), 1, - wxGROW | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxStaticText(this, -1, _T("Another label")), 0, - wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, _T("More text")), 1, - wxGROW | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxStaticText(this, -1, _T("Final label")), 0, - wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, _T("And yet more text")), 1, - wxGROW | wxALIGN_CENTER_VERTICAL); - topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10); - - - // 3) middle: create wxStaticLine with minimum size (3x3) - topsizer->Add( - new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), - 0, // make vertically unstretchable - wxEXPAND | // make horizontally stretchable - wxALL, // and make border all around - 5 ); // set border width to 5 - - - // 4) bottom: create two centred wxButtons - wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); - button_box->Add( - new wxButton( this, -1, _T("Two buttons in a box") ), - 0, // make horizontally unstretchable - wxALL, // make border all around - 7 ); // set border width to 7 - button_box->Add( - new wxButton( this, -1, _T("(wxCENTER)") ), - 0, // make horizontally unstretchable - wxALL, // make border all around - 7 ); // set border width to 7 - - topsizer->Add( - button_box, - 0, // make vertically unstretchable - wxCENTER ); // no border and centre horizontally - - // 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 ); + SetSizer( topsizer ); + topsizer->SetSizeHints( this ); } - - diff --git a/samples/layout/layout.h b/samples/layout/layout.h index 8a54f6f63d..e671559dac 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -17,58 +17,54 @@ public: bool OnInit(); }; -// Define a new frame -class MyTextWindow; -class MyWindow; - -class MyFrame: public wxFrame +// the main frame class +class MyFrame : public wxFrame { public: - MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h); - - void OnQuit(wxCommandEvent& event); + MyFrame(); - void TestSizers(wxCommandEvent& event); + void TestConstraints(wxCommandEvent& event); + void TestFlexSizers(wxCommandEvent& event); void TestNotebookSizers(wxCommandEvent& event); - void About(wxCommandEvent& event); + + void OnAbout(wxCommandEvent& event); + void OnQuit(wxCommandEvent& event); private: DECLARE_EVENT_TABLE() }; -// Define a new text subwindow that can respond to drag-and-drop -class MyTextWindow: public wxTextCtrl +// a frame using constraints for layout +class MyConstraintsFrame : public wxFrame { public: - MyTextWindow(wxFrame *frame, int x=-1, int y=-1, int width=-1, int height=-1, - long style=wxTE_MULTILINE): - wxTextCtrl(frame, -1, _T(""), wxPoint(x, y), wxSize(width, height), style) - { - } - + MyConstraintsFrame(const wxChar *title, int x, int y ); }; -// Define a new canvas which can receive some events -class MyWindow: public wxWindow +// a frame using flex sizers for layout +class MyFlexSizerFrame : public wxFrame { public: - MyWindow(wxFrame *frame, int x, int y, int w, int h, long style = wxRETAINED); - ~MyWindow(); - void OnPaint(wxPaintEvent& event); + MyFlexSizerFrame(const wxChar *title, int x, int y ); private: - DECLARE_EVENT_TABLE() + void InitFlexSizer(wxFlexGridSizer *sizer); }; -class MySizerFrame: public wxFrame +// a dialog using notebook sizer for layout +class MySizerDialog : public wxDialog { public: - wxPanel *panel; - MySizerFrame(wxFrame *frame, wxChar *title, int x, int y ); + MySizerDialog(wxWindow *parent, const wxChar *title); +}; + +// controls an menu constants +enum +{ + LAYOUT_QUIT = 100, + LAYOUT_ABOUT, + LAYOUT_TEST_CONSTRAINTS, + LAYOUT_TEST_SIZER, + LAYOUT_TEST_NB_SIZER }; -#define LAYOUT_QUIT 100 -#define LAYOUT_TEST 101 -#define LAYOUT_ABOUT 102 -#define LAYOUT_TEST_SIZER 104 -#define LAYOUT_TEST_NB 105 -- 2.45.2