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..9e60db34b23de055ff7208f797622de16ea70fa2 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -17,23 +17,23 @@
 
 */
 
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 
 class wxCheckBox;
 class wxSpinCtrl;
 class SubtitleView;
 
-class SubtitlePanel : public FilmEditorPanel
+class SubtitlePanel : public ContentSubPanel
 {
 public:
-       SubtitlePanel (FilmEditor *);
+       SubtitlePanel (ContentPanel *);
 
        void film_changed (Film::Property);
        void film_content_changed (int);
        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;