Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 0201368c2553cbe81f734f2082af881a78c15d09..f45c2480ccd29c24442612cbd0a9eed0b159ce28 100644 (file)
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -46,7 +46,7 @@
 class AudioMappingView : public wxPanel
 {
 public:
-       AudioMappingView (wxWindow *);
+       explicit AudioMappingView (wxWindow *);
 
        void set (AudioMapping);
        void set_input_channels (std::vector<std::string> const & names);
@@ -82,6 +82,8 @@ private:
        void paint_left_labels ();
        void paint_top_labels ();
        void mouse_moved_left_labels (wxMouseEvent &);
+       void setup_sizes ();
+       void grid_scrolled (wxScrollWinEvent& ev);
 
        void off ();
        void full ();
@@ -89,8 +91,8 @@ private:
        void edit ();
 
        wxGrid* _grid;
-       wxPanel* _left_labels;
-       wxPanel* _top_labels;
+       wxScrolledCanvas* _left_labels;
+       wxScrolledCanvas* _top_labels;
        AudioMapping _map;
 
        wxMenu* _menu;