Merge master.

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

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index 1ee775025ae80710638f869c2488fb9366a1b182..c5665098bb2cc839f4c51bb0e6789455ea56ec81 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -33,7 +33,7 @@ public:
        void content_selection_changed ();
        
 private:
-       void with_subtitles_toggled ();
+       void use_toggled ();
        void x_offset_changed ();
        void y_offset_changed ();
        void scale_changed ();
@@ -42,7 +42,7 @@ private:
 
        void setup_sensitivity ();
        
-       wxCheckBox* _with_subtitles;
+       wxCheckBox* _use;
        wxSpinCtrl* _x_offset;
        wxSpinCtrl* _y_offset;
        wxSpinCtrl* _scale;