diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp index ab51bae50b..b14a0ba0f2 100644 --- a/samples/combo/combo.cpp +++ b/samples/combo/combo.cpp @@ -981,8 +981,8 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) wxVERTICAL); groupSizer->Add( new wxStaticText(dlg, wxID_ANY, - wxT("Writable, with margins, sorted:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxEXPAND, border ); + wxT("Writable, with margins, sorted:")), + wxSizerFlags().Expand().Border(wxRIGHT, border) ); odc = new wxOwnerDrawnComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -994,14 +994,14 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) odc->SetValue(wxT("Dot Dash")); odc->SetMargins(15, 10); - groupSizer->Add( odc, 0, wxALIGN_CENTER_VERTICAL|wxALL, border ); + groupSizer->Add( odc, wxSizerFlags().Border(wxALL, border) ); groupSizer->AddStretchSpacer(); // // Readonly ODComboBox groupSizer->Add( new wxStaticText(dlg, wxID_ANY, - wxT("Read-only, big font:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT, border ); + wxT("Read-only, big font:")), + wxSizerFlags().Border(wxRIGHT, border) ); odc = new wxOwnerDrawnComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -1018,8 +1018,8 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) // // Disabled ODComboBox - groupSizer->Add( new wxStaticText(dlg,wxID_ANY,wxT("Disabled:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT, border ); + groupSizer->Add( new wxStaticText(dlg,wxID_ANY,wxT("Disabled:")), + wxSizerFlags().Border(wxRIGHT, border) ); odc = new wxOwnerDrawnComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -1030,7 +1030,7 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) odc->SetValue(wxT("Dot Dash")); odc->Enable(false); - groupSizer->Add( odc, 3, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, border ); + groupSizer->Add( odc, wxSizerFlags(3).Expand().Border(wxALL, border) ); rowSizer->Add( groupSizer, 1, wxEXPAND|wxALL, border ); @@ -1042,8 +1042,8 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) // wxComboBox // groupSizer->Add( new wxStaticText(dlg,wxID_ANY, - wxT("Writable, with margins, sorted:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxEXPAND, border ); + wxT("Writable, with margins, sorted:")), + wxSizerFlags().Expand().Border(wxRIGHT, border) ); cb = new wxComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -1055,14 +1055,14 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) cb->SetValue(wxT("Dot Dash")); cb->SetMargins(15, 10); - groupSizer->Add( cb, 0, wxALIGN_CENTER_VERTICAL|wxALL, border ); + groupSizer->Add( cb, wxSizerFlags().Border(wxALL, border) ); groupSizer->AddStretchSpacer(); // // Readonly wxComboBox groupSizer->Add( new wxStaticText(dlg, wxID_ANY, - wxT("Read-only, big font:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT, border ); + wxT("Read-only, big font:")), + wxSizerFlags().Border(wxRIGHT, border) ); cb = new wxComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -1078,8 +1078,8 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) // // Disabled wxComboBox - groupSizer->Add( new wxStaticText(dlg,wxID_ANY,wxT("Disabled:")), 0, - wxALIGN_CENTER_VERTICAL|wxRIGHT, border ); + groupSizer->Add( new wxStaticText(dlg,wxID_ANY,wxT("Disabled:")), + wxSizerFlags().Border(wxRIGHT, border) ); cb = new wxComboBox(dlg,wxID_ANY,wxEmptyString, wxDefaultPosition, wxDefaultSize, @@ -1090,7 +1090,7 @@ void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) ) cb->SetValue(wxT("Dot Dash")); cb->Enable(false); - groupSizer->Add( cb, 3, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, border ); + groupSizer->Add( cb, wxSizerFlags(3).Expand().Border(wxALL, border) ); rowSizer->Add( groupSizer, 1, wxEXPAND|wxALL, border ); diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 7cd95f4fb2..e512a3c571 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -3073,7 +3073,7 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) itemSizer8->Add(checkBox6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); item0->Add(itemSizer8, 0, wxGROW|wxALL, 0); - topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); + topSizer->Add( item0, wxSizerFlags(1).Expand().Border(wxALL, 5) ); panel->SetSizerAndFit(topSizer); @@ -3130,7 +3130,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) item0->Add(itemSizer5, 0, wxGROW|wxLEFT|wxRIGHT, 5); #endif - topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); + topSizer->Add( item0, wxSizerFlags(1).Expand().Border(wxALL, 5) ); topSizer->AddSpacer(5); panel->SetSizerAndFit(topSizer); @@ -3211,7 +3211,7 @@ bool TestMessageBoxDialog::Create() sizerBtns->Add(m_buttons[n], wxSizerFlags().Centre().Left()); m_labels[n] = new wxTextCtrl(this, wxID_ANY); - sizerBtns->Add(m_labels[n], wxSizerFlags().Centre().Expand()); + sizerBtns->Add(m_labels[n], wxSizerFlags().Expand()); m_labels[n]->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler( diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp index 8e35baf475..f40e0cdd98 100644 --- a/samples/ipc/client.cpp +++ b/samples/ipc/client.cpp @@ -189,15 +189,15 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) item1->Add( item2, 1, wxALIGN_CENTER|wxALL, 5 ); - item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + item0->Add( item1, wxSizerFlags().Expand().Border(wxALL, 5) ); wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") ); wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL ); wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxEmptyString, wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE ); - item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + item13->Add( item15, wxSizerFlags(1).Expand().Border(wxALL, 5) ); - item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + item0->Add( item13, wxSizerFlags(0).Expand().Border(wxALL, 5) ); this->SetSizer( item0 ); item0->SetSizeHints( this ); diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp index e9f9ba59de..54d2763898 100644 --- a/samples/ipc/server.cpp +++ b/samples/ipc/server.cpp @@ -121,7 +121,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) sizerCmds->Add(btn, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); sizerCmds->AddSpacer(20); - sizerMain->Add(sizerCmds, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + sizerMain->Add(sizerCmds, wxSizerFlags().Expand().Border(wxALL, 5)); wxStaticBoxSizer * const sizerLog = new wxStaticBoxSizer(wxVERTICAL, panel, "Server &log"); @@ -134,9 +134,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) wxDefaultPosition, wxSize(500, 140), wxTE_MULTILINE ); - sizerLog->Add(textLog, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + sizerLog->Add(textLog, wxSizerFlags(1).Expand().Border(wxALL, 5)); - sizerMain->Add(sizerLog, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + sizerMain->Add(sizerLog, wxSizerFlags(1).Expand().Border(wxALL, 5)); panel->SetSizer(sizerMain); sizerMain->SetSizeHints(panel); diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 58e1ca1b49..5bc54068b2 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -173,7 +173,7 @@ void FormMain::OnDumpList( wxCommandEvent& WXUNUSED(event) ) wxALIGN_CENTRE_HORIZONTAL|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT; rowsizer->Add( new wxButton(dlg,wxID_OK,wxT("Ok")), 0, butSzFlags, spacing ); - topsizer->Add( rowsizer, 0, wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL, 0 ); + topsizer->Add( rowsizer, wxSizerFlags().Right() ); dlg->SetSizer( topsizer ); topsizer->SetSizeHints( dlg ); @@ -354,7 +354,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) wxALIGN_CENTRE_HORIZONTAL|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT; rowsizer->Add( new wxButton(dlg,wxID_OK,wxT("Ok")), 0, butSzFlags, spacing ); - topsizer->Add( rowsizer, 0, wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL, 0 ); + topsizer->Add( rowsizer, wxSizerFlags().Right() ); dlg->SetSizer( topsizer ); topsizer->SetSizeHints( dlg ); diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index fb697c9710..f05f550179 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -322,7 +322,7 @@ void BitmapComboBoxWidgetsPage::CreateContent() wxButton *btn = new wxButton(this, BitmapComboBoxPage_Reset, wxT("&Reset")); sizerStyle->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 3); - sizerLeft->Add(sizerStyle, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL); + sizerLeft->Add(sizerStyle, wxSizerFlags().Expand()); sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5); // left pane - other options box @@ -336,7 +336,7 @@ void BitmapComboBoxWidgetsPage::CreateContent() m_textChangeHeight->SetSize(20, wxDefaultCoord); sizerOptions->Add(sizerRow, 0, wxALL | wxFIXED_MINSIZE /*| wxGROW*/, 5); - sizerLeft->Add(sizerOptions, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL | wxTOP, 2); + sizerLeft->Add( sizerOptions, wxSizerFlags().Expand().Border(wxTOP, 2)); // middle pane wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp index a1ba063ad3..e77a67aa35 100644 --- a/samples/widgets/odcombobox.cpp +++ b/samples/widgets/odcombobox.cpp @@ -348,7 +348,7 @@ void ODComboboxWidgetsPage::CreateContent() wxButton *btn = new wxButton(this, ODComboPage_Reset, wxT("&Reset")); sizerStyle->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 3); - sizerLeft->Add(sizerStyle, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL); + sizerLeft->Add(sizerStyle, wxSizerFlags().Expand()); // left pane - popup adjustment box box = new wxStaticBox(this, wxID_ANY, wxT("Adjust &popup")); @@ -369,7 +369,7 @@ void ODComboboxWidgetsPage::CreateContent() m_chkAlignpopupright = CreateCheckBoxAndAddToSizer(sizerPopupPos, wxT("Align Right")); - sizerLeft->Add(sizerPopupPos, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL | wxTOP, 2); + sizerLeft->Add(sizerPopupPos, wxSizerFlags().Expand().Border(wxTOP, 2)); // left pane - button adjustment box box = new wxStaticBox(this, wxID_ANY, wxT("Adjust &button")); @@ -396,7 +396,7 @@ void ODComboboxWidgetsPage::CreateContent() m_chkAlignbutleft = CreateCheckBoxAndAddToSizer(sizerButtonPos, wxT("Align Left")); - sizerLeft->Add(sizerButtonPos, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL | wxTOP, 2); + sizerLeft->Add(sizerButtonPos, wxSizerFlags().Expand().Border(wxTOP, 2)); // middle pane wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 2d1d5449c7..be1dc18577 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -255,12 +255,12 @@ void wxGenericColourDialog::CreateWidgets() sliderSizer->Add(sliderX, sliderHeight ); - wxSizerFlags flagsRight; - flagsRight.Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).DoubleBorder(); + const wxSizerFlags sliderFlags + = wxSizerFlags().CentreVertical().DoubleBorder(); - sliderSizer->Add(m_redSlider, flagsRight); - sliderSizer->Add(m_greenSlider,flagsRight); - sliderSizer->Add(m_blueSlider,flagsRight); + sliderSizer->Add(m_redSlider, sliderFlags); + sliderSizer->Add(m_greenSlider, sliderFlags); + sliderSizer->Add(m_blueSlider, sliderFlags); topSizer->Add(sliderSizer, wxSizerFlags().Centre().DoubleBorder()); #else diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 03616c83d7..2b85b5243a 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -269,33 +269,35 @@ bool wxGenericProgressDialog::Create( const wxString& title, wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL); - // Windows dialogs usually have buttons in the lower right corner - const int sizerFlags = + const int borderFlags = #if defined(__WXMSW__) || defined(__WXOSX__) - wxALIGN_RIGHT | wxALL -#else // !MSW - wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP -#endif // MSW/!MSW - ; + wxALL +#else + wxBOTTOM | wxTOP +#endif + ; + + const wxSizerFlags sizerFlags + = wxSizerFlags().Border(borderFlags, LAYOUT_MARGIN); if ( HasPDFlag(wxPD_CAN_SKIP) ) { m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip")); - buttonSizer->Add(m_btnSkip, 0, sizerFlags, LAYOUT_MARGIN); + buttonSizer->Add(m_btnSkip, sizerFlags); } if ( HasPDFlag(wxPD_CAN_ABORT) ) { m_btnAbort = new wxButton(this, wxID_CANCEL); - buttonSizer->Add(m_btnAbort, 0, sizerFlags, LAYOUT_MARGIN); + buttonSizer->Add(m_btnAbort, sizerFlags); } if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) ) buttonSizer->AddSpacer(LAYOUT_MARGIN); - sizerTop->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN ); + sizerTop->Add(buttonSizer, sizerFlags); #endif // __SMARTPHONE__/!__SMARTPHONE__ SetSizerAndFit(sizerTop); diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp index aac91de2ce..d1fc309e34 100644 --- a/src/generic/propdlg.cpp +++ b/src/generic/propdlg.cpp @@ -122,7 +122,7 @@ void wxPropertySheetDialog::CreateButtons(int flags) wxSizer *buttonSizer = CreateButtonSizer(flags); if( buttonSizer ) { - m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2); + m_innerSizer->Add( buttonSizer, wxSizerFlags().Expand().Border(wxALL, 2) ); m_innerSizer->AddSpacer(2); } @@ -180,9 +180,9 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer) // The book control has to be sized larger than the dialog because of a border bug // in WinCE int borderSize = -2; - sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize ); + sizer->Add( m_bookCtrl, wxSizerFlags(1).Expand().Border(wxLEFT|wxTOP|wxRIGHT, borderSize) ); #else - sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder ); + sizer->Add( m_bookCtrl, wxSizerFlags(1).Expand().Border(wxALL, m_sheetInnerBorder) ); #endif } diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp index bb4315e363..72aaf7aa8d 100644 --- a/utils/screenshotgen/src/guiframe.cpp +++ b/utils/screenshotgen/src/guiframe.cpp @@ -31,6 +31,8 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer0 = new wxBoxSizer( wxVERTICAL ); m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_commonExpandFlags = wxSizerFlags(1).Expand().Border(wxALL, 20); + //Add panels into m_notebook1 //Tiny Controls @@ -158,11 +160,11 @@ void GUIFrame::AddPanel_1() m_gauge1 = new wxGauge( m_panel1, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL, wxDefaultValidator, wxT("_Gauge") ); m_gauge1->SetValue( 50 ); m_gauge1->SetToolTip( _("wxGauge") ); - fgSizer1->Add( m_gauge1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer1->Add(m_gauge1, m_commonExpandFlags); m_slider1 = new wxSlider( m_panel1, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL ); m_slider1->SetToolTip( _("wxSlider") ); - fgSizer1->Add( m_slider1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer1->Add(m_slider1, m_commonExpandFlags); m_toggleBtn1 = new wxToggleButton( m_panel1, wxID_ANY, _("Untoggled"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtn1->SetToolTip( _("wxToggleButton") ); @@ -188,7 +190,7 @@ void GUIFrame::AddPanel_1() m_scrollBar1 = new wxScrollBar( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_HORIZONTAL ); m_scrollBar1->SetScrollbar(50, 1, 100, 1); m_scrollBar1->SetToolTip( _("wxScrollBar") ); - fgSizer1->Add( m_scrollBar1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer1->Add(m_scrollBar1, m_commonExpandFlags); m_panel1->SetSizer( fgSizer1 ); m_panel1->Layout(); @@ -209,13 +211,13 @@ void GUIFrame::AddPanel_2() int m_checkList1NChoices = sizeof( m_checkList1Choices ) / sizeof( wxString ); m_checkList1 = new wxCheckListBox( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkList1NChoices, m_checkList1Choices, 0 ); m_checkList1->Check(0); - fgSizer2->Add( m_checkList1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer2->Add(m_checkList1, m_commonExpandFlags); m_listBox1 = new wxListBox( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_listBox1->Append( _("wxListBox") ); m_listBox1->Append( _("Item1") ); m_listBox1->Append( _("Item2") ); - fgSizer2->Add( m_listBox1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer2->Add(m_listBox1, m_commonExpandFlags); wxString m_radioBox1Choices[] = { _("Item1"), _("Item2") }; int m_radioBox1NChoices = sizeof( m_radioBox1Choices ) / sizeof( wxString ); @@ -224,7 +226,7 @@ void GUIFrame::AddPanel_2() fgSizer2->Add( m_radioBox1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); m_staticBox1 = new wxStaticBox(m_panel2,wxID_ANY, _("wxStaticBox"), wxDefaultPosition, wxDefaultSize, 0, _("_StaticBox")); - fgSizer2->Add( m_staticBox1, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 20 ); + fgSizer2->Add(m_staticBox1, m_commonExpandFlags); m_treeCtrl1 = new wxTreeCtrl( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER ); wxTreeItemId root = m_treeCtrl1->AddRoot(_("wxTreeCtrl")); @@ -232,7 +234,7 @@ void GUIFrame::AddPanel_2() wxTreeItemId node2 = m_treeCtrl1->AppendItem(root, _("Node2")); m_treeCtrl1->AppendItem(node2, _("Node3")); m_treeCtrl1->ExpandAll(); - fgSizer2->Add( m_treeCtrl1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer2->Add( m_treeCtrl1, m_commonExpandFlags); m_listCtrl1 = new wxListCtrl( m_panel2, wxID_ANY, wxDefaultPosition, wxSize(220,120), wxLC_REPORT|wxSUNKEN_BORDER ); m_listCtrl1->InsertColumn(0, "Names"); @@ -242,7 +244,7 @@ void GUIFrame::AddPanel_2() m_listCtrl1->SetItem(index, 1, wxString::Format("%d", index)); } m_listCtrl1->SetToolTip( _("wxListCtrl") ); - fgSizer2->Add( m_listCtrl1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer2->Add( m_listCtrl1, m_commonExpandFlags); m_animationCtrl1 = new wxAnimationCtrl(m_panel2, wxID_ANY); m_animationCtrl1->SetToolTip(_("wxAnimationCtrl")); @@ -261,9 +263,9 @@ void GUIFrame::AddPanel_2() wxTextCtrl* m_collText = new wxTextCtrl(win, -1, wxT("inside a wxCollapsiblePane")); collbSizer->Add( m_collSText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); collbSizer->Add( m_collBut, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); - collbSizer->Add( m_collText, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); + collbSizer->Add( m_collText, wxSizerFlags().Expand() ); win->SetSizer(collbSizer); - fgSizer2->Add( m_collPane1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer2->Add( m_collPane1, wxSizerFlags().Expand().Border(wxALL, 5) ); //wxCollapsiblePane 2 m_collPane2 = new wxCollapsiblePane(m_panel2, -1, wxT("Expanded")); @@ -276,12 +278,12 @@ void GUIFrame::AddPanel_2() wxTextCtrl* m_collText2 = new wxTextCtrl(win2, -1, wxT("inside a wxCollapsiblePane")); collbSizer2->Add( m_collSText2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); collbSizer2->Add( m_collBut2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); - collbSizer2->Add( m_collText2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0 ); + collbSizer2->Add( m_collText2, wxSizerFlags().Expand() ); win2->SetSizer(collbSizer2); m_collPane2->Expand(); - fgSizer2->Add( m_collPane2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer2->Add( m_collPane2, wxSizerFlags().Expand().Border(wxALL, 5) ); m_panel2->SetSizer( fgSizer2 ); m_panel2->Layout(); @@ -362,7 +364,7 @@ void GUIFrame::AddPanel_4() m_genericDirCtrl1->ShowHidden( false ); m_genericDirCtrl1->SetToolTip( _("wxGenericDirCtrl") ); m_genericDirCtrl1->SetMinSize( wxSize( -1,150 ) ); - fgSizer5->Add( m_genericDirCtrl1, 1, wxEXPAND|wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer5->Add(m_genericDirCtrl1, m_commonExpandFlags); m_dirPicker1 = new wxDirPickerCtrl( m_panel4, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE, wxDefaultValidator, wxT("_DirPickerCtrl") ); #if defined(__WXMSW__) @@ -419,11 +421,12 @@ void GUIFrame::AddPanel_5() m_bmpComboBox1->Append(_("Item3"), wxBitmap(wxT("bitmaps/bell.png"),wxBITMAP_TYPE_PNG)); m_bmpComboBox1->Append(_("Item4"), wxBitmap(wxT("bitmaps/sound.png"),wxBITMAP_TYPE_PNG)); m_bmpComboBox1->SetToolTip(_("wxBitmapComboBox")); - fgSizer4->Add( m_bmpComboBox1, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 20 ); + fgSizer4->Add(m_bmpComboBox1, m_commonExpandFlags); + m_ownerDrawnComboBox1 = PenStyleComboBox::CreateSample(m_panel5); m_ownerDrawnComboBox1->SetToolTip(_("wxOwnerDrawnComboBox")); - fgSizer4->Add( m_ownerDrawnComboBox1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer4->Add(m_ownerDrawnComboBox1, m_commonExpandFlags); fgSizer4->Add( 0, 90, 1, wxEXPAND, 5 ); @@ -449,7 +452,7 @@ void GUIFrame::AddPanel_5() popupList->InsertItem(popupList->GetItemCount(),wxT("Item3")); popupList->Select(0, true); - fgSizer4->Add( m_comboCtrl1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer4->Add(m_comboCtrl1, m_commonExpandFlags); //wxComboCtrl 2 m_comboCtrl2 = new wxComboCtrl(m_panel5,wxID_ANY,wxEmptyString); @@ -472,7 +475,7 @@ void GUIFrame::AddPanel_5() popupTree->AppendItem(node2, _("Node2")); popupTree->ExpandAll(); - fgSizer4->Add( m_comboCtrl2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 20 ); + fgSizer4->Add(m_comboCtrl2, m_commonExpandFlags); m_panel5->SetSizer( fgSizer4 ); m_panel5->Layout(); diff --git a/utils/screenshotgen/src/guiframe.h b/utils/screenshotgen/src/guiframe.h index 1bbbfec485..b0a37d8360 100644 --- a/utils/screenshotgen/src/guiframe.h +++ b/utils/screenshotgen/src/guiframe.h @@ -119,6 +119,8 @@ private: void AddPanel_3(); void AddPanel_4(); void AddPanel_5(); + + wxSizerFlags m_commonExpandFlags; }; #endif //_GUIFRAME_H_