From c4861a3526ab3c4afc320ce70bdadd8fa944596b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 24 Apr 2020 01:33:58 +0200 Subject: [PATCH] Hopefully we can use GTK's file chooser button again now. --- src/wx/wx_util.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 920d6f244..8dcbc7f17 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -31,9 +31,6 @@ #include #include #include -#ifdef __WXGTK__ -#include -#endif class FilePickerCtrl; class wxDirPickerCtrl; @@ -108,11 +105,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 -- 2.30.2