X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=f6ede297db3a809408c1a2f7dad9b68437760ed8;hb=8de14f3ad1a4adb1449ebc4503ebe8702119f237;hp=645cb3de3a5e876055177e8126894721e2b1e142;hpb=313319ba2d8544bc25524e02e634804a503b54f1;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 645cb3de3..f6ede297d 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -38,7 +38,10 @@
 #include "lib/text_content.h"
 #include "lib/timer.h"
 #include "lib/video_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iterator>
 #include <list>
 
@@ -78,7 +81,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, w
 	, _left_down (false)
 	, _down_view_position (0)
 	, _first_move (false)
-	, _menu (this)
+	, _menu (this, viewer)
 	, _snap (true)
 	, _tool (SELECT)
 	, _x_scroll_rate (16)
@@ -156,7 +159,7 @@ Timeline::paint_labels ()
 	_labels_canvas->GetViewStart (&vsx, &vsy);
 	gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 
-	_labels_view->paint (gc, list<dcpomatic::Rect<int> >());
+	_labels_view->paint (gc, {});
 
 	delete gc;
 }