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=86454c8ab63804d02cb4f08e8b5e45299b8eb810;hp=54447b1d5b417f22397632988435ae37f1e714bc;hpb=ae1e48a9727327898aaf9662f53a9a1ec115ab11;p=pspp

diff --git a/src/ui/gui/psppire-output-window.h b/src/ui/gui/psppire-output-window.h
index 54447b1d5b..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, 2010, 2011  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
@@ -23,10 +23,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include "psppire-window.h"
-#include "psppire.h"
-
-extern int viewer_length;
-extern int viewer_width ;
+#include "libpspp/string-map.h"
 
 
 G_BEGIN_DECLS
@@ -51,23 +48,9 @@ struct _PsppireOutputWindow
 
   /* <private> */
   struct psppire_output_driver *driver;
-  GtkLayout *output;
-  int max_width;
-  int y;
-
-  GtkTreeView *overview;
-  GtkTreeIter cur_command;
-  bool in_command;
-
-  struct output_item **items;
-  size_t n_items, allocated_items;
-
-  /* Variables pertaining to printing */
-  GtkPrintSettings *print_settings;
-  struct xr_driver *print_xrd;
-  int print_item;
-  int print_n_pages;
-  gboolean paginated;
+  struct psppire_output_view *view;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireOutputWindowClass