Use our own dir picker on Ubuntu 14.04's GTK version.

diff --git a/ChangeLog b/ChangeLog
index aa564bc212e9fe2ae2449df8044c6bb3144d5a64..0393afe76d5197a6b956cae1ed77572ab6289e7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * 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  <cth@carlh.net>
 
        * Version 1.66.15 released.

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0afd82b900a104834936dd75a3029ede0d0d9e04..5855411501f8b3be074be3a29e95f6317e322e4c 100644 (file)
--- 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