Fixes for building with newer wxWidgets.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 11f4bfaa7a4fd9107aff49a383047962273972ba..c7a7243757ca20816e3626529a9567f8ac95d340 100644 (file)
--- 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);
                                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:
                                        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;
                                        // (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 50fdd02987e5d193447b8602adb323628dbc3031..a82d5a27688e156f0c5eab8f8b7aa82fdc6de02d 100644 (file)
--- 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>
 #ifdef DCPOMATIC_LINUX
 #include <GL/glu.h>
 #include <GL/glext.h>

-#include <GL/glxext.h>

 #endif
 
 #ifdef DCPOMATIC_WINDOWS
 #endif
 
 #ifdef DCPOMATIC_WINDOWS

diff --git a/src/wx/wscript b/src/wx/wscript
index d7a13e32ba7e6df3d28190d7e23c8346d2a48c12..e260667bcd6e91b06f8f2ed68662abb6df1e5da3 100644 (file)
--- 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
     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:
 
     config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip()
     if config.find('gtk2') != -1: