X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=69de7b76fdbcd4e9555113327ebe92259d2c358b;hb=a3c1ae7c2e46b65347341896b3d1a505ff92632b;hp=964f6f1ab9db2db8469e1fce8a36bd2d93279fa3;hpb=af5b9dfadf8989311cd5f78554349f0283912522;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 964f6f1ab..69de7b76f 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -25,6 +25,10 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
 
+#undef None
+#undef Success
+#undef Status
+
 
 /* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
  * and I think it may even have things missing that we require (e.g. the attributes parameter
@@ -34,6 +38,7 @@ LIBDCP_ENABLE_WARNINGS
  */
 #if wxCHECK_VERSION(3,1,0)
 
+
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
@@ -41,9 +46,6 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/atomic.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#undef None
-#undef Success
-#undef Status
 
 
 class Texture