From: Carl Hetherington <cth@carlh.net>
Date: Fri, 4 Sep 2020 16:15:23 +0000 (+0200)
Subject: Fixes for building with newer wxWidgets.
X-Git-Tag: v2.15.102~13
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=2e6f03cbb2c5664bd338ad28bfd6c54732e64b47;hp=c9dfea2fc2cb4adccdafc325964113c4ccd0e007;p=dcpomatic.git

Fixes for building with newer wxWidgets.
---

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 11f4bfaa7..c7a724375 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -834,10 +834,10 @@ private:
 				switch (Config::instance()->image_display()) {
 				case 0:
 					_dual_screen->Move (0, 0);
-					Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+					Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
 					break;
 				case 1:
-					_dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+					_dual_screen->Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
 					// (0, 0) doesn't seem to work for some strange reason
 					Move (8, 8);
 					break;
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 50fdd0298..a82d5a276 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -40,7 +40,6 @@
 #ifdef DCPOMATIC_LINUX
 #include <GL/glu.h>
 #include <GL/glext.h>
-#include <GL/glxext.h>
 #endif
 
 #ifdef DCPOMATIC_WINDOWS
diff --git a/src/wx/wscript b/src/wx/wscript
index d7a13e32b..e260667bc 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -221,8 +221,8 @@ def configure(conf):
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip()
     conf.in_msg = 0
-    if not wx_version.startswith('3.0.'):
-        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
+    if not wx_version.startswith('3.'):
+        conf.fatal('wxwidgets version 3.x.y is required; %s found' % wx_version)
 
     config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip()
     if config.find('gtk2') != -1: