From aad8fbad3e7ae9f506df09b275b7af5f67f6236c Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Wed, 23 Sep 2009 12:32:36 +0200
Subject: [PATCH] Derive GimpDisplayShell from GimpImageWindow

This is just a refactoring step, later the image window will have one
or many display shells.
---
 app/display/gimpdisplayshell.c | 3 ++-
 app/display/gimpdisplayshell.h | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 37435a11ca..c96ac66a12 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -144,7 +144,8 @@ static const guint8 * gimp_display_shell_get_icc_profile
                                                     gsize            *len);
 
 
-G_DEFINE_TYPE_WITH_CODE (GimpDisplayShell, gimp_display_shell, GIMP_TYPE_WINDOW,
+G_DEFINE_TYPE_WITH_CODE (GimpDisplayShell, gimp_display_shell,
+                         GIMP_TYPE_IMAGE_WINDOW,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
                                                 gimp_display_shell_progress_iface_init)
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
index 47788ff23e..ea790768d4 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -19,7 +19,7 @@
 #define __GIMP_DISPLAY_SHELL_H__
 
 
-#include "widgets/gimpwindow.h"
+#include "gimpimagewindow.h"
 
 
 /* Apply to a float the same rounding mode used in the renderer */
@@ -60,7 +60,7 @@ typedef struct _GimpDisplayShellClass  GimpDisplayShellClass;
 
 struct _GimpDisplayShell
 {
-  GimpWindow         parent_instance;
+  GimpImageWindow    parent_instance;
 
   /* --- cacheline 2 boundary (128 bytes) was 20 bytes ago --- */
 
@@ -217,7 +217,7 @@ struct _GimpDisplayShell
 
 struct _GimpDisplayShellClass
 {
-  GimpWindowClass    parent_class;
+  GimpImageWindowClass  parent_class;
 
   void (* scaled)    (GimpDisplayShell *shell);
   void (* scrolled)  (GimpDisplayShell *shell);