Commit 0a68527e authored by Michael Natterer's avatar Michael Natterer 😴

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

parent 325bce54
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -51,7 +51,6 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpwindowstrategy.h"
#include "dialogs/file-save-dialog.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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"
......
......@@ -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"
......
......@@ -402,6 +402,8 @@ libappwidgets_a_sources = \
gimpwidgets-utils.h \
gimpwindow.c \
gimpwindow.h \
gimpwindowstrategy.c \
gimpwindowstrategy.h \
gtkwrapbox.c \
gtkwrapbox.h \
gtkhwrapbox.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;
}
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment