summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorTomasz Boczkowski <penginsbacon@gmail.com>2015-05-02 12:54:37 +0000
committerTomasz Boczkowski <penginsbacon@gmail.com>2015-05-02 12:54:37 +0000
commit6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c (patch)
treec876e9520dccb245004e0704c005a700f9f7c461 /src/ui/widget
parentmerge with trunk (diff)
downloadinkscape-6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c.tar.gz
inkscape-6ebb6cfcf28dfd36a22ce4fe11324971c34ee70c.zip
gtk3 compile fix
(bzr r14059.1.13)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/color-notebook.h10
1 files changed, 3 insertions, 7 deletions
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"