// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/wx.h"
#endif
-#if !wxUSE_CONSTRAINTS
-#error You must set wxUSE_CONSTRAINTS to 1 in setup.h!
-#endif
-
#include "wx/sizer.h"
#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;
- frame->Show(TRUE);
+ frame->Show(true);
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout)
EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit)
- EVT_MENU(LAYOUT_TEST_CONSTRAINTS, MyFrame::TestConstraints)
+ 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, -1, _T("wxWindows Layout Demo"),
- wxDefaultPosition, wxDefaultSize,
+ : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"),
+ wxPoint(30,30), wxDefaultSize,
wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
{
- // Make a menubar
- wxMenu *file_menu = new wxMenu;
-
- 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->Append(LAYOUT_TEST_GB_SIZER, _T("Test &gridbag sizer"));
-
- 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"));
-
- 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
- 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);
+ SetIcon(wxICON(sample));
+
+ // Make a menubar
+ wxMenu *file_menu = new wxMenu;
+
+ 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"));
+
+ wxMenu *help_menu = new wxMenu;
+ help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo..."));
+
+ 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
+ SetMenuBar(menu_bar);
+
+#if wxUSE_STATUSBAR
+ CreateStatusBar(2);
+ SetStatusText(_T("wxWidgets layout demo"));
+#endif // wxUSE_STATUSBAR
+
+ wxPanel* p = new wxPanel(this, wxID_ANY);
+
+ // 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( 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) 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, -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 );
+ 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( 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( 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());
+
+ p->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);
+ Close(true);
}
-void MyFrame::TestConstraints(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::TestProportions(wxCommandEvent& WXUNUSED(event))
{
- MyConstraintsFrame *
- newFrame = new MyConstraintsFrame(_T("Constraints Test Frame"), 100, 100);
- newFrame->Show(TRUE);
+ (new MyProportionsFrame(this))->Show();
}
void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) )
{
MyFlexSizerFrame *newFrame = new MyFlexSizerFrame(_T("Flex Sizer Test Frame"), 50, 50);
- newFrame->Show(TRUE);
+ newFrame->Show(true);
}
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) )
{
- (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"),
+ (void)wxMessageBox(_T("wxWidgets GUI library layout demo\n"),
_T("About Layout Demo"), wxOK|wxICON_INFORMATION);
}
{
MyGridBagSizerFrame *newFrame = new
MyGridBagSizerFrame(_T("wxGridBagSizer Test Frame"), 50, 50);
- newFrame->Show(TRUE);
+ newFrame->Show(true);
}
-
// ----------------------------------------------------------------------------
-// MyConstraintsFrame
+// MyProportionsFrame
// ----------------------------------------------------------------------------
-MyConstraintsFrame::MyConstraintsFrame(const wxChar *title, int x, int y)
- : wxFrame(NULL, -1, title, wxPoint(x, y) )
+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))
{
- // Make a panel
- wxPanel *panel = new wxPanel(this);
-
- // Create some panel items
- wxButton *btn1 = new wxButton(panel, -1, _T("A button (1)")) ;
-
- wxLayoutConstraints *b1 = new wxLayoutConstraints;
- 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(panel, -1,
- wxPoint(-1, -1), wxSize(200, 100));
- list->Append(_T("Apple"));
- list->Append(_T("Pear"));
- list->Append(_T("Orange"));
- list->Append(_T("Banana"));
- list->Append(_T("Fruit"));
-
- wxLayoutConstraints *b2 = new wxLayoutConstraints;
- b2->top.Below (btn1, 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(panel, -1,
- _T("This frame is laid out using\nconstraints, but the preferred\nlayout mechanism now are sizers."),
- wxDefaultPosition,
- wxDefaultSize,
- wxTE_MULTILINE);
-
- wxLayoutConstraints *b3 = new wxLayoutConstraints;
- b3->top.Below (btn1, 5);
- b3->left.RightOf (list, 5);
- b3->right.SameAs (panel, wxRight, 5);
- b3->bottom.SameAs (panel, wxBottom, 5);
- mtext->SetConstraints(b3);
-
- wxTextCtrl *canvas = new wxTextCtrl(this, -1, _T("yet another window"));
-
- // Make a text window
- wxTextCtrl *text_window = new wxTextCtrl(this, -1, _T(""),
- wxDefaultPosition,
- wxDefaultSize,
- wxTE_MULTILINE);
-
- // Set constraints for panel subwindow
- wxLayoutConstraints *c1 = new wxLayoutConstraints;
-
- 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);
-
- // Set constraints for canvas subwindow
- wxLayoutConstraints *c2 = new wxLayoutConstraints;
-
- c2->left.SameAs (panel, wxRight);
- 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 (this, wxLeft);
- c3->top.Below (panel);
- c3->right.SameAs (this, wxRight);
- c3->bottom.SameAs (this, wxBottom);
-
- text_window->SetConstraints(c3);
-
- SetAutoLayout(TRUE);
+ 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++ )
{
{
sizer->Add(new wxStaticText
(
- this,
- -1,
+ parent,
+ wxID_ANY,
wxString::Format(_T("(%d, %d)"), i + 1, j + 1),
wxDefaultPosition,
wxDefaultSize,
}
}
-MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y )
- : wxFrame(NULL, -1, title, wxPoint(x, 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, -1, _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, -1, _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, -1, _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, -1, _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);
// the second one
wxSizer *sizerCol2 = new wxBoxSizer(wxVERTICAL);
- sizerCol2->Add(new wxStaticText(this, -1, _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, -1, _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, -1, _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, -1, _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);
sizerTop->Add(sizerCol1, 1, wxEXPAND);
sizerTop->Add(sizerCol2, 1, wxEXPAND);
- SetSizer(sizerTop);
+ p->SetSizer(sizerTop);
sizerTop->SetSizeHints(this);
}
// MySizerDialog
// ----------------------------------------------------------------------------
-MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title)
- : wxDialog(parent, -1, wxString(title))
+MySizerDialog::MySizerDialog(wxWindow *parent, const wxString &title)
+ : wxDialog(parent, wxID_ANY, wxString(title))
{
// 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( this, -1 );
- wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
- topsizer->Add( nbs, 1, wxGROW );
+ wxNotebook *notebook = new wxNotebook( this, wxID_ANY );
+ topsizer->Add( notebook, 1, wxGROW );
wxButton *button = new wxButton( this, wxID_OK, _T("OK") );
topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );
// First page: one big text ctrl
- wxTextCtrl *multi = new wxTextCtrl( notebook, -1, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+ wxTextCtrl *multi = new wxTextCtrl( notebook, wxID_ANY, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
notebook->AddPage( multi, _T("Page One") );
// Second page: a text ctrl and a button
- wxPanel *panel = new wxPanel( notebook, -1 );
+ wxPanel *panel = new wxPanel( notebook, wxID_ANY );
notebook->AddPage( panel, _T("Page Two") );
wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *text = new wxTextCtrl( panel, -1, _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, -1, _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, -1, _T("Hallo") );
+ 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 );
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// some simple macros to help make the sample code below more clear
-#define TEXTCTRL(text) new wxTextCtrl(p, -1, _T(text))
-#define MLTEXTCTRL(text) new wxTextCtrl(p, -1, _T(text), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE)
+#define TEXTCTRL(text) new wxTextCtrl(p, wxID_ANY, _T(text))
+#define MLTEXTCTRL(text) new wxTextCtrl(p, wxID_ANY, _T(text), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE)
#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.");
GBS_SHOW_BTN,
GBS_MOVE_BTN1,
GBS_MOVE_BTN2,
-
- GBS_MAX,
+
+ GBS_MAX
};
END_EVENT_TABLE()
-MyGridBagSizerFrame::MyGridBagSizerFrame(const wxChar *title, int x, int y )
- : wxFrame( NULL, -1, title, wxPoint(x, y) )
+MyGridBagSizerFrame::MyGridBagSizerFrame(const wxString &title, int x, int y )
+ : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )
{
- wxPanel* p = new wxPanel(this, -1);
+ wxPanel* p = new wxPanel(this, wxID_ANY);
m_panel = p;
m_gbs = new wxGridBagSizer();
-
- m_gbs->Add( new wxStaticText(p, -1, gbsDescription),
+
+ 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) );
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
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, -1, _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);
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;
}
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 );
+}
+
projects / wxWidgets.git / blobdiff