projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re enable the connect_help function
[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..52e7a037c22a83b259645c01c1fe96719fea2bed 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 "helper.h"
+#include <data/format.h>
#include "missing-val-dialog.h"
#include <data/missing-values.h>
#include <data/variable.h>
#include "missing-val-dialog.h"
#include <data/missing-values.h>
#include <data/variable.h>
@@
-31,7
+32,6
@@
#include <gtk/gtk.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <string.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);
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 )
{
if ( discrete_text && strlen (g_strstrip (discrete_text)) > 0 )
{
@@
-220,12
+220,10
@@
on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
/* Creates the dialog structure from the xml */
struct missing_val_dialog *
/* Creates the dialog structure from the xml */
struct missing_val_dialog *
-missing_val_dialog_create (G
ladeXML
*xml)
+missing_val_dialog_create (G
tkBuilder
*xml)
{
struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
{
struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
- connect_help (xml);
-
dialog->window = get_widget_assert (xml, "missing_values_dialog");
gtk_window_set_transient_for
dialog->window = get_widget_assert (xml, "missing_values_dialog");
gtk_window_set_transient_for
@@
-239,7
+237,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 (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");
G_CALLBACK (on_delete), dialog);
dialog->mv[0] = get_widget_assert (xml, "mv0");
@@
-307,7
+305,7
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
union value low, high;
gchar *low_text;
gchar *high_text;
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);
low_text = value_to_text (low, *write_spec);
high_text = value_to_text (high, *write_spec);
@@
-321,7
+319,7
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
{
gchar *text;
union value value;
{
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);
text = value_to_text (value, *write_spec);
gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
g_free (text);
@@
-344,7
+342,7
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
gchar *text ;
union value value;
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);
text = value_to_text (value, *write_spec);
gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
g_free (text);