Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrote some sizer code using wxSizerFlags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-17 21:44:00 +00:00
parent 5f813ad662
commit e5544e77ec
1 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
samples/layout/layout.cpp
View File

@@ -105,56 +105,47 @@ MyFrame::MyFrame()
// 1) top: create wxStaticText with minimum size equal to its default size // 1) top: create wxStaticText with minimum size equal to its default size
topsizer->Add( topsizer->Add(
new wxStaticText( this, wxID_ANY, _T("An explanation (wxALIGN_RIGHT).") ), new wxStaticText( this, wxID_ANY, _T("An explanation (wxALIGN_RIGHT).") ),
0, // make vertically unstretchable wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL & ~wxBOTTOM, 5));
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) // 2) top: create wxTextCtrl with minimum size (100x60)
topsizer->Add( topsizer->Add(
new wxTextCtrl( this, wxID_ANY, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), new wxTextCtrl( this, wxID_ANY, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE),
1, // make vertically stretchable wxSizerFlags(1).Expand().Border(wxALL, 5));
wxEXPAND | // make horizontally stretchable
wxALL, // and make border all around
5 ); // set border width to 5
// 2.5) Gratuitous test of wxStaticBoxSizers // 2.5) Gratuitous test of wxStaticBoxSizers
wxBoxSizer *statsizer = new wxStaticBoxSizer( wxBoxSizer *statsizer = new wxStaticBoxSizer(
new wxStaticBox(this, wxID_ANY, _T("A wxStaticBoxSizer")), new wxStaticBox(this, wxID_ANY, _T("A wxStaticBoxSizer")), wxVERTICAL );
wxVERTICAL );
statsizer->Add( statsizer->Add(
new wxStaticText(this, wxID_ANY, _T("And some TEXT inside it")), new wxStaticText(this, wxID_ANY, _T("And some TEXT inside it")),
0, wxSizerFlags().Center().Border(wxALL, 30));
wxCENTER | topsizer->Add(
wxALL, statsizer,
30); wxSizerFlags(1).Expand().Border(wxALL, 10));
topsizer->Add(statsizer, 1, wxEXPAND | wxALL, 10);
// 2.7) And a test of wxGridSizer // 2.7) And a test of wxGridSizer
wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5); wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5);
gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Label")), 0, gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Label")),
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("Grid sizer demo")), 1, gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("Grid sizer demo")),
wxGROW | wxALIGN_CENTER_VERTICAL); wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL));
gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Another label")), 0, gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Another label")),
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("More text")), 1, gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("More text")),
wxGROW | wxALIGN_CENTER_VERTICAL); wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL));
gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Final label")), 0, gridsizer->Add(new wxStaticText(this, wxID_ANY, _T("Final label")),
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("And yet more text")), 1, gridsizer->Add(new wxTextCtrl(this, wxID_ANY, _T("And yet more text")),
wxGROW | wxALIGN_CENTER_VERTICAL); wxSizerFlags().Align(wxGROW | wxALIGN_CENTER_VERTICAL));
topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10); topsizer->Add(
gridsizer,
wxSizerFlags().Proportion(1).Expand().Border(wxALL, 10));
#if wxUSE_STATLINE #if wxUSE_STATLINE
// 3) middle: create wxStaticLine with minimum size (3x3) // 3) middle: create wxStaticLine with minimum size (3x3)
topsizer->Add( topsizer->Add(
new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
0, // make vertically unstretchable wxSizerFlags().Expand());
wxEXPAND | // make horizontally stretchable
wxALL, // and make border all around
5 ); // set border width to 5
#endif // wxUSE_STATLINE #endif // wxUSE_STATLINE
@@ -162,19 +153,12 @@ MyFrame::MyFrame()
wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
button_box->Add( button_box->Add(
new wxButton( this, wxID_ANY, _T("Two buttons in a box") ), new wxButton( this, wxID_ANY, _T("Two buttons in a box") ),
0, // make horizontally unstretchable wxSizerFlags().Border(wxALL, 7));
wxALL, // make border all around
7 ); // set border width to 7
button_box->Add( button_box->Add(
new wxButton( this, wxID_ANY, _T("(wxCENTER)") ), new wxButton( this, wxID_ANY, _T("(wxCENTER)") ),
0, // make horizontally unstretchable wxSizerFlags().Border(wxALL, 7));
wxALL, // make border all around
7 ); // set border width to 7
topsizer->Add( topsizer->Add(button_box, wxSizerFlags().Center());
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 // don't allow frame to get smaller than what the sizers tell it and also set
// the initial size as calculated by the sizers // the initial size as calculated by the sizers