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

Fix invalid use of wxSizer flags in samples and utils.

Browse Source 
Remove alignment flags that result in asserts because of being used in
combinations that don't make sense.

Also use wxSizerFlags in the lines that were changed.
This commit is contained in:
Dimitri Schoolwerth
2015-04-25 14:52:36 +04:00
parent 4b9485a497
commit 2f3d0d9629
12 changed files with 74 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/combo/combo.cpp
View File

@@ -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 );

6
samples/dialogs/dialogs.cpp
View File

@@ -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(

6
samples/ipc/client.cpp
View File

@@ -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 );

6
samples/ipc/server.cpp
View File

@@ -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);

4
samples/propgrid/tests.cpp
View File

@@ -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 );

4
samples/widgets/bmpcombobox.cpp
View File

@@ -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,

6
samples/widgets/odcombobox.cpp
View File

@@ -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,