psppire-var-sheet: Add icons to combo boxes for alignment and measurement.

[pspp] / src / ui / gui / psppire-syntax-window.c

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 1ad906a18212c904e0ca72e867325736df699d3e..854ff700bd0dd81692c3dc4ffbd7657c78a286a7 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-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
@@ -31,6 +31,7 @@
 #include "ui/gui/executor.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-lex-reader.h"
@@ -375,7 +376,6 @@ contents_received_callback (GtkClipboard *clipboard,
                            GtkSelectionData *sd,
                            gpointer data)
 {
-  gchar *c;
   PsppireSyntaxWindow *syntax_window = data;
 
   if ( sd->length < 0 )
@@ -384,8 +384,6 @@ contents_received_callback (GtkClipboard *clipboard,
   if ( sd->type != gdk_atom_intern ("UTF8_STRING", FALSE))
     return;
 
-  c = (gchar *) sd->data;
-
   gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer),
                                    (gchar *) sd->data,
                                    sd->length);
@@ -671,7 +669,7 @@ load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
   gboolean ok;
 
   gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
-  ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+  ok = psppire_window_load (PSPPIRE_WINDOW (se), filename, NULL);
   gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
 
   if (ok )
@@ -946,7 +944,7 @@ error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
   Loads the buffer from the file called FILENAME
 */
 gboolean
-syntax_load (PsppireWindow *window, const gchar *filename)
+syntax_load (PsppireWindow *window, const gchar *filename, gpointer not_used)
 {
   GError *err = NULL;
   gchar *text_locale = NULL;