projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible memory corruption when creating dialogs with selectors.
[pspp]
/
src
/
ui
/
gui
/
psppire-output-window.h
diff --git
a/src/ui/gui/psppire-output-window.h
b/src/ui/gui/psppire-output-window.h
index 95deed93fec542dbd9bb8ee891fb4c2a289f6260..4fc019991c8cdb264b764620f20918d1aa060e74 100644
(file)
--- 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009 Free Software Foundation
+ Copyright (C) 2008, 2009
, 2010, 2011
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
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,14
+21,10
@@
#include <glib.h>
#include <glib-object.h>
#include <glib.h>
#include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
#include "psppire-window.h"
#include "psppire.h"
#include "psppire-window.h"
#include "psppire.h"
-#include <gtk/gtk.h>
-
-extern int viewer_length;
-extern int viewer_width ;
+#include "libpspp/string-map.h"
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-57,12
+53,20
@@
struct _PsppireOutputWindow
int max_width;
int y;
int max_width;
int y;
+ struct string_map render_opts;
GtkTreeView *overview;
GtkTreeIter cur_command;
bool in_command;
struct output_item **items;
size_t n_items, allocated_items;
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 _PsppireOutputWindowClass
};
struct _PsppireOutputWindowClass