X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fdata-sheet.c;h=a2a420dc62e91f3fb3064e8e830ca631fbfe60b5;hb=75aeeafa67aa460512683311566a83917d399c70;hp=bff1af9706765d8853275642cfd8d54c17b357a1;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git

diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index bff1af97..a2a420dc 100644
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -40,8 +40,6 @@
 #include "menu-actions.h"
 #include "data-sheet.h"
 
-#define _(A) A
-#define N_(A) A
 
 
 extern GladeXML *xml;
@@ -70,9 +68,10 @@ static gboolean
 click2column(GtkWidget *w, gint col, gpointer data)
 {
   gint current_row, current_column;
-  select_sheet(PAGE_VAR_SHEET);
   GtkWidget *var_sheet  = get_widget_assert(xml, "variable_sheet");
 
+  select_sheet(PAGE_VAR_SHEET);
+
   gtk_sheet_get_active_cell(GTK_SHEET(var_sheet), 
 			    &current_row, &current_column);
 
@@ -83,29 +82,38 @@ click2column(GtkWidget *w, gint col, gpointer data)
 
 
 /* Update the data_ref_entry with the reference of the active cell */
-static gint 
-update_data_ref_entry(GtkSheet *sheet, gint row, gint col)
+gint 
+update_data_ref_entry(const GtkSheet *sheet, gint row, gint col)
 {
+
   /* The entry where the reference to the current cell is displayed */
   GtkEntry *cell_ref_entry;
 
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet));
+  if (data_store)
+    {
+      const struct PsppireVariable *pv = 
+	psppire_dict_get_variable(data_store->dict, col);
 
+      gchar *text ;
+      gchar *s ;
 
-  if ( !xml) 
-    return FALSE;
-
-  const struct PsppireVariable *pv = 
-    psppire_dict_get_variable(data_store->dict, col);
+      if ( !xml) 
+	return FALSE;
 
-  gchar *text = g_strdup_printf("%d: %s", row, 
-				pv ? psppire_variable_get_name(pv) : "");
+      text = g_strdup_printf("%d: %s", row, 
+			     pv ? psppire_variable_get_name(pv) : "");
   
-  cell_ref_entry = GTK_ENTRY(get_widget_assert(xml, "cell_ref_entry"));
+      cell_ref_entry = GTK_ENTRY(get_widget_assert(xml, "cell_ref_entry"));
+
+      s = pspp_locale_to_utf8(text, -1, 0);
+
+      g_free(text);
 
-  gtk_entry_set_text(cell_ref_entry, text);
+      gtk_entry_set_text(cell_ref_entry, s);
 
-  g_free(text);
+      g_free(s);
+    }
 
   return FALSE;
 }
@@ -119,7 +127,6 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
 			   gint int1, gint int2)
 {
   GtkWidget *sheet;
-  gint i;
 
   const gint rows = 10046;
 
@@ -141,6 +148,7 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
 		    GTK_SIGNAL_FUNC (click2column),
 		    0);
 
+  gtk_sheet_set_active_cell(GTK_SHEET(sheet), -1, -1);
   gtk_widget_show(sheet);
 
   return sheet;