Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

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

diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index f94fb0fe83026816659db61e6caa771d80e4fd1e..862f7db1a30f310091586398a8796f8fcb8819fa 100644 (file)
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,7 @@
 
 #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)
@@ -50,7 +51,7 @@ TableDialog::layout ()
        _overall_sizer->SetSizeHints (this);
 }
 
-void
+wxStaticText *
 #ifdef DCPOMATIC_OSX
 TableDialog::add (wxString text, bool label)
 #else
@@ -64,9 +65,10 @@ TableDialog::add (wxString text, bool)
                text += wxT (":");
        }
 #endif
-       wxStaticText* m = new wxStaticText (this, wxID_ANY, wxT (""));
+       wxStaticText* m = new StaticText (this, wxT (""));
        m->SetLabelMarkup (text);
        _table->Add (m, 0, flags, 6);
+       return m;
 }
 
 void