diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-02 12:54:37 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-02 12:54:37 +0000 |
| commit | 6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c (patch) | |
| tree | c876e9520dccb245004e0704c005a700f9f7c461 /src | |
| parent | merge with trunk (diff) | |
| download | inkscape-6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c.tar.gz inkscape-6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c.zip | |
gtk3 compile fix
(bzr r14059.1.13)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/param/color.cpp | 1 | ||||
| -rw-r--r-- | src/ui/dialog/objects.h | 4 | ||||
| -rw-r--r-- | src/ui/selected-color.cpp | 8 | ||||
| -rw-r--r-- | src/ui/selected-color.h | 14 | ||||
| -rw-r--r-- | src/ui/widget/color-notebook.h | 10 | ||||
| -rw-r--r-- | src/widgets/paint-selector.h | 4 |
6 files changed, 10 insertions, 31 deletions
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index e3410fba8..e68dbf8bf 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -24,7 +24,6 @@ #include "color.h" #include <color.h> -#include "widgets/sp-color-selector.h" #include "ui/widget/color-notebook.h" #include "preferences.h" diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index aa50353c2..7a826d02e 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -16,10 +16,6 @@ # include <config.h> #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -# include <glibmm/threads.h> -#endif - #include <boost/scoped_ptr.hpp> #include <gtkmm/box.h> #include <gtkmm/treeview.h> diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 0d3505c45..7652e5acf 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -14,15 +14,11 @@ # include "config.h" #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - +#include <glibmm/ustring.h> #include <cmath> -#include <glib.h> -#include "selected-color.h" #include "svg/svg-icc-color.h" +#include "ui/selected-color.h" namespace Inkscape { namespace UI { diff --git a/src/ui/selected-color.h b/src/ui/selected-color.h index b4268f553..168099c82 100644 --- a/src/ui/selected-color.h +++ b/src/ui/selected-color.h @@ -13,18 +13,14 @@ #ifndef SEEN_SELECTED_COLOR #define SEEN_SELECTED_COLOR -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <sigc++/signal.h> -#include <gtkmm/widget.h> #include "color.h" +namespace Gtk +{ + class Widget; +} + namespace Inkscape { namespace UI { diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h index 8b74f20f1..9e2aa8ec9 100644 --- a/src/ui/widget/color-notebook.h +++ b/src/ui/widget/color-notebook.h @@ -18,18 +18,14 @@ # include <config.h> #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <boost/ptr_container/ptr_vector.hpp> -#include <gtk/gtk.h> -#include <glib.h> -#if GTK_CHECK_VERSION(3,0,0) +#if WITH_GTKMM_3_0 #include <gtkmm/grid.h> #else #include <gtkmm/table.h> #endif +#include <gtk/gtk.h> +#include <glib.h> #include "color.h" #include "ui/selected-color.h" diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index 0e8a2967d..55f0e8ec9 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -16,10 +16,6 @@ # include <config.h> #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <glib.h> #include <gtk/gtk.h> |