X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=29b849031b4e87ad5ad59a0d98a9da2f6482e282;hb=d46430e7458fcd65dfdf7928f52f2d06fa60127d;hp=99a11ed52d9fe84e8c84e27e43183f25535c7f8e;hpb=376bc1e2594564c432857c50f2f779093ce70710;p=pspp-builds.git diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 99a11ed5..29b84903 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -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, 2012 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 @@ -35,13 +35,15 @@ #include "output/table-item.h" #include "output/text-item.h" #include "ui/gui/help-menu.h" -#include "ui/gui/helper.h" +#include "ui/gui/builder-wrapper.h" #include "ui/gui/psppire-output-window.h" #include "gl/error.h" #include "gl/tmpdir.h" #include "gl/xalloc.h" +#include "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -180,10 +182,8 @@ expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer)); - struct text_item *text_item; PangoFontDescription *font_desc; char *font_name; - int font_width; gchar *fgc = gdk_color_to_string (&style->text[gtk_widget_get_state (GTK_WIDGET (widget))]);