Merge branch 'own-config' into v2.15.x

[dcpomatic.git] / src / wx / subtitle_appearance_dialog.h

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 299b3c70a1c082d087171cf68f88a6d5d56449a8..2a5b9843023cd182201cf9318321fe81d9a9e437 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,7 +18,9 @@
 
 */
 
+
 #include "timecode.h"
+#include "lib/change_signaller.h"
 #include "lib/rgba.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
@@ -26,6 +28,7 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 class wxRadioButton;
 class wxColourPickerCtrl;
 class wxGridBagSizer;
@@ -37,6 +40,7 @@ class wxWidget;
 class Film;
 class Job;
 
+
 class SubtitleAppearanceDialog : public wxDialog
 {
 public:
@@ -69,11 +73,11 @@ private:
 
        wxBoxSizer* _overall_sizer;
        wxScrolled<wxPanel>* _colours_panel;
-       wxStaticText* _finding;
+       wxStaticText* _finding = nullptr;
        wxFlexGridSizer* _colour_table;
 
        std::shared_ptr<Content> _content;
-       std::shared_ptr<TextContent> _caption;
+       std::shared_ptr<TextContent> _text;
        std::shared_ptr<FFmpegSubtitleStream> _stream;
 
        boost::signals2::scoped_connection _content_connection;