X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.h;h=d8624ca8ea34c00032ca967be38fd7927485f569;hb=6e80abcaeb7c361477eff4b8a578e54f1def81c4;hp=7b62be2069ada9147065c49ce8832ae70a9c4b09;hpb=f633dff560960ab2c7d25108ec591d4db7a612a3;p=pspp

diff --git a/src/ui/gui/psppire-output-window.h b/src/ui/gui/psppire-output-window.h
index 7b62be2069..d8624ca8ea 100644
--- a/src/ui/gui/psppire-output-window.h
+++ b/src/ui/gui/psppire-output-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,13 +21,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
-#include "psppire-window.h"
 #include <gtk/gtk.h>
-
-extern int viewer_length;
-extern int viewer_width ;
+#include "psppire-window.h"
+#include "libpspp/string-map.h"
 
 
 G_BEGIN_DECLS
@@ -51,8 +47,10 @@ struct _PsppireOutputWindow
   PsppireWindow parent;
 
   /* <private> */
-  GtkLayout *output;
-  int y;
+  struct psppire_output_driver *driver;
+  struct psppire_output_view *view;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireOutputWindowClass