X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.h;h=f023b73ae0987b76f46ec8e5e76a2f020fdc04f5;hb=e90ff462412902a1e06878a0f34dc2e0323e738c;hp=299b3c70a1c082d087171cf68f88a6d5d56449a8;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 299b3c70a..f023b73ae 100644
--- 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,14 +18,17 @@
 
 */
 
+
 #include "timecode.h"
+#include "lib/change_signaller.h"
 #include "lib/rgba.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_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;