Merge master.

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

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index c5665098bb2cc839f4c51bb0e6789455ea56ec81..9e60db34b23de055ff7208f797622de16ea70fa2 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -17,16 +17,16 @@
 
 */
 
-#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);