summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorTomasz Boczkowski <penginsbacon@gmail.com>2014-05-30 13:55:34 +0000
committerTomasz Boczkowski <penginsbacon@gmail.com>2014-05-30 13:55:34 +0000
commit17055d029cc8732d1b2636b9e98338c8e7056558 (patch)
treee58c8035d14d0afa495f7abe75ea16400f74c646 /src/ui
parentSPColorSelector c++-sification: added ColorSelectorFactory (diff)
downloadinkscape-17055d029cc8732d1b2636b9e98338c8e7056558.tar.gz
inkscape-17055d029cc8732d1b2636b9e98338c8e7056558.zip
SPColorNotebok c++-sification - available pages list
(bzr r13341.6.28)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/selected-color.cpp5
-rw-r--r--src/ui/selected-color.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index 927c421b8..f61c3b7f8 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -10,11 +10,12 @@
* Copyright (C) 2014 Authors
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <cmath>
-#include <glib.h>
#include "selected-color.h"
+#include <cmath>
+#include <glib.h>
+
namespace Inkscape {
namespace UI {
diff --git a/src/ui/selected-color.h b/src/ui/selected-color.h
index db2f2f68c..a56ee6afb 100644
--- a/src/ui/selected-color.h
+++ b/src/ui/selected-color.h
@@ -13,6 +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"