diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-19 19:54:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-19 19:54:35 +0100 |
| commit | a2fd8a4e3750cfa3ff7be305b4052a0699a3ffee (patch) | |
| tree | 6e7b84167711d7623d48779e7af83cdbe8a4fbcb /src/wx/timeline.h | |
| parent | 114912df4be84f7d8b82833b93d739b117ec8705 (diff) | |
Give content menu on both main control and timeline. Fix silly bug on updating editor panels.
Diffstat (limited to 'src/wx/timeline.h')
| -rw-r--r-- | src/wx/timeline.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 <wx/wx.h> #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<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; }; |
