Move GIMP widgets to their own folder

(bzr r15043.1.2)

11 files changed, 3 insertions, 9 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 587974b90..edcc41cd2 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -130,8 +130,6 @@ set(ui_SRC
 	widget/filter-effect-chooser.cpp
 	widget/font-variants.cpp
 	widget/frame.cpp
-	widget/gimpcolorwheel.c
-	widget/gimpspinscale.c
 	widget/highlight-picker.cpp
 	widget/imageicon.cpp
 	widget/imagetoggler.cpp
@@ -314,8 +312,6 @@ set(ui_SRC
 	widget/filter-effect-chooser.h
 	widget/font-variants.h
 	widget/frame.h
-	widget/gimpspinscale.h
-	widget/gimpcolorwheel.h
 	widget/highlight-picker.h
 	widget/insertordericon.h
 	widget/imageicon.h
diff --git a/src/ui/dialog-events.h b/src/ui/dialog-events.h
index b4a5d7c35..547cfb95d 100644
--- a/src/ui/dialog-events.h
+++ b/src/ui/dialog-events.h
@@ -12,6 +12,7 @@
 #ifndef SEEN_DIALOG_EVENTS_H
 #define SEEN_DIALOG_EVENTS_H
 
+#include <gtk/gtk.h>
  
 /*
  * event callback can only accept one argument, but we need two,
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index fea6543ea..616e9afa8 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -5,7 +5,6 @@
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
-#include <gtk/gtk.h>
 #include <set>
 
 #include "ui/dialog-events.h"
diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h
index 35e46ef14..0948e3d46 100644
--- a/src/ui/widget/color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -20,7 +20,6 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <gtkmm/grid.h>
-#include <gtk/gtk.h>
 #include <glib.h>
 
 #include "color.h"
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 7fcca215f..89913b01b 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -8,7 +8,6 @@
 
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 18f932f10..4f011c6c3 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -11,7 +11,7 @@
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
-#include "ui/widget/gimpcolorwheel.h"
+#include "widgets/gimp/gimpcolorwheel.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index eb91aaf39..f74626d9b 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -11,7 +11,7 @@
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 
-#include "ui/widget/gimpspinscale.h"
+#include "widgets/gimp/gimpspinscale.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/gimpcolorwheel.c b/src/widgets/gimp/gimpcolorwheel.c
index 212391497..212391497 100644
--- a/src/ui/widget/gimpcolorwheel.c
+++ b/src/widgets/gimp/gimpcolorwheel.c
diff --git a/src/ui/widget/gimpcolorwheel.h b/src/widgets/gimp/gimpcolorwheel.h
index 016fb593f..016fb593f 100644
--- a/src/ui/widget/gimpcolorwheel.h
+++ b/src/widgets/gimp/gimpcolorwheel.h
diff --git a/src/ui/widget/gimpspinscale.c b/src/widgets/gimp/gimpspinscale.c
index 8d8c6c935..8d8c6c935 100644
--- a/src/ui/widget/gimpspinscale.c
+++ b/src/widgets/gimp/gimpspinscale.c
diff --git a/src/ui/widget/gimpspinscale.h b/src/widgets/gimp/gimpspinscale.h
index b42a0faf8..b42a0faf8 100644
--- a/src/ui/widget/gimpspinscale.h
+++ b/src/widgets/gimp/gimpspinscale.h