Replaced implementation of psppire-axis.

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

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 033652025a870812214b84dcf630702cb04942a2..615dd6520f4e17fce5b215bf89ed07266e49ebc2 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 #include "psppire-var-sheet.h"
+#include <gtksheet/psppire-axis-impl.h>
 
 #include <glade/glade.h>
 #include "helper.h"
@@ -253,7 +254,7 @@ traverse_cell_callback (GtkSheet *sheet,
 
   if ( existing_cell->row == n_vars && new_cell->row >= n_vars)
     {
-      GtkEntry *entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
+      GtkEntry *entry = gtk_sheet_get_entry (sheet);
 
       const gchar *name = gtk_entry_get_text (entry);
 
@@ -318,12 +319,12 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
     {
     case PSPPIRE_VAR_STORE_COL_ALIGN:
       {
+       GtkEntry *entry;
        static GtkListStore *list_store = NULL;
        GtkComboBoxEntry *cbe;
        gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       cbe =
-         GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
+       entry = gtk_sheet_get_entry (sheet);
+       cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
 
        if ( ! list_store) list_store = create_label_list (alignments);
 
@@ -339,12 +340,11 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 
     case PSPPIRE_VAR_STORE_COL_MEASURE:
       {
+       GtkEntry *entry;
        GtkComboBoxEntry *cbe;
        gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       cbe =
-         GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
-
+       entry = gtk_sheet_get_entry (sheet);
+       cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
 
        gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
                                GTK_TREE_MODEL (vs_class->measure_list));
@@ -483,12 +483,9 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 }
 
 
-
-
 static void
 psppire_var_sheet_init (PsppireVarSheet *vs)
 {
-  // gint i;
   GladeXML *xml = XML_NEW ("data-editor.glade");
 
   vs->val_labs_dialog = val_labs_dialog_create (xml);
@@ -500,14 +497,6 @@ psppire_var_sheet_init (PsppireVarSheet *vs)
   vs->dispose_has_run = FALSE;
   vs->may_create_vars = TRUE;
 
-#if 0
-  for (i = 0 ; i < PSPPIRE_VAR_STORE_n_COLS ; ++i )
-    {
-      g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
-                                      column_def[i].width);
-    }
-#endif
-
   g_signal_connect (vs, "activate",
                    G_CALLBACK (var_sheet_change_active_cell),
                    NULL);
@@ -534,14 +523,24 @@ GtkWidget*
 psppire_var_sheet_new (void)
 {
   gint i;
-  PsppireAxis *a = psppire_axis_new ();
+  PsppireAxisImpl *ha = psppire_axis_impl_new ();
+  PsppireAxisImpl *va = psppire_axis_impl_new ();
+
   GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
 
   for (i = 0 ; i < 10 ; ++i)
-    psppire_axis_append (a, column_def[i].width);
+    psppire_axis_impl_append (ha, column_def[i].width);
+
+  g_object_set (va,
+               "default-size", 25,
+               NULL);
+
+  g_object_set (ha, "minimum-extent", 0,
+               NULL);
 
   g_object_set (w,
-               "horizontal-axis", a,
+               "horizontal-axis", ha,
+               "vertical-axis", va,
                NULL);
 
   return w;