X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcomments-dialog.c;h=58cf7e7f2ab12d6621edf4acadbff00eb25c8234;hb=a232eb40325b126daabcdf28ca54da794bd6a29f;hp=68249afdcb82d39cdd6a25738287714ba14ad4ed;hpb=d46430e7458fcd65dfdf7928f52f2d06fa60127d;p=pspp

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 68249afdcb..58cf7e7f2a 100644
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012, 2013  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
@@ -22,7 +22,6 @@
 #include "psppire-data-editor.h"
 #include "executor.h"
 #include "helper.h"
-#include "psppire-var-store.h"
 #include <ui/syntax-gen.h>
 
 #include "comments-dialog.h"
@@ -75,16 +74,10 @@ wrap_line (GtkTextBuffer *buffer,
   if ( chars > DOC_LINE_LENGTH )
     {
       GtkTextIter line_fold = *iter;
-      GtkTextIter cursor;
 
       gtk_text_iter_set_line_offset (&line_fold, DOC_LINE_LENGTH);
 
       gtk_text_buffer_insert (buffer, &line_fold, "\r\n", 2);
-
-      cursor = line_fold;
-      gtk_text_iter_forward_to_line_end (&cursor);
-
-      gtk_text_buffer_place_cursor (buffer, &cursor);
     }
 
 }
@@ -97,16 +90,13 @@ comments_dialog (PsppireDataWindow *de)
   gint response ;
   struct comment_dialog cd;
 
-  GtkBuilder *xml = builder_new ("psppire.ui");
+  GtkBuilder *xml = builder_new ("comments.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
   GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
   GtkWidget *label = get_widget_assert (xml, "column-number-label");
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
 
-  PsppireVarStore *vs = NULL;
-
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
@@ -120,8 +110,7 @@ comments_dialog (PsppireDataWindow *de)
     PangoFontDescription *font_desc =
       pango_font_description_from_string ("monospace");
 
-    gtk_widget_modify_font (textview, font_desc);
-
+    gtk_widget_override_font (textview, font_desc);
 
     /* and let's just make sure that a complete line fits into the
        widget's width */
@@ -144,7 +133,7 @@ comments_dialog (PsppireDataWindow *de)
   }
 
   cd.xml = xml;
-  g_object_get (vs, "dictionary", &cd.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &cd.dict, NULL);
 
   g_signal_connect (buffer, "mark-set",
 		    G_CALLBACK (set_column_number), label);