app: move the GimpWindowStrategy interface from display/ to widgets/

app/actions/data-commands.c

@@ -39,8 +39,7 @@
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpmessagebox.h"
 #include "widgets/gimpmessagedialog.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "dialogs/data-delete-dialog.h"
 

app/actions/dialogs-commands.c

@@ -26,8 +26,7 @@
 #include "core/gimp.h"
 
 #include "widgets/gimpdialogfactory.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "actions.h"
 #include "dialogs-commands.h"

app/actions/edit-commands.c

@@ -44,11 +44,11 @@
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpmessagebox.h"
 #include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
 #include "display/gimpdisplayshell-transform.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/fade-dialog.h"
 

app/actions/file-commands.c

@@ -51,7 +51,6 @@
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplay-foreach.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/file-save-dialog.h"
 

app/actions/select-commands.c

@@ -33,10 +33,10 @@
 
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/stroke-dialog.h"
 

app/actions/tool-options-commands.c

@@ -41,8 +41,7 @@
 #include "widgets/gimpmessagedialog.h"
 #include "widgets/gimptooloptionseditor.h"
 #include "widgets/gimpuimanager.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "dialogs/data-delete-dialog.h"
 

app/actions/view-commands.c

@@ -39,6 +39,7 @@
 #include "widgets/gimpdock.h"
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpuimanager.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplay-foreach.h"
@@ -49,7 +50,6 @@
 #include "display/gimpdisplayshell-scale-dialog.h"
 #include "display/gimpdisplayshell-scroll.h"
 #include "display/gimpimagewindow.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "actions.h"
 #include "view-commands.h"

app/display/Makefile.am

@@ -144,9 +144,7 @@ libappdisplay_a_sources = \
 	gimpstatusbar.c				\
 	gimpstatusbar.h				\
 	gimptooldialog.c			\
-	gimptooldialog.h			\
-	gimpwindowstrategy.c			\
-	gimpwindowstrategy.h
+	gimptooldialog.h
 
 libappdisplay_a_built_sources = display-enums.c
 

app/display/display-types.h

@@ -35,7 +35,6 @@ typedef struct _GimpMotionBuffer         GimpMotionBuffer;
 typedef struct _GimpImageWindow          GimpImageWindow;
 typedef struct _GimpMultiWindowStrategy  GimpMultiWindowStrategy;
 typedef struct _GimpSingleWindowStrategy GimpSingleWindowStrategy;
-typedef struct _GimpWindowStrategy       GimpWindowStrategy;
 
 typedef struct _GimpCursorView           GimpCursorView;
 typedef struct _GimpNavigationEditor     GimpNavigationEditor;

app/display/gimpmultiwindowstrategy.c

@@ -28,9 +28,9 @@
 #include "core/gimp.h"
 
 #include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "gimpmultiwindowstrategy.h"
-#include "gimpwindowstrategy.h"
 
 
 static void        gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);

app/display/gimpsinglewindowstrategy.c

@@ -33,11 +33,10 @@
 #include "widgets/gimpdock.h"
 #include "widgets/gimpdockbook.h"
 #include "widgets/gimpdockcolumns.h"
+#include "widgets/gimpwindowstrategy.h"
 
-#include "display/gimpimagewindow.h"
-
+#include "gimpimagewindow.h"
 #include "gimpsinglewindowstrategy.h"
-#include "gimpwindowstrategy.h"
 
 
 static void        gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);

app/gui/gui-message.c

@@ -40,8 +40,7 @@
 #include "widgets/gimpprogressdialog.h"
 #include "widgets/gimpsessioninfo.h"
 #include "widgets/gimpwidgets-utils.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "gui-message.h"
 

app/tools/gimpcolortool.c

@@ -42,6 +42,7 @@
 #include "widgets/gimpdockable.h"
 #include "widgets/gimppaletteeditor.h"
 #include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpcanvasitem.h"
 #include "display/gimpdisplay.h"
@@ -49,7 +50,6 @@
 #include "display/gimpdisplayshell-appearance.h"
 #include "display/gimpdisplayshell-selection.h"
 #include "display/gimpdisplayshell-transform.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "gimpcoloroptions.h"
 #include "gimpcolortool.h"

app/widgets/Makefile.am

@@ -402,6 +402,8 @@ libappwidgets_a_sources = \
 	gimpwidgets-utils.h		\
 	gimpwindow.c			\
 	gimpwindow.h			\
+	gimpwindowstrategy.c		\
+	gimpwindowstrategy.h		\
 	gtkwrapbox.c			\
 	gtkwrapbox.h			\
 	gtkhwrapbox.c			\

app/widgets/gimpwindowstrategy.c

@@ -22,12 +22,12 @@
 
 #include <gtk/gtk.h>
 
-#include "display-types.h"
+#include "widgets-types.h"
 
 #include "gimpwindowstrategy.h"
 
 
-static void   gimp_window_strategy_iface_base_init   (GimpWindowStrategyInterface *strategy_iface);
+static void   gimp_window_strategy_iface_base_init (GimpWindowStrategyInterface *strategy_iface);
 
 
 GType
@@ -88,4 +88,3 @@ gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
 
   return NULL;
 }
-

app/widgets/widgets-types.h

@@ -235,6 +235,7 @@ typedef struct _GimpCellRendererViewable     GimpCellRendererViewable;
 typedef struct _GimpDialogFactory            GimpDialogFactory;
 typedef struct _GimpTextBuffer               GimpTextBuffer;
 typedef struct _GimpUIConfigurer             GimpUIConfigurer;
+typedef struct _GimpWindowStrategy           GimpWindowStrategy;
 
 
 /*  session management objects and structs  */