X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftable_dialog.cc;h=862f7db1a30f310091586398a8796f8fcb8819fa;hb=f6557e4bedd788a026d48fe883cb48a1070dc886;hp=f19565e32fc70ae61f415699c472111bd410d4fe;hpb=9a64198e5489f63a7e0ee3639c03fd801f87e845;p=dcpomatic.git diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc index f19565e32..862f7db1a 100644 --- a/src/wx/table_dialog.cc +++ b/src/wx/table_dialog.cc @@ -1,24 +1,26 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington - 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 . */ #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) @@ -49,7 +51,7 @@ TableDialog::layout () _overall_sizer->SetSizeHints (this); } -void +wxStaticText * #ifdef DCPOMATIC_OSX TableDialog::add (wxString text, bool label) #else @@ -63,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