X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.h;h=5adad5a3ed14dd55fb05579d1586fff7c2840615;hb=00ec9baf93ff25e52ee81c0b17fe90190898793e;hp=c76449513dc6a7aaaa676affed767207920a575f;hpb=dd7996d3c27f167d4f80bd8862f39781507589d7;p=dcpomatic.git

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index c76449513..5adad5a3e 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -19,10 +19,12 @@
 */
 
 
+#include "lib/job.h"
 #include "content_sub_panel.h"
+#include "wx_ptr.h"
 
 
-class wxCheckBox;
+class CheckBox;
 class wxSpinCtrl;
 class LanguageTagWidget;
 class TextView;
@@ -36,9 +38,10 @@ class TextPanel : public ContentSubPanel
 public:
 	TextPanel (ContentPanel *, TextType t);
 
-	void film_changed (Film::Property);
-	void film_content_changed (int);
-	void content_selection_changed ();
+	void create () override;
+	void film_changed(FilmProperty) override;
+	void film_content_changed (int) override;
+	void content_selection_changed () override;
 
 private:
 	void use_toggled ();
@@ -59,9 +62,9 @@ private:
 	TextType current_type () const;
 	void update_dcp_tracks ();
 	void update_dcp_track_selection ();
-	void add_to_grid ();
+	void add_to_grid () override;
 	void try_to_load_analysis ();
-	void analysis_finished ();
+	void analysis_finished(Job::Result result);
 	void language_changed ();
 	void language_is_additional_changed ();
 
@@ -71,12 +74,12 @@ private:
 	void update_outline_subtitles_in_viewer ();
 	void clear_outline_subtitles ();
 
-	wxCheckBox* _reference;
+	CheckBox* _reference;
 	wxStaticText* _reference_note;
-	wxCheckBox* _outline_subtitles = nullptr;
-	wxCheckBox* _use;
+	CheckBox* _outline_subtitles = nullptr;
+	CheckBox* _use;
 	wxChoice* _type;
-	wxCheckBox* _burn;
+	CheckBox* _burn;
 	wxStaticText* _offset_label;
 	wxStaticText* _x_offset_label;
 	wxStaticText* _x_offset_pc_label;
@@ -99,9 +102,9 @@ private:
 	wxStaticText* _stream_label;
 	wxChoice* _stream;
 	wxButton* _text_view_button;
-	TextView* _text_view = nullptr;
+	wx_ptr<TextView> _text_view;
 	wxButton* _fonts_dialog_button;
-	FontsDialog* _fonts_dialog = nullptr;
+	wx_ptr<FontsDialog> _fonts_dialog;
 	wxButton* _appearance_dialog_button;
 	TextType _original_type;
 	wxStaticText* _language_label = nullptr;