Add Choice::get_data().

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

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 17128e108b1d2640112b06ae26a8f557d49677ba..155d51fac4b0289d134f4459e26cea905e9d5b7c 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
-#include <wx/wx.h>
 #include "timeline.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Playlist;
@@ -29,13 +32,14 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-       TimelineDialog (ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+       TimelineDialog(ContentPanel *, std::shared_ptr<Film>, 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> _film;
        Timeline _timeline;