#include "psppire-var-sheet.h"
#include <ui/gui/sheet/psppire-axis-impl.h>
-#include <glade/glade.h>
#include "helper.h"
#include "customentry.h"
gint i = 0;
GtkTreeIter iter;
- GtkListStore *list_store;
- list_store = gtk_list_store_new (1, G_TYPE_STRING);
-
+ GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING);
while ( (s = labels[i++]))
{
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (G_OBJECT (cbe),"changed",
+ g_signal_connect (cbe, "changed",
G_CALLBACK (change_alignment), var);
}
break;
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (G_OBJECT (cbe),"changed",
+ g_signal_connect (cbe, "changed",
G_CALLBACK (change_measure), var);
}
break;
static void
psppire_var_sheet_init (PsppireVarSheet *vs)
{
- GladeXML *xml = XML_NEW ("data-editor.glade");
+ GtkBuilder *builder = builder_new ("data-editor.ui");
+
+ vs->val_labs_dialog = val_labs_dialog_create (builder);
+ vs->missing_val_dialog = missing_val_dialog_create (builder);
+ vs->var_type_dialog = var_type_dialog_create (builder);
- vs->val_labs_dialog = val_labs_dialog_create (xml);
- vs->missing_val_dialog = missing_val_dialog_create (xml);
- vs->var_type_dialog = var_type_dialog_create (xml);
+ connect_help (builder);
- g_object_unref (xml);
+ g_object_unref (builder);
vs->dispose_has_run = FALSE;
vs->may_create_vars = TRUE;