From a6571e8e22ffd72a9bf390a85e596a4ca3dc3211 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Apr 2014 17:19:45 +0100 Subject: [PATCH] Use our own dir picker on Ubuntu 14.04's GTK version. --- ChangeLog | 5 +++++ src/wx/wx_util.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa564bc21..0393afe76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-27 Carl Hetherington + + * Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as + it appears that the same bug remains. + 2014-04-25 Carl Hetherington * Version 1.66.15 released. diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 0afd82b90..585541150 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -89,10 +89,10 @@ extern int wx_get (wxChoice* widget); extern int wx_get (wxSpinCtrl* 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 + 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)) +#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23)) #define DCPOMATIC_USE_OWN_DIR_PICKER #endif -- 2.30.2