diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-04-29 20:51:23 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <mc@M0nst3r.bouyguesbox.fr> | 2015-04-29 20:51:23 +0000 |
| commit | 5163b1155c85c040b55f28c771f6d12bcd483765 (patch) | |
| tree | 79afe1546f86f49fe1dc8fd625e125c0646bc59b /src/verbs.cpp | |
| parent | merge with trunk (diff) | |
| parent | Better solution picking (diff) | |
| download | inkscape-5163b1155c85c040b55f28c771f6d12bcd483765.tar.gz inkscape-5163b1155c85c040b55f28c771f6d12bcd483765.zip | |
updated with trunk
(bzr r13922.1.19)
Diffstat (limited to 'src/verbs.cpp')
| -rw-r--r-- | src/verbs.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp index 5febeeb7c..ea2c06dcf 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -32,10 +32,9 @@ #include <cstring> #include <string> -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - +// Note that gtkmm headers must be included before gtk+ C headers +// in all files. The same applies for glibmm/glib etc. +// If this is not done, then errors will be generate relating to Glib::Threads being undefined #include <gtkmm/filechooserdialog.h> #include <gtkmm/messagedialog.h> #include <gtkmm/stock.h> |
