X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftable_dialog.cc;h=862f7db1a30f310091586398a8796f8fcb8819fa;hb=HEAD;hp=571fcf3a4465b8956a9ea02eeebdf82f350804a8;hpb=41b7a04cf3dedaa93aaf3c050db7a693281417f7;p=dcpomatic.git

diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index 571fcf3a4..c4ad5fff6 100644
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -1,33 +1,37 @@
 /*
-    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 "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.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);
 
@@ -35,13 +39,14 @@ TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, bool ca
 	if (cancel) {
 		flags |= wxCANCEL;
 	}
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (flags);
+
+	auto buttons = CreateSeparatedButtonSizer (flags);
 	if (buttons) {
 		_overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 }
 
+
 void
 TableDialog::layout ()
 {
@@ -49,12 +54,27 @@ TableDialog::layout ()
 	_overall_sizer->SetSizeHints (this);
 }
 
-void
-TableDialog::add (wxString text, bool label)
+
+wxStaticText *
+#ifdef DCPOMATIC_OSX
+TableDialog::add (wxString text, bool label, int flags)
+#else
+TableDialog::add (wxString text, bool, int flags)
+#endif
 {
-	add_label_to_sizer (_table, this, text, label);
+#ifdef DCPOMATIC_OSX
+	if (label) {
+		flags |= wxALIGN_RIGHT;
+		text += wxT (":");
+	}
+#endif
+	auto m = new StaticText (this, wxT (""));
+	m->SetLabelMarkup (text);
+	_table->Add (m, 0, flags, 6);
+	return m;
 }
 
+
 void
 TableDialog::add_spacer ()
 {