Prepare GimpCursorView for a dependency to GimpDisplayShell.

* app/widgets/gimpcursorview.[ch]: Move from here...

* app/display/gimpcursorview.[ch]: ...to here.

* app/widgets/Makefile.am
* app/display/Makefile.am: Change accordingly.

* app/actions/cursor-info-actions.c
* app/dialogs/dialogs-constructors.c
* app/actions/cursor-info-commands.c
* app/display/gimpdisplayshell-cursor.c: Update includes.

svn path=/trunk/; revision=27581

ChangeLog

@@ -1,3 +1,19 @@
+2008-11-09  Martin Nordholts  <martinn@svn.gnome.org>
+
+	Prepare GimpCursorView for a dependency to GimpDisplayShell.
+
+	* app/widgets/gimpcursorview.[ch]: Move from here...
+
+	* app/display/gimpcursorview.[ch]: ...to here.
+
+	* app/widgets/Makefile.am
+	* app/display/Makefile.am: Change accordingly.
+
+	* app/actions/cursor-info-actions.c
+	* app/dialogs/dialogs-constructors.c
+	* app/actions/cursor-info-commands.c
+	* app/display/gimpdisplayshell-cursor.c: Update includes.
+
 2008-11-09  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimplayer-floating-sel.[ch]: made

app/actions/cursor-info-actions.c

@@ -25,9 +25,10 @@
 #include "actions-types.h"
 
 #include "widgets/gimpactiongroup.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimphelp-ids.h"
 
+#include "display/gimpcursorview.h"
+
 #include "cursor-info-actions.h"
 #include "cursor-info-commands.h"
 

app/actions/cursor-info-commands.c

@@ -25,10 +25,11 @@
 
 #include "actions-types.h"
 
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpwidgets-utils.h"
 
+#include "display/gimpcursorview.h"
+
 #include "cursor-info-commands.h"
 
 #include "gimp-intl.h"

app/dialogs/dialogs-constructors.c

@@ -41,7 +41,6 @@
 #include "widgets/gimpcontainergridview.h"
 #include "widgets/gimpcontainertreeview.h"
 #include "widgets/gimpcontainerview-utils.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimpdataeditor.h"
 #include "widgets/gimpdevicestatus.h"
 #include "widgets/gimpdialogfactory.h"
@@ -67,6 +66,7 @@
 #include "widgets/gimpundoeditor.h"
 #include "widgets/gimpvectorstreeview.h"
 
+#include "display/gimpcursorview.h"
 #include "display/gimpnavigationeditor.h"
 
 #include "about-dialog.h"

app/display/Makefile.am

@@ -19,6 +19,8 @@ libappdisplay_a_sources = \
 	display-types.h				\
 	gimpcanvas.c				\
 	gimpcanvas.h				\
+	gimpcursorview.c			\
+	gimpcursorview.h			\
 	gimpdisplay.c				\
 	gimpdisplay.h				\
 	gimpdisplayoptions.c			\

app/display/gimpcursorview.c

@@ -31,19 +31,20 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
-#include "widgets-types.h"
+#include "display-types.h"
 
 #include "core/gimpimage.h"
 #include "core/gimpimage-pick-color.h"
 #include "core/gimpitem.h"
 #include "core/gimpunit.h"
 
-#include "gimpcolorframe.h"
+#include "widgets/gimpcolorframe.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpeditor.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpsessioninfo-aux.h"
+
 #include "gimpcursorview.h"
-#include "gimpdocked.h"
-#include "gimpeditor.h"
-#include "gimpmenufactory.h"
-#include "gimpsessioninfo-aux.h"
 
 #include "gimp-intl.h"
 

app/display/gimpdisplayshell-cursor.c

@@ -29,11 +29,11 @@
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcursor.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpsessioninfo.h"
 
 #include "gimpdisplay.h"
+#include "gimpcursorview.h"
 #include "gimpdisplayshell.h"
 #include "gimpdisplayshell-cursor.h"
 #include "gimpdisplayshell-transform.h"

app/widgets/Makefile.am

@@ -101,8 +101,6 @@ libappwidgets_a_sources = \
 	gimpcontrollerwheel.h		\
 	gimpcursor.c			\
 	gimpcursor.h			\
-	gimpcursorview.c		\
-	gimpcursorview.h		\
 	gimpcurveview.c			\
 	gimpcurveview.h			\
 	gimpdasheditor.c		\