Remove old Connect() wxWidgets API and use Bind().

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 48eaa9d762250bbde17d12797f6b4147f679c9f2..db33dbbdc70e161003eaf9df40ebbaf46c64eefa 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -23,6 +23,7 @@
 #include <wx/wx.h>
 #include "lib/util.h"
 #include "lib/rect.h"
+#include "content_menu.h"
 
 class Film;
 class View;
@@ -64,20 +65,17 @@ public:
        void setup_pixels_per_time_unit ();
 
 private:
-       void paint (wxPaintEvent &);
+       void paint ();
        void left_down (wxMouseEvent &);
        void left_up (wxMouseEvent &);
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
        void playlist_changed ();
-       void resized (wxSizeEvent &);
+       void resized ();
        void assign_tracks ();
        void set_start_from_event (wxMouseEvent &);
        void clear_selection ();
 
-       void repeat (wxCommandEvent &);
-       void remove (wxCommandEvent &);
-
        typedef std::vector<boost::shared_ptr<View> > ViewList;
        typedef std::vector<boost::shared_ptr<ContentView> > ContentViewList;
 
@@ -96,7 +94,7 @@ private:
        boost::shared_ptr<ContentView> _down_view;
        Time _down_view_start;
        bool _first_move;
-       wxMenu* _menu;
+       ContentMenu _menu;
 
        boost::signals2::scoped_connection _playlist_connection;
 };