From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 16 Jul 2012 19:10:40 +0000 (+0200)
Subject: PsppireWindow and PsppireDialog: Use correct the parent structures.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8badabe2e12d4baac8f28e856771bac4f9342945;p=pspp

PsppireWindow and PsppireDialog: Use correct the parent structures.

This change makes the structure declarations agree with the class definition.
---

diff --git a/src/ui/gui/psppire-dialog.h b/src/ui/gui/psppire-dialog.h
index ae1f41d92b..b3f98e6f74 100644
--- a/src/ui/gui/psppire-dialog.h
+++ b/src/ui/gui/psppire-dialog.h
@@ -22,6 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include "psppire-window-base.h"
 
 
 #define PSPPIRE_RESPONSE_PASTE 1
@@ -53,7 +54,7 @@ typedef enum
 
 struct _PsppireDialog
 {
-  GtkWindow window;
+  PsppireWindowBase window;
   GtkWidget *box;
 
   /* Private */
@@ -68,7 +69,7 @@ struct _PsppireDialog
 
 struct _PsppireDialogClass
 {
-  GtkWindowClass parent_class;
+  PsppireWindowBaseClass parent_class;
 };
 
 
diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h
index b80f79d699..e7851cce77 100644
--- a/src/ui/gui/psppire-window.h
+++ b/src/ui/gui/psppire-window.h
@@ -22,6 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include "psppire-window-base.h"
 
 G_BEGIN_DECLS
 
@@ -57,7 +58,7 @@ typedef struct _PsppireWindowIface  PsppireWindowIface;
 
 struct _PsppireWindow
 {
-  GtkWindow parent;
+  PsppireWindowBase parent;
 
   /* <private> */
   gchar *filename;             /* File name, in file name encoding, or NULL. */
@@ -79,7 +80,7 @@ struct _PsppireWindow
 
 struct _PsppireWindowClass
 {
-  GtkWindowClass parent_class;
+  PsppireWindowBaseClass parent_class;
 };