#include <config.h>
#include "psppire-var-sheet.h"
+#include <gtksheet/psppire-axis-hetero.h>
#include <glade/glade.h>
#include "helper.h"
-#include <gtksheet/gsheet-hetero-column.h>
+
#include "customentry.h"
#include <data/variable.h>
#include "psppire-var-store.h"
gint width ;
};
-static const struct column_parameters column_def[] = {
- { N_("Name"), 80},
- { N_("Type"), 100},
- { N_("Width"), 57},
- { N_("Decimals"),91},
- { N_("Label"), 95},
- { N_("Values"), 103},
- { N_("Missing"), 95},
- { N_("Columns"), 80},
- { N_("Align"), 69},
- { N_("Measure"), 99},
-};
-
-
#define n_ALIGNMENTS 3
const gchar *const alignments[n_ALIGNMENTS + 1]={
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);
{
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);
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));
}
-
-
static void
psppire_var_sheet_init (PsppireVarSheet *vs)
{
- gint i;
- GObject *geo = g_sheet_hetero_column_new (75, PSPPIRE_VAR_STORE_n_COLS);
GladeXML *xml = XML_NEW ("data-editor.glade");
vs->val_labs_dialog = val_labs_dialog_create (xml);
vs->dispose_has_run = FALSE;
vs->may_create_vars = TRUE;
- for (i = 0 ; i < PSPPIRE_VAR_STORE_n_COLS ; ++i )
- {
- g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
- gettext (column_def[i].label));
-
- g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
- column_def[i].width);
- }
-
- g_object_set (vs, "column-geometry", geo, NULL);
-
g_signal_connect (vs, "activate",
G_CALLBACK (var_sheet_change_active_cell),
NULL);
}
+static const struct column_parameters column_def[] = {
+ { N_("Name"), 80},
+ { N_("Type"), 100},
+ { N_("Width"), 57},
+ { N_("Decimals"),91},
+ { N_("Label"), 95},
+ { N_("Values"), 103},
+ { N_("Missing"), 95},
+ { N_("Columns"), 80},
+ { N_("Align"), 69},
+ { N_("Measure"), 99},
+};
+
GtkWidget*
psppire_var_sheet_new (void)
{
- return GTK_WIDGET (g_object_new (psppire_var_sheet_get_type (), NULL));
+ gint i;
+ PsppireAxisHetero *ha = psppire_axis_hetero_new ();
+ PsppireAxisHetero *va = psppire_axis_hetero_new ();
+
+ GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
+
+ for (i = 0 ; i < 10 ; ++i)
+ psppire_axis_hetero_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", ha,
+ "vertical-axis", va,
+ NULL);
+
+ return w;
}