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

Create standard dialog buttons with dedicated function

Browse Source 
Use CreateStdDialogButtonSizer() function instead of constructing wxStdDialogButtonSizer manually.
This commit is contained in:
Artur Wieczorek
2018-11-11 11:12:08 +01:00
parent 87195cf3ea
commit d27a1b2770
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/props.cpp
View File

@@ -2315,11 +2315,10 @@ bool wxLongStringProperty::DisplayEditorDialog( wxPGProperty* prop, wxPropertyGr
rowsizer->Add(ed, wxSizerFlags(1).Expand().Border(wxALL, spacing)); rowsizer->Add(ed, wxSizerFlags(1).Expand().Border(wxALL, spacing));
topsizer->Add(rowsizer, wxSizerFlags(1).Expand()); topsizer->Add(rowsizer, wxSizerFlags(1).Expand());
wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer(); long btnSizerFlags = wxCANCEL;
if ( !prop->HasFlag(wxPG_PROP_READONLY) ) if ( !prop->HasFlag(wxPG_PROP_READONLY) )
buttonSizer->AddButton(new wxButton(dlg, wxID_OK)); btnSizerFlags |= wxOK;
buttonSizer->AddButton(new wxButton(dlg, wxID_CANCEL)); wxStdDialogButtonSizer* buttonSizer = dlg->CreateStdDialogButtonSizer(btnSizerFlags);
buttonSizer->Realize();
topsizer->Add(buttonSizer, wxSizerFlags(0).Right().Border(wxBOTTOM|wxRIGHT, spacing)); topsizer->Add(buttonSizer, wxSizerFlags(0).Right().Border(wxBOTTOM|wxRIGHT, spacing));
dlg->SetSizer( topsizer ); dlg->SetSizer( topsizer );
@@ -2494,10 +2493,7 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent,
topsizer->Add(m_elb, wxSizerFlags(1).Expand().Border(0, spacing)); topsizer->Add(m_elb, wxSizerFlags(1).Expand().Border(0, spacing));
// Standard dialog buttons // Standard dialog buttons
wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer(); wxStdDialogButtonSizer* buttonSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
buttonSizer->AddButton(new wxButton(this, wxID_OK));
buttonSizer->AddButton(new wxButton(this, wxID_CANCEL));
buttonSizer->Realize();
topsizer->Add(buttonSizer, wxSizerFlags(0).Right().Border(wxALL, spacing)); topsizer->Add(buttonSizer, wxSizerFlags(0).Right().Border(wxALL, spacing));
m_elb->SetFocus(); m_elb->SetFocus();