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

22
src/generic/progdlgg.cpp
View File

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