Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 184356a20cb39fc2ab80fcce5eac69f3ac529796..c7268e8a5e71feb2c05e969f0dc215a95113a533 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -36,6 +36,9 @@
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#endif
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>