diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-01 22:40:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-09 17:04:02 +0100 |
| commit | e839d43989c0d2a9438612ec289a4834df06f712 (patch) | |
| tree | 05566f6ea92190e255b36028ed7df51bbb50bc88 | |
| parent | 566d282b5c3105b175088b0df308f1dab85279e2 (diff) | |
C++11 cleanup.
| -rw-r--r-- | src/wx/screens_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/table_dialog.cc | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 65625e0df..0038a30fb 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -45,7 +45,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) , _ignore_selection_change (false) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); #ifdef __WXGTK3__ int const height = 30; diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc index 862f7db1a..05d06432c 100644 --- a/src/wx/table_dialog.cc +++ b/src/wx/table_dialog.cc @@ -18,9 +18,11 @@ */ + +#include "static_text.h" #include "table_dialog.h" #include "wx_util.h" -#include "static_text.h" + TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel) : wxDialog (parent, wxID_ANY, title) @@ -38,12 +40,13 @@ TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int gro flags |= wxCANCEL; } - wxSizer* buttons = CreateSeparatedButtonSizer (flags); + auto buttons = CreateSeparatedButtonSizer (flags); if (buttons) { _overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } } + void TableDialog::layout () { @@ -51,6 +54,7 @@ TableDialog::layout () _overall_sizer->SetSizeHints (this); } + wxStaticText * #ifdef DCPOMATIC_OSX TableDialog::add (wxString text, bool label) @@ -65,12 +69,13 @@ TableDialog::add (wxString text, bool) text += wxT (":"); } #endif - wxStaticText* m = new StaticText (this, wxT ("")); + auto m = new StaticText (this, wxT ("")); m->SetLabelMarkup (text); _table->Add (m, 0, flags, 6); return m; } + void TableDialog::add_spacer () { |