X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5544e77ecdf73269be6d3555b109407d0b9f62b..acd32ffcdb319f162633c20e0202db3f8542998a:/samples/layout/layout.cpp diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index 17be24a877..c7d56a3360 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -2,10 +2,11 @@ // Name: layout.cpp // Purpose: Layout sample // Author: Julian Smart -// Modified by: +// Modified by: Robin Dunn, Vadim Zeitlin // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// 2005 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -28,21 +29,27 @@ #include "wx/gbsizer.h" #include "wx/statline.h" #include "wx/notebook.h" +#include "wx/spinctrl.h" +#include "wx/wrapsizer.h" #include "layout.h" +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif + + // ---------------------------------------------------------------------------- // MyApp // ---------------------------------------------------------------------------- IMPLEMENT_APP(MyApp) -MyApp::MyApp() -{ -} - bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window MyFrame *frame = new MyFrame; @@ -59,119 +66,142 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout) EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit) + EVT_MENU(LAYOUT_TEST_PROPORTIONS, MyFrame::TestProportions) EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestFlexSizers) EVT_MENU(LAYOUT_TEST_NB_SIZER, MyFrame::TestNotebookSizers) - EVT_MENU(LAYOUT_TEST_GB_SIZER, MyFrame::TestGridBagSizer) + EVT_MENU(LAYOUT_TEST_GB_SIZER, MyFrame::TestGridBagSizer) + EVT_MENU(LAYOUT_TEST_SET_MINIMAL, MyFrame::TestSetMinimal) + EVT_MENU(LAYOUT_TEST_NESTED, MyFrame::TestNested) + EVT_MENU(LAYOUT_TEST_WRAP, MyFrame::TestWrap) END_EVENT_TABLE() // Define my frame constructor MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"), - wxDefaultPosition, wxDefaultSize, + wxPoint(30,30), wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { - // Make a menubar - wxMenu *file_menu = new wxMenu; + SetIcon(wxICON(sample)); + + // Make a menubar + wxMenu *file_menu = new wxMenu; - file_menu->Append(LAYOUT_TEST_SIZER, _T("Test wx&FlexSizer")); - file_menu->Append(LAYOUT_TEST_NB_SIZER, _T("&Test notebook sizers")); - file_menu->Append(LAYOUT_TEST_GB_SIZER, _T("Test &gridbag sizer")); + file_menu->Append(LAYOUT_TEST_PROPORTIONS, _T("&Proportions demo...\tF1")); + file_menu->Append(LAYOUT_TEST_SIZER, _T("Test wx&FlexSizer...\tF2")); + file_menu->Append(LAYOUT_TEST_NB_SIZER, _T("Test ¬ebook sizers...\tF3")); + file_menu->Append(LAYOUT_TEST_GB_SIZER, _T("Test &gridbag sizer...\tF4")); + file_menu->Append(LAYOUT_TEST_SET_MINIMAL, _T("Test Set&ItemMinSize...\tF5")); + file_menu->Append(LAYOUT_TEST_NESTED, _T("Test nested sizer in a wxPanel...\tF6")); + file_menu->Append(LAYOUT_TEST_WRAP, _T("Test wrap sizers...\tF7")); - file_menu->AppendSeparator(); - file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program")); + file_menu->AppendSeparator(); + 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")); + wxMenu *help_menu = new wxMenu; + help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo...")); - wxMenuBar *menu_bar = new wxMenuBar; + wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - menu_bar->Append(help_menu, _T("&Help")); + menu_bar->Append(file_menu, _T("&File")); + menu_bar->Append(help_menu, _T("&Help")); - // Associate the menu bar with the frame - SetMenuBar(menu_bar); + // Associate the menu bar with the frame + SetMenuBar(menu_bar); #if wxUSE_STATUSBAR - CreateStatusBar(2); - SetStatusText(_T("wxWidgets layout demo")); + CreateStatusBar(2); + SetStatusText(_T("wxWidgets layout demo")); #endif // wxUSE_STATUSBAR - // 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. + wxPanel* p = new wxPanel(this, wxID_ANY); - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + // 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. - // 1) top: create wxStaticText with minimum size equal to its default size - topsizer->Add( - new wxStaticText( this, wxID_ANY, _T("An explanation (wxALIGN_RIGHT).") ), - wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL & ~wxBOTTOM, 5)); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // 2) top: create wxTextCtrl with minimum size (100x60) - topsizer->Add( - new wxTextCtrl( this, wxID_ANY, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), - wxSizerFlags(1).Expand().Border(wxALL, 5)); + // 1) top: create wxStaticText with minimum size equal to its default size + topsizer->Add( + new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_RIGHT).") ), + wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL & ~wxBOTTOM, 5)); + topsizer->Add( + new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_LEFT).") ), + wxSizerFlags().Align(wxALIGN_LEFT).Border(wxALL & ~wxBOTTOM, 5)); + topsizer->Add( + new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_CENTRE_HORIZONTAL).") ), + wxSizerFlags().Align(wxALIGN_CENTRE_HORIZONTAL).Border(wxALL & ~wxBOTTOM, 5)); - // 2.5) Gratuitous test of wxStaticBoxSizers - wxBoxSizer *statsizer = new wxStaticBoxSizer( - new wxStaticBox(this, wxID_ANY, _T("A wxStaticBoxSizer")), wxVERTICAL ); - statsizer->Add( - new wxStaticText(this, wxID_ANY, _T("And some TEXT inside it")), - wxSizerFlags().Center().Border(wxALL, 30)); - topsizer->Add( - statsizer, - wxSizerFlags(1).Expand().Border(wxALL, 10)); + // 2) top: create wxTextCtrl with minimum size (100x60) + topsizer->Add( + new wxTextCtrl( p, wxID_ANY, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), + wxSizerFlags(1).Expand().Border(wxALL, 5)); + + // 2.5) Gratuitous test of wxStaticBoxSizers + wxBoxSizer *statsizer = new wxStaticBoxSizer( + new wxStaticBox(p, wxID_ANY, _T("A wxStaticBoxSizer")), wxVERTICAL ); + statsizer->Add( + new wxStaticText(p, wxID_ANY, _T("And some TEXT inside it")), + wxSizerFlags().Border(wxALL, 30)); + topsizer->Add( + statsizer, + wxSizerFlags(1).Expand().Border(wxALL, 10)); // 2.7) And a test of wxGridSizer wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5); - gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Label")), - wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); - gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("Grid sizer demo")), - wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL)); - gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Another label")), - wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); - gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("More text")), - wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL)); - gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Final label")), - wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); - gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("And yet more text")), - wxSizerFlags().Align(wxGROW | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Label")), + wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("Grid sizer demo")), + wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Another label")), + wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("More text")), + wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Final label")), + wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)); + gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("And yet more text")), + wxSizerFlags().Align(wxGROW | wxALIGN_CENTER_VERTICAL)); topsizer->Add( gridsizer, wxSizerFlags().Proportion(1).Expand().Border(wxALL, 10)); #if wxUSE_STATLINE - // 3) middle: create wxStaticLine with minimum size (3x3) - topsizer->Add( - new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), - wxSizerFlags().Expand()); + // 3) middle: create wxStaticLine with minimum size (3x3) + topsizer->Add( + new wxStaticLine( p, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), + wxSizerFlags().Expand()); #endif // wxUSE_STATLINE - // 4) bottom: create two centred wxButtons - wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); - button_box->Add( - new wxButton( this, wxID_ANY, _T("Two buttons in a box") ), - wxSizerFlags().Border(wxALL, 7)); - button_box->Add( - new wxButton( this, wxID_ANY, _T("(wxCENTER)") ), - wxSizerFlags().Border(wxALL, 7)); + // 4) bottom: create two centred wxButtons + wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); + button_box->Add( + new wxButton( p, wxID_ANY, _T("Two buttons in a box") ), + wxSizerFlags().Border(wxALL, 7)); + button_box->Add( + new wxButton( p, wxID_ANY, _T("(wxCENTER)") ), + wxSizerFlags().Border(wxALL, 7)); - topsizer->Add(button_box, wxSizerFlags().Center()); + topsizer->Add(button_box, wxSizerFlags().Center()); - // 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 ); + p->SetSizer( topsizer ); - SetSizer( topsizer ); + // 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 ); } -void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); } +void MyFrame::TestProportions(wxCommandEvent& WXUNUSED(event)) +{ + (new MyProportionsFrame(this))->Show(); +} + void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) ) { MyFlexSizerFrame *newFrame = new MyFlexSizerFrame(_T("Flex Sizer Test Frame"), 50, 50); @@ -185,6 +215,24 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) dialog.ShowModal(); } +void MyFrame::TestSetMinimal(wxCommandEvent& WXUNUSED(event) ) +{ + MySimpleSizerFrame *newFrame = new MySimpleSizerFrame(_T("Simple Sizer Test Frame"), 50, 50); + newFrame->Show(true); +} + +void MyFrame::TestNested(wxCommandEvent& WXUNUSED(event) ) +{ + MyNestedSizerFrame *newFrame = new MyNestedSizerFrame(_T("Nested Sizer Test Frame"), 50, 50); + newFrame->Show(true); +} + +void MyFrame::TestWrap(wxCommandEvent& WXUNUSED(event) ) +{ + MyWrapSizerFrame *newFrame = new MyWrapSizerFrame(_T("Wrap Sizer Test Frame"), 50, 50); + newFrame->Show(true); +} + void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { @@ -199,12 +247,68 @@ void MyFrame::TestGridBagSizer(wxCommandEvent& WXUNUSED(event) ) newFrame->Show(true); } +// ---------------------------------------------------------------------------- +// MyProportionsFrame +// ---------------------------------------------------------------------------- + +MyProportionsFrame::MyProportionsFrame(wxFrame *parent) + : wxFrame(parent, wxID_ANY, _T("Box Sizer Proportions Demo")) +{ + size_t n; + + // create the controls + wxPanel *panel = new wxPanel(this, wxID_ANY); + for ( n = 0; n < WXSIZEOF(m_spins); n++ ) + { + m_spins[n] = new wxSpinCtrl(panel); + m_spins[n]->SetValue(n); + } + + // lay them out + m_sizer = new wxStaticBoxSizer(wxHORIZONTAL, panel, + _T("Try changing elements proportions and resizing the window")); + for ( n = 0; n < WXSIZEOF(m_spins); n++ ) + m_sizer->Add(m_spins[n], wxSizerFlags().Border()); + + // put everything together + panel->SetSizer(m_sizer); + wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); + sizerTop->Add(panel, wxSizerFlags(1).Expand().Border()); + UpdateProportions(); + SetSizerAndFit(sizerTop); + + // and connect the events + Connect(wxEVT_COMMAND_TEXT_UPDATED, + wxCommandEventHandler(MyProportionsFrame::OnProportionUpdated)); + Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, + wxSpinEventHandler(MyProportionsFrame::OnProportionChanged)); +} + +void MyProportionsFrame::UpdateProportions() +{ + for ( size_t n = 0; n < WXSIZEOF(m_spins); n++ ) + { + m_sizer->GetItem(n)->SetProportion(m_spins[n]->GetValue()); + } + + m_sizer->Layout(); +} + +void MyProportionsFrame::OnProportionUpdated(wxCommandEvent& WXUNUSED(event)) +{ + UpdateProportions(); +} + +void MyProportionsFrame::OnProportionChanged(wxSpinEvent& WXUNUSED(event)) +{ + UpdateProportions(); +} // ---------------------------------------------------------------------------- // MyFlexSizerFrame // ---------------------------------------------------------------------------- -void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer) +void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent) { for ( int i = 0; i < 3; i++ ) { @@ -212,7 +316,7 @@ void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer) { sizer->Add(new wxStaticText ( - this, + parent, wxID_ANY, wxString::Format(_T("(%d, %d)"), i + 1, j + 1), wxDefaultPosition, @@ -224,33 +328,34 @@ void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer) } } -MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y ) +MyFlexSizerFrame::MyFlexSizerFrame(const wxString &title, int x, int y ) : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y) ) { wxFlexGridSizer *sizerFlex; + wxPanel* p = new wxPanel(this, wxID_ANY); // consttuct the first column wxSizer *sizerCol1 = new wxBoxSizer(wxVERTICAL); - sizerCol1->Add(new wxStaticText(this, wxID_ANY, _T("Ungrowable:")), 0, wxCENTER | wxTOP, 20); + sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Ungrowable:")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); - sizerCol1->Add(new wxStaticText(this, wxID_ANY, _T("Growable middle column:")), 0, wxCENTER | wxTOP, 20); + sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle column:")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableCol(1); sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); - sizerCol1->Add(new wxStaticText(this, wxID_ANY, _T("Growable middle row:")), 0, wxCENTER | wxTOP, 20); + sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle row:")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableRow(1); sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); - sizerCol1->Add(new wxStaticText(this, wxID_ANY, _T("All growable columns:")), 0, wxCENTER | wxTOP, 20); + sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("All growable columns:")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableCol(0, 1); sizerFlex->AddGrowableCol(1, 2); sizerFlex->AddGrowableCol(2, 3); @@ -258,33 +363,33 @@ MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y ) // the second one wxSizer *sizerCol2 = new wxBoxSizer(wxVERTICAL); - sizerCol2->Add(new wxStaticText(this, wxID_ANY, _T("Growable middle row and column:")), 0, wxCENTER | wxTOP, 20); + sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle row and column:")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableCol(1); sizerFlex->AddGrowableRow(1); sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); - sizerCol2->Add(new wxStaticText(this, wxID_ANY, _T("Same with horz flex direction")), 0, wxCENTER | wxTOP, 20); + sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with horz flex direction")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableCol(1); sizerFlex->AddGrowableRow(1); sizerFlex->SetFlexibleDirection(wxHORIZONTAL); sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10); - sizerCol2->Add(new wxStaticText(this, wxID_ANY, _T("Same with grow mode == \"none\"")), 0, wxCENTER | wxTOP, 20); + sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with grow mode == \"none\"")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); 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, wxID_ANY, _T("Same with grow mode == \"all\"")), 0, wxCENTER | wxTOP, 20); + sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with grow mode == \"all\"")), 0, wxCENTER | wxTOP, 20); sizerFlex = new wxFlexGridSizer(3, 3); - InitFlexSizer(sizerFlex); + InitFlexSizer(sizerFlex, p); sizerFlex->AddGrowableCol(1); sizerFlex->AddGrowableRow(1); sizerFlex->SetFlexibleDirection(wxHORIZONTAL); @@ -296,7 +401,7 @@ MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y ) sizerTop->Add(sizerCol1, 1, wxEXPAND); sizerTop->Add(sizerCol2, 1, wxEXPAND); - SetSizer(sizerTop); + p->SetSizer(sizerTop); sizerTop->SetSizeHints(this); } @@ -304,7 +409,7 @@ MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y ) // MySizerDialog // ---------------------------------------------------------------------------- -MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title) +MySizerDialog::MySizerDialog(wxWindow *parent, const wxString &title) : wxDialog(parent, wxID_ANY, wxString(title)) { // Begin with first hierarchy: a notebook at the top and @@ -328,19 +433,17 @@ MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title) wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL ); - wxTextCtrl *text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 1."), wxDefaultPosition, wxSize(250,-1) ); + wxTextCtrl *text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 1."), wxDefaultPosition, wxSize(250,wxDefaultCoord) ); panelsizer->Add( text, 0, wxGROW|wxALL, 30 ); - text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 2."), wxDefaultPosition, wxSize(250,-1) ); + text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 2."), wxDefaultPosition, wxSize(250,wxDefaultCoord) ); panelsizer->Add( text, 0, wxGROW|wxALL, 30 ); wxButton *button2 = new wxButton( panel, wxID_ANY, _T("Hallo") ); panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 ); - panel->SetAutoLayout( true ); panel->SetSizer( panelsizer ); // Tell dialog to use sizer - SetSizer( topsizer ); - topsizer->SetSizeHints( this ); + SetSizerAndFit( topsizer ); } // ---------------------------------------------------------------------------- @@ -353,7 +456,7 @@ MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title) #define POS(r, c) wxGBPosition(r,c) #define SPAN(r, c) wxGBSpan(r,c) -wxChar* gbsDescription =_T("\ +const wxChar gbsDescription[] =_T("\ The wxGridBagSizer is similar to the wxFlexGridSizer except the items are explicitly positioned\n\ in a virtual cell of the layout grid, and column or row spanning is allowed. For example, this\n\ static text is positioned at (0,0) and it spans 7 columns."); @@ -365,8 +468,8 @@ enum { GBS_SHOW_BTN, GBS_MOVE_BTN1, GBS_MOVE_BTN2, - - GBS_MAX, + + GBS_MAX }; @@ -378,18 +481,18 @@ BEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame) END_EVENT_TABLE() -MyGridBagSizerFrame::MyGridBagSizerFrame(const wxChar *title, int x, int y ) +MyGridBagSizerFrame::MyGridBagSizerFrame(const wxString &title, int x, int y ) : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) ) { wxPanel* p = new wxPanel(this, wxID_ANY); m_panel = p; m_gbs = new wxGridBagSizer(); - + m_gbs->Add( new wxStaticText(p, wxID_ANY, gbsDescription), POS(0,0), SPAN(1, 7), wxALIGN_CENTER | wxALL, 5); - + m_gbs->Add( TEXTCTRL("pos(1,0)"), POS(1,0) ); m_gbs->Add( TEXTCTRL("pos(1,1)"), POS(1,1) ); m_gbs->Add( TEXTCTRL("pos(2,0)"), POS(2,0) ); @@ -401,7 +504,7 @@ MyGridBagSizerFrame::MyGridBagSizerFrame(const wxChar *title, int x, int y ) m_gbs->Add( TEXTCTRL("pos(5,4)"), POS(5,4), wxDefaultSpan, wxEXPAND ); m_gbs->Add( TEXTCTRL("pos(6,5)"), POS(6,5), wxDefaultSpan, wxEXPAND ); m_gbs->Add( TEXTCTRL("pos(7,6)"), POS(7,6) ); - + //m_gbs->Add( TEXTCTRL("bad position"), POS(4,3) ); // Test for assert //m_gbs->Add( TEXTCTRL("bad position"), POS(5,3) ); // Test for assert @@ -410,28 +513,28 @@ MyGridBagSizerFrame::MyGridBagSizerFrame(const wxChar *title, int x, int y ) m_moveBtn2 = new wxButton(p, GBS_MOVE_BTN2, _T("Move this to (3,6)")); m_gbs->Add( m_moveBtn1, POS(10,2) ); m_gbs->Add( m_moveBtn2, POS(10,3) ); - + m_hideBtn = new wxButton(p, GBS_HIDE_BTN, _T("Hide this item -->")); m_gbs->Add(m_hideBtn, POS(12, 3)); - m_hideTxt = new wxTextCtrl(p, wxID_ANY, _T("pos(12,4), size(150, -1)"), - wxDefaultPosition, wxSize(150,-1)); + m_hideTxt = new wxTextCtrl(p, wxID_ANY, _T("pos(12,4), size(150, wxDefaultCoord)"), + wxDefaultPosition, wxSize(150,wxDefaultCoord)); m_gbs->Add( m_hideTxt, POS(12,4) ); - + m_showBtn = new wxButton(p, GBS_SHOW_BTN, _T("<-- Show it again")); m_gbs->Add(m_showBtn, POS(12, 5)); m_showBtn->Disable(); m_gbs->Add(10,10, POS(14,0)); - + m_gbs->AddGrowableRow(3); m_gbs->AddGrowableCol(2); - + p->SetSizerAndFit(m_gbs); SetClientSize(p->GetSize()); } - + void MyGridBagSizerFrame::OnHideBtn(wxCommandEvent&) { m_gbs->Hide(m_hideTxt); @@ -460,14 +563,14 @@ void MyGridBagSizerFrame::OnMoveBtn(wxCommandEvent& event) m_gbs->SetItemPosition(btn, m_lastPos); btn->SetLabel(_T("Move this to (3,6)")); } - else + else { if ( m_gbs->CheckForIntersection(wxGBPosition(3,6), wxGBSpan(1,1)) ) wxMessageBox( _T("wxGridBagSizer will not allow items to be in the same cell as\n\ another item, so this operation will fail. You will also get an assert\n\ when compiled in debug mode."), _T("Warning"), wxOK | wxICON_INFORMATION); - + if ( m_gbs->SetItemPosition(btn, wxGBPosition(3,6)) ) { m_lastPos = curPos; @@ -476,3 +579,157 @@ when compiled in debug mode."), _T("Warning"), wxOK | wxICON_INFORMATION); } m_gbs->Layout(); } + +// ---------------------------------------------------------------------------- +// MySimpleSizerFrame +// ---------------------------------------------------------------------------- + +// Some IDs +enum { + ID_SET_SMALL = 1300, + ID_SET_BIG +}; + +BEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame) + EVT_MENU( ID_SET_SMALL, MySimpleSizerFrame::OnSetSmallSize) + EVT_MENU( ID_SET_BIG, MySimpleSizerFrame::OnSetBigSize) +END_EVENT_TABLE() + +MySimpleSizerFrame::MySimpleSizerFrame(const wxString &title, int x, int y ) + : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) ) +{ + wxMenu *menu = new wxMenu; + + menu->Append(ID_SET_SMALL, _T("Make text control small\tF4")); + menu->Append(ID_SET_BIG, _T("Make text control big\tF5")); + + wxMenuBar *menu_bar = new wxMenuBar; + menu_bar->Append(menu, _T("&File")); + + SetMenuBar( menu_bar ); + + wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL ); + + m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) ); + main_sizer->Add( m_target, 1, wxALL, 5 ); + + main_sizer->Add( new wxStaticText( this, wxID_ANY, wxT("Set alternating sizes using F4 and F5") ), 0, wxALL, 5 ); + + SetSizer( main_sizer); + + Layout(); + GetSizer()->Fit( this ); +} + +void MySimpleSizerFrame::OnSetSmallSize( wxCommandEvent& WXUNUSED(event)) +{ + GetSizer()->SetItemMinSize( m_target, 40, -1 ); + Layout(); + GetSizer()->Fit( this ); +} + +void MySimpleSizerFrame::OnSetBigSize( wxCommandEvent& WXUNUSED(event)) +{ + GetSizer()->SetItemMinSize( m_target, 140, -1 ); + Layout(); + GetSizer()->Fit( this ); +} + + +// ---------------------------------------------------------------------------- +// MyNestedSizerFrame +// ---------------------------------------------------------------------------- + + +MyNestedSizerFrame::MyNestedSizerFrame(const wxString &title, int x, int y ) + : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) ) +{ + wxMenu *menu = new wxMenu; + + menu->Append(wxID_ABOUT, _T("Do nothing")); + + wxMenuBar *menu_bar = new wxMenuBar; + menu_bar->Append(menu, _T("&File")); + + SetMenuBar( menu_bar ); + + wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); + + main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER ); + main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER ); + main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER ); + main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER ); + + wxPanel *panel = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize, + wxTAB_TRAVERSAL | wxSUNKEN_BORDER ); + main_sizer->Add( panel, 0, wxALIGN_CENTER ); + wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL ); + panel->SetSizer( panel_sizer ); + panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) ); + panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) ); + panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) ); + + main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER ); + + m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) ); + main_sizer->Add( m_target, 1, wxALL|wxGROW, 5 ); + + SetSizerAndFit( main_sizer); +} + + +// ---------------------------------------------------------------------------- +// MyWrapSizerFrame +// ---------------------------------------------------------------------------- + + +MyWrapSizerFrame::MyWrapSizerFrame(const wxString &title, int x, int y ) + : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y), wxSize(200,-1) ) +{ + wxMenu *menu = new wxMenu; + + menu->Append(wxID_ABOUT, "Do nothing"); + + wxMenuBar *menu_bar = new wxMenuBar; + menu_bar->Append(menu, "&File"); + + SetMenuBar( menu_bar ); + + wxBoxSizer *root = new wxBoxSizer( wxVERTICAL ); + +#if 0 + wxSizer *row = new wxWrapSizer; + int i; + for (i = 0; i < 4; i++) + row->Add( new wxButton( this, -1, "Hello" ), 0, wxALL, 10 ); + root->Add( row, 0, wxGROW ); + + row = new wxWrapSizer; + for (i = 0; i < 4; i++) + row->Add( new wxButton( this, -1, "Hello" ) ); + root->Add( row, 0, wxGROW ); + +#else + // A number of checkboxes inside a wrap sizer + wxSizer *ps_mid = new wxStaticBoxSizer( wxVERTICAL, this, "Wrapping check-boxes" ); + wxSizer *ps_mid_wrap = new wxWrapSizer(wxHORIZONTAL); + ps_mid->Add( ps_mid_wrap, 100, wxEXPAND ); + for( int ix=0; ix<6; ix++ ) + ps_mid_wrap->Add( new wxCheckBox(this,wxID_ANY,wxString::Format("Option %d",ix+1)), 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + root->Add( ps_mid, 0, wxEXPAND | wxALL, 5 ); + + // A shaped item inside a box sizer + wxSizer *ps_bottom = new wxStaticBoxSizer( wxVERTICAL, this, "With wxSHAPED item" ); + wxSizer *ps_bottom_box = new wxBoxSizer(wxHORIZONTAL); + ps_bottom->Add( ps_bottom_box, 100, wxEXPAND ); + ps_bottom_box->Add( new wxListBox(this,wxID_ANY,wxPoint(0,0),wxSize(70,70)), 0, wxEXPAND|wxSHAPED ); + ps_bottom_box->Add( 10,10 ); + ps_bottom_box->Add( new wxCheckBox(this,wxID_ANY,"A much longer option..."), 100, 0, 5 ); + + root->Add( ps_bottom, 1, wxEXPAND | wxALL, 5 ); +#endif + + // Set sizer for window + SetSizerAndFit( root ); +} +