From a2fd8a4e3750cfa3ff7be305b4052a0699a3ffee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 19:54:35 +0100 Subject: Give content menu on both main control and timeline. Fix silly bug on updating editor panels. --- src/wx/timeline.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/wx/timeline.h') diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 48eaa9d76..6f5c2ef3b 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -23,6 +23,7 @@ #include #include "lib/util.h" #include "lib/rect.h" +#include "content_menu.h" class Film; class View; @@ -75,9 +76,6 @@ private: void set_start_from_event (wxMouseEvent &); void clear_selection (); - void repeat (wxCommandEvent &); - void remove (wxCommandEvent &); - typedef std::vector > ViewList; typedef std::vector > ContentViewList; @@ -96,7 +94,7 @@ private: boost::shared_ptr _down_view; Time _down_view_start; bool _first_move; - wxMenu* _menu; + ContentMenu _menu; boost::signals2::scoped_connection _playlist_connection; }; -- cgit v1.2.3