diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2015-04-27 23:38:31 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2015-04-27 23:38:31 +0000 |
| commit | ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c (patch) | |
| tree | 8a089e291323cf75e99ea9b3813193b0394fa7f1 /src/verbs.cpp | |
| parent | add two files omitted in patch at revision 14062 (diff) | |
| download | inkscape-ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c.tar.gz inkscape-ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c.zip | |
Fix unnecessary inclusion of glibmm/threads.h. This can be resolved by ensuring that glibmm headers always preceed glib.h headers. Same applies with gtkmm/gtk+ etc
(bzr r14064)
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> |