A whole load of UTF-8/-16 confusion fixes for Windows.

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 5b0c958809045e9563480a20bdc16160c7c137be..fb1f98b29777c83be18ed45fb1774efa6c029949 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -19,7 +19,7 @@
 
 #include "lib/film.h"
 #include "film_editor_panel.h"
-#include "multiple_widget.h"
+#include "content_widget.h"
 
 class wxChoice;
 class wxStaticText;
@@ -36,24 +36,17 @@ public:
        void content_selection_changed ();
 
 private:
-       void set_left_crop_same ();
-       void left_crop_changed ();
-       void right_crop_changed ();
-       void top_crop_changed ();
-       void bottom_crop_changed ();
        void edit_filters_clicked ();
-       void ratio_changed ();
-       void frame_type_changed ();
        void edit_colour_conversion_clicked ();
 
        void setup_description ();
 
-       wxChoice* _frame_type;
-       MultipleWidget<wxSpinCtrl>* _left_crop;
-       MultipleWidget<wxSpinCtrl>* _right_crop;
-       MultipleWidget<wxSpinCtrl>* _top_crop;
-       MultipleWidget<wxSpinCtrl>* _bottom_crop;
-       wxChoice* _ratio;
+       ContentChoice<VideoContent, VideoFrameType>* _frame_type;
+       ContentSpinCtrl<VideoContent>*               _left_crop;
+       ContentSpinCtrl<VideoContent>*               _right_crop;
+       ContentSpinCtrl<VideoContent>*               _top_crop;
+       ContentSpinCtrl<VideoContent>*               _bottom_crop;
+       ContentChoice<VideoContent, Ratio const *>*  _ratio;
        wxStaticText* _ratio_description;
        wxStaticText* _description;
        wxStaticText* _filters;