Fixed bug where gui would crash when columns were resized.

[pspp-builds.git] / src / ui / gui / data-sheet.c

diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index 1edeb330f8d101abae48aebd58a22ece2f89e433..29e0309c9ea4eacff07a1dd43ae7b92f2a0fb84a 100644 (file)
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -24,24 +24,22 @@
 
 #include <ctype.h>
 
-#include "gtksheet.h"
+#include <gtksheet/gtksheet.h>
 
-#include "gsheet-uniform-row.h"
+#include <gtksheet/gsheet-uniform-row.h>
 
 #include "psppire-dict.h"
 #include "psppire-variable.h"
 #include "psppire-data-store.h"
 #include "helper.h"
 
-#include "value-labels.h"
-#include "case.h"
-#include "data-in.h"
+#include <data/value-labels.h>
+#include <data/case.h>
+#include <data/data-in.h>
 
 #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,64 +82,108 @@ 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);
 
-  gtk_entry_set_text(cell_ref_entry, text);
+      g_free(text);
 
-  g_free(text);
+      gtk_entry_set_text(cell_ref_entry, s);
+
+      g_free(s);
+    }
 
   return FALSE;
 }
 
-
 extern PsppireDataStore *data_store ;
 
 
+/* Return the width that an  'M' character would occupy when typeset in WIDGET */
+static guint 
+calc_m_width(GtkWidget *widget, const PangoFontDescription *font_desc)
+{
+  PangoRectangle rect;
+  PangoLayout *layout ;
+  PangoContext * context;
+
+  context = gtk_widget_create_pango_context (widget);
+  g_assert (context);
+  layout = pango_layout_new (context);
+  g_assert (layout);
+
+  pango_layout_set_text (layout, "M", 1);
+  
+  pango_layout_set_font_description (layout, font_desc);
+
+  pango_layout_get_extents (layout, NULL, &rect);
+
+  g_object_unref(G_OBJECT(layout));
+  g_object_unref(G_OBJECT(context));
+
+  return PANGO_PIXELS(rect.width);
+}
+
+
+
+void
+font_change_callback(GObject *obj, gpointer data)
+{
+  GtkWidget *sheet  = data;
+  PsppireDataStore *ds = PSPPIRE_DATA_STORE(obj);
+
+  ds->width_of_m = calc_m_width(sheet, ds->font_desc);
+}
+
 GtkWidget*
 psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
                           gint int1, gint int2)
 {
   GtkWidget *sheet;
-  gint i;
 
-  const gint rows = 10046;
-
-  GObject *row_geometry = g_sheet_uniform_row_new(25, rows); 
-
-  sheet = gtk_sheet_new(G_SHEET_ROW(row_geometry), 
+  sheet = gtk_sheet_new(G_SHEET_ROW(data_store), 
                        G_SHEET_COLUMN(data_store), "data sheet", 0); 
 
+  data_store->width_of_m = calc_m_width(sheet, data_store->font_desc);
 
-  g_signal_connect (GTK_OBJECT (sheet), "activate",
-                   GTK_SIGNAL_FUNC (update_data_ref_entry),
+  g_signal_connect (G_OBJECT (sheet), "activate",
+                   G_CALLBACK (update_data_ref_entry),
                    0);
 
-  g_signal_connect (GTK_OBJECT (sheet), "traverse",
-                   GTK_SIGNAL_FUNC (traverse_callback), 0);
+  g_signal_connect (G_OBJECT (sheet), "traverse",
+                   G_CALLBACK (traverse_callback), 0);
 
 
-  g_signal_connect (GTK_OBJECT (sheet), "double-click-column",
-                   GTK_SIGNAL_FUNC (click2column),
+  g_signal_connect (G_OBJECT (sheet), "double-click-column",
+                   G_CALLBACK (click2column),
                    0);
 
+  g_signal_connect (G_OBJECT (data_store), "font-changed",
+                   G_CALLBACK (font_change_callback), sheet);
+
+  gtk_sheet_set_active_cell(GTK_SHEET(sheet), -1, -1);
   gtk_widget_show(sheet);
 
   return sheet;