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

Allow customizing wxGenericProgressDialog style and minor cleanup

Browse Source 
Use wxDEFAULT_DIALOG_STYLE by default but allow changing it before really
creating the dialog.

Also use CreateStdDialogButtonSizer() to make the code a bit more high level.

Closes #17275.
This commit is contained in:
Troels Knakkergaard
2016-03-05 03:48:37 +01:00
committed by Vadim Zeitlin
parent d5453228aa
commit 2ae17ee168
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/progdlgg.cpp
View File

@@ -109,6 +109,8 @@ void wxGenericProgressDialog::Init()
m_winDisabler = NULL; m_winDisabler = NULL;
m_tempEventLoop = NULL; m_tempEventLoop = NULL;
SetWindowStyle(wxDEFAULT_DIALOG_STYLE);
} }
wxGenericProgressDialog::wxGenericProgressDialog() wxGenericProgressDialog::wxGenericProgressDialog()
@@ -148,7 +150,7 @@ bool wxGenericProgressDialog::Create( const wxString& title,
wxWindow* const wxWindow* const
realParent = GetParentForModalDialog(parent, GetWindowStyle()); realParent = GetParentForModalDialog(parent, GetWindowStyle());
if (!wxDialog::Create(realParent, wxID_ANY, title)) if (!wxDialog::Create(realParent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, GetWindowStyle()))
return false; return false;
SetMaximum(maximum); SetMaximum(maximum);
@@ -238,10 +240,7 @@ bool wxGenericProgressDialog::Create( const wxString& title,
} }
sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN); sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
m_btnAbort = wxStdDialogButtonSizer *buttonSizer = wxDialog::CreateStdDialogButtonSizer(0);
m_btnSkip = NULL;
wxStdDialogButtonSizer *buttonSizer = new wxStdDialogButtonSizer();
const int borderFlags = wxALL; const int borderFlags = wxALL;
@@ -259,7 +258,7 @@ bool wxGenericProgressDialog::Create( const wxString& title,
{ {
m_btnAbort = new wxButton(this, wxID_CANCEL); m_btnAbort = new wxButton(this, wxID_CANCEL);
buttonSizer->AddButton(m_btnAbort); buttonSizer->SetCancelButton(m_btnAbort);
} }
if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) ) if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) )