convert labels and missing values dialogs to GtkBuilder

[pspp-builds.git] / src / ui / gui / missing-val-dialog.c

diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c
index 3a350735b99f17bf207bc0b5c7221f107a1c57af..e8027bf8982ca807759ff6f3a461171f862bbb37 100644 (file)
--- a/src/ui/gui/missing-val-dialog.c
+++ b/src/ui/gui/missing-val-dialog.c
@@ -24,6 +24,7 @@
 
 
 #include "helper.h"
+#include <data/format.h>
 #include "missing-val-dialog.h"
 #include <data/missing-values.h>
 #include <data/variable.h>
@@ -31,7 +32,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <string.h>
 
@@ -148,7 +148,7 @@ missing_val_dialog_accept (GtkWidget *w, gpointer data)
        g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->discrete)));
 
       mv_clear (&dialog->mvl);
-      mv_add_num_range (&dialog->mvl, low_val.f, high_val.f);
+      mv_add_range (&dialog->mvl, low_val.f, high_val.f);
 
       if ( discrete_text && strlen (g_strstrip (discrete_text)) > 0 )
        {
@@ -220,11 +220,11 @@ on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
 
 /* Creates the dialog structure from the xml */
 struct missing_val_dialog *
-missing_val_dialog_create (GladeXML *xml)
+missing_val_dialog_create (GtkBuilder *xml)
 {
   struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
 
-  connect_help (xml);
+  //  connect_help (xml);
 
   dialog->window = get_widget_assert (xml, "missing_values_dialog");
 
@@ -239,7 +239,7 @@ missing_val_dialog_create (GladeXML *xml)
   g_signal_connect (get_widget_assert (xml, "missing_val_ok"),
                   "clicked", G_CALLBACK (missing_val_dialog_accept), dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog->window), "delete-event",
+  g_signal_connect (dialog->window, "delete-event",
                    G_CALLBACK (on_delete), dialog);
 
   dialog->mv[0] = get_widget_assert (xml, "mv0");
@@ -307,7 +307,7 @@ missing_val_dialog_show (struct missing_val_dialog *dialog)
       union value low, high;
       gchar *low_text;
       gchar *high_text;
-      mv_peek_range (&dialog->mvl, &low.f, &high.f);
+      mv_get_range (&dialog->mvl, &low.f, &high.f);
 
       low_text = value_to_text (low, *write_spec);
       high_text = value_to_text (high, *write_spec);
@@ -321,7 +321,7 @@ missing_val_dialog_show (struct missing_val_dialog *dialog)
        {
          gchar *text;
          union value value;
-         mv_peek_value (&dialog->mvl, &value, 0);
+         mv_get_value (&dialog->mvl, &value, 0);
          text = value_to_text (value, *write_spec);
          gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
          g_free (text);
@@ -344,7 +344,7 @@ missing_val_dialog_show (struct missing_val_dialog *dialog)
              gchar *text ;
              union value value;
 
-             mv_peek_value (&dialog->mvl, &value, i);
+             mv_get_value (&dialog->mvl, &value, i);
              text = value_to_text (value, *write_spec);
              gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
              g_free (text);