Revert "Use make_shared<>."

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

diff --git a/src/wx/text_subtitle_appearance_dialog.cc b/src/wx/text_subtitle_appearance_dialog.cc
index bdab2c615673f5d7246790781e3bb91154ed4379..30402a63f3502e26c1735198fa8663171126a99f 100644 (file)
--- a/src/wx/text_subtitle_appearance_dialog.cc
+++ b/src/wx/text_subtitle_appearance_dialog.cc
@@ -1,30 +1,32 @@
 /*
     Copyright (C) 2015-2016 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 "text_subtitle_appearance_dialog.h"
 #include "lib/text_subtitle_content.h"
+#include "lib/subtitle_content.h"
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
 
 using boost::shared_ptr;
 
-TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr<TextSubtitleContent> content)
+TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
        : TableDialog (parent, _("Subtitle appearance"), 2, 1, true)
        , _content (content)
 {
@@ -44,7 +46,9 @@ TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, sh
 
        _colour->SetColour (wxColour (_content->colour().r, _content->colour().g, _content->colour().b));
        _outline->SetValue (_content->outline ());
-       _outline_colour->SetColour (wxColour (_content->outline_colour().r, _content->outline_colour().g, _content->outline_colour().b));
+       _outline_colour->SetColour (
+               wxColour (_content->outline_colour().r, _content->outline_colour().g, _content->outline_colour().b)
+               );
 }
 
 void