X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=155d51fac4b0289d134f4459e26cea905e9d5b7c;hb=2f518094d7db4e8586eba9c741289735794c572c;hp=17128e108b1d2640112b06ae26a8f557d49677ba;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index 17128e108..155d51fac 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -19,8 +19,11 @@ */ -#include #include "timeline.h" +#include +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS class Playlist; @@ -29,13 +32,14 @@ class Playlist; class TimelineDialog : public wxDialog { public: - TimelineDialog (ContentPanel *, std::shared_ptr, std::weak_ptr viewer); + TimelineDialog(ContentPanel *, std::shared_ptr, FilmViewer& viewer); void set_selection (ContentList selection); private: void film_change (ChangeType type, Film::Property); void tool_clicked (wxCommandEvent& id); + void keypress(wxKeyEvent const& event); std::weak_ptr _film; Timeline _timeline;