diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-27 23:41:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-27 23:41:26 +0100 |
| commit | 7f2e74604a51b984e4c8cbb5d5f4bb642677ec00 (patch) | |
| tree | be2da9736a298d9367c8c8f1aa231c43251ccaab /src/wx/wx_util.h | |
| parent | 243dff6782db2783648c9efc0e6cd17b1c6cdaae (diff) | |
| parent | ab43240870523c96c68493d107b8bc8c5294629b (diff) | |
Merge master.
Diffstat (limited to 'src/wx/wx_util.h')
| -rw-r--r-- | src/wx/wx_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |