projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b69ce61
)
Hopefully we can use GTK's file chooser button again now.
author
Carl Hetherington
<cth@carlh.net>
Thu, 23 Apr 2020 23:33:58 +0000
(
01:33
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 14 May 2020 20:43:23 +0000
(22:43 +0200)
src/wx/wx_util.h
patch
|
blob
|
history
diff --git
a/src/wx/wx_util.h
b/src/wx/wx_util.h
index 920d6f2440cf8cd36c8abccbdd36d2e8ba50efee..8dcbc7f1766a9c58052f29a348d117ff5bc37004 100644
(file)
--- a/
src/wx/wx_util.h
+++ b/
src/wx/wx_util.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-31,9
+31,6
@@
#include <boost/function.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/function.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
class FilePickerCtrl;
class wxDirPickerCtrl;
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);
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
#define DCPOMATIC_USE_OWN_PICKER
#endif