diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-08 22:56:12 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-08 22:56:12 +0000 |
| commit | 8e6879acee859f216f5e63d97a4ba80c7cb0b94b (patch) | |
| tree | 705350ebc75f64e0afce234b2fec0c55c99f984f /src | |
| parent | Add proper 'viewBox', set 'inkscape:document-units', (diff) | |
| download | inkscape-8e6879acee859f216f5e63d97a4ba80c7cb0b94b.tar.gz inkscape-8e6879acee859f216f5e63d97a4ba80c7cb0b94b.zip | |
Fix gtk3 build at risk of breaking windows build
(bzr r13341.1.262)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/highlight-picker.cpp | 10 | ||||
| -rw-r--r-- | src/ui/widget/insertordericon.cpp | 9 | ||||
| -rw-r--r-- | src/ui/widget/insertordericon.h | 4 |
3 files changed, 3 insertions, 20 deletions
diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp index c03f526dc..8593f0bdf 100644 --- a/src/ui/widget/highlight-picker.cpp +++ b/src/ui/widget/highlight-picker.cpp @@ -7,19 +7,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#include <glibmm.h> #include <gtkmm/icontheme.h> - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif #include "display/cairo-utils.h" - #include "highlight-picker.h" #include "widgets/icon.h" #include "widgets/toolbox.h" diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp index 17930daa2..a28b0f834 100644 --- a/src/ui/widget/insertordericon.cpp +++ b/src/ui/widget/insertordericon.cpp @@ -9,15 +9,6 @@ #include "ui/widget/insertordericon.h" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - - #include <gtkmm/icontheme.h> #include "widgets/icon.h" diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h index e6c2e1c5b..fb3412d3f 100644 --- a/src/ui/widget/insertordericon.h +++ b/src/ui/widget/insertordericon.h @@ -10,12 +10,12 @@ */ #if HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif +#include <glibmm.h> #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> -#include <glibmm/property.h> namespace Inkscape { namespace UI { |