Remove assumption that GDC serials always start with 'A' (apparently there are other...

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

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index dc8f685f134cff5dfcf823a4e468c347b6b3f563..5adad5a3ed14dd55fb05579d1586fff7c2840615 100644 (file)
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -19,7 +19,9 @@
 */
 
 
+#include "lib/job.h"
 #include "content_sub_panel.h"
+#include "wx_ptr.h"
 
 
 class CheckBox;
@@ -37,7 +39,7 @@ public:
        TextPanel (ContentPanel *, TextType t);
 
        void create () override;
-       void film_changed (Film::Property) override;
+       void film_changed(FilmProperty) override;
        void film_content_changed (int) override;
        void content_selection_changed () override;
 
@@ -62,7 +64,7 @@ private:
        void update_dcp_track_selection ();
        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 ();
 
@@ -100,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;