X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftable_dialog.cc;h=c4ad5fff6eed933257d768bbd39ccd5727c2c1be;hb=60a864b0b9985f9e84db7028d5b9a523ecfde522;hp=240a997d2fb7cbae392502d2df92b4973c52e1de;hpb=64b7c2e30a6adc62c373b9dcc7f39310f10ed994;p=dcpomatic.git diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc index 240a997d2..c4ad5fff6 100644 --- a/src/wx/table_dialog.cc +++ b/src/wx/table_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,12 @@ */ + +#include "static_text.h" #include "table_dialog.h" #include "wx_util.h" + TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel) : wxDialog (parent, wxID_ANY, title) { @@ -37,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 () { @@ -50,26 +54,27 @@ TableDialog::layout () _overall_sizer->SetSizeHints (this); } + wxStaticText * #ifdef DCPOMATIC_OSX -TableDialog::add (wxString text, bool label) +TableDialog::add (wxString text, bool label, int flags) #else -TableDialog::add (wxString text, bool) +TableDialog::add (wxString text, bool, int flags) #endif { - int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT; #ifdef DCPOMATIC_OSX if (label) { flags |= wxALIGN_RIGHT; text += wxT (":"); } #endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, wxT ("")); + auto m = new StaticText (this, wxT ("")); m->SetLabelMarkup (text); _table->Add (m, 0, flags, 6); return m; } + void TableDialog::add_spacer () {