C++11 tidying.

[dcpomatic.git] / src / wx / table_dialog.cc

diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index b3937fd1868212b2a19c965076824c25b9388e6a..862f7db1a30f310091586398a8796f8fcb8819fa 100644 (file)
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -1,33 +1,35 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "table_dialog.h"
 #include "wx_util.h"
+#include "static_text.h"
 
-TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, bool cancel)
+TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel)
        : wxDialog (parent, wxID_ANY, title)
 {
        _overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (_overall_sizer);
 
        _table = new wxFlexGridSizer (columns, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       _table->AddGrowableCol (1, 1);
+       _table->AddGrowableCol (growable, 1);
 
        _overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -49,10 +51,24 @@ TableDialog::layout ()
        _overall_sizer->SetSizeHints (this);
 }
 
-void
+wxStaticText *
+#ifdef DCPOMATIC_OSX
 TableDialog::add (wxString text, bool label)
+#else
+TableDialog::add (wxString text, bool)
+#endif
 {
-       add_label_to_sizer (_table, this, text, label);
+       int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
+#ifdef DCPOMATIC_OSX
+       if (label) {
+               flags |= wxALIGN_RIGHT;
+               text += wxT (":");
+       }
+#endif
+       wxStaticText* m = new StaticText (this, wxT (""));
+       m->SetLabelMarkup (text);
+       _table->Add (m, 0, flags, 6);
+       return m;
 }
 
 void