diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-24 01:50:54 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-24 01:50:54 +0200 |
| commit | c3cf916c147f91f5952cba77a293aa989d6e0af7 (patch) | |
| tree | b0ace837a20e99ab7660644919edc6fae1368424 | |
| parent | d07c4241b58fc654cf0331d09d0814b4d6a24743 (diff) | |
| parent | 7ccd46e07ef55e60feeb820b7a2164d24bb1e2cd (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.xv2.15.55
| -rw-r--r-- | src/wx/wx_util.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 400493f18..af25ce0f5 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -31,9 +31,6 @@ #include <boost/function.hpp> #include <boost/thread.hpp> #include <boost/signals2.hpp> -#ifdef __WXGTK__ -#include <gtk/gtk.h> -#endif class FilePickerCtrl; class wxDirPickerCtrl; @@ -110,11 +107,7 @@ extern int wx_get (wxChoice* widget); extern int wx_get (wxSpinCtrl* widget); extern double wx_get (wxSpinCtrlDouble* widget); -/* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04. - This also seems to apply to 2.24.20 in Ubuntu 13.10 and 2.24.23 in Ubuntu 14.04. - Use our own dir picker as this is the least bad option I can think of. -*/ -#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23)) +#if defined(__WXMSW__) #define DCPOMATIC_USE_OWN_PICKER #endif |