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

Use wxStdDialogButtonSizer in generic wxProgressDialog

Browse Source 
This improves the placement of the buttons by making it consistent with the
platform conventions and also fixes a regression in button placement
introduced in 2f3d0d9629

Closes #17213.
This commit is contained in:
Iwbnwif Yiw
2015-10-20 13:14:01 +02:00
committed by Vadim Zeitlin
parent 0724bc9a5a
commit 2c43b5c2d9
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/progdlgg.cpp
View File

@@ -241,37 +241,33 @@ bool wxGenericProgressDialog::Create( const wxString& title,
m_btnAbort = m_btnAbort =
m_btnSkip = NULL; m_btnSkip = NULL;
wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL); wxStdDialogButtonSizer *buttonSizer = new wxStdDialogButtonSizer();
const int borderFlags = const int borderFlags = wxALL;
#if defined(__WXMSW__) || defined(__WXOSX__)
wxALL
#else
wxBOTTOM | wxTOP
#endif
;
const wxSizerFlags sizerFlags wxSizerFlags sizerFlags
= wxSizerFlags().Border(borderFlags, LAYOUT_MARGIN); = wxSizerFlags().Border(borderFlags, LAYOUT_MARGIN);
if ( HasPDFlag(wxPD_CAN_SKIP) ) if ( HasPDFlag(wxPD_CAN_SKIP) )
{ {
m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip")); m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip"));
buttonSizer->Add(m_btnSkip, sizerFlags); buttonSizer->SetNegativeButton(m_btnSkip);
} }
if ( HasPDFlag(wxPD_CAN_ABORT) ) if ( HasPDFlag(wxPD_CAN_ABORT) )
{ {
m_btnAbort = new wxButton(this, wxID_CANCEL); m_btnAbort = new wxButton(this, wxID_CANCEL);
buttonSizer->Add(m_btnAbort, sizerFlags); buttonSizer->AddButton(m_btnAbort);
} }
if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) ) if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) )
buttonSizer->AddSpacer(LAYOUT_MARGIN); buttonSizer->AddSpacer(LAYOUT_MARGIN);
sizerTop->Add(buttonSizer, sizerFlags); buttonSizer->Realize();
sizerTop->Add(buttonSizer, sizerFlags.Expand());
SetSizerAndFit(sizerTop); SetSizerAndFit(sizerTop);