Make sure main picture active area values are even (#2392).

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

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index 7337e5258b8c55ed4fef2ceba12bdf873a104de3..dc8f685f134cff5dfcf823a4e468c347b6b3f563 100644 (file)
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -22,7 +22,7 @@
 #include "content_sub_panel.h"
 
 
-class wxCheckBox;
+class CheckBox;
 class wxSpinCtrl;
 class LanguageTagWidget;
 class TextView;
@@ -36,9 +36,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,7 +60,7 @@ 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 language_changed ();
@@ -71,12 +72,12 @@ private:
        void update_outline_subtitles_in_viewer ();
        void clear_outline_subtitles ();
 
-       wxCheckBox* _reference;
+       CheckBox* _reference;
        wxStaticText* _reference_note;
-       wxCheckBox* _outline_subtitles;
-       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;
@@ -94,14 +95,14 @@ private:
        wxStaticText* _line_spacing_label;
        wxStaticText* _line_spacing_pc_label;
        SpinCtrl* _line_spacing;
-       wxStaticText* _dcp_track_label;
-       wxChoice* _dcp_track;
+       wxStaticText* _dcp_track_label = nullptr;
+       wxChoice* _dcp_track = nullptr;
        wxStaticText* _stream_label;
        wxChoice* _stream;
        wxButton* _text_view_button;
-       TextView* _text_view;
+       TextView* _text_view = nullptr;
        wxButton* _fonts_dialog_button;
-       FontsDialog* _fonts_dialog;
+       FontsDialog* _fonts_dialog = nullptr;
        wxButton* _appearance_dialog_button;
        TextType _original_type;
        wxStaticText* _language_label = nullptr;
@@ -115,5 +116,5 @@ private:
        std::weak_ptr<Content> _analysis_content;
        boost::signals2::scoped_connection _analysis_finished_connection;
        std::shared_ptr<SubtitleAnalysis> _analysis;
-       bool _loading_analysis;
+       bool _loading_analysis = false;
 };