Don't show an error when cancelling subtitle analysis.

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

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index c76449513dc6a7aaaa676affed767207920a575f..eee5e916cb50248f9e48713d269fb77c70850101 100644 (file)
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -20,9 +20,10 @@
 
 
 #include "content_sub_panel.h"
+#include "wx_ptr.h"
 
 
-class wxCheckBox;
+class CheckBox;
 class wxSpinCtrl;
 class LanguageTagWidget;
 class TextView;
@@ -36,9 +37,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 (Film::Property) override;
+       void film_content_changed (int) override;
+       void content_selection_changed () override;
 
 private:
        void use_toggled ();
@@ -59,9 +61,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 +73,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 +101,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;