Replaced the function widget_scanf with a new widget psppire_scanf

[pspp-builds.git] / src / ui / gui / widget-io.c

diff --git a/src/ui/gui/widget-io.c b/src/ui/gui/widget-io.c
index 73a7301662033e366a1d8180692c131646b82aac..e04e32222d85cdc50f4052463f44191ffc8f2824 100644 (file)
--- a/src/ui/gui/widget-io.c
+++ b/src/ui/gui/widget-io.c
@@ -28,46 +28,6 @@
 
 #include "xalloc.h"
 
-/* Create a GtkLabel and pack it into BOX.
-   The label is created using part of the string at S, and the directives
-   at DIRS[DIR_IDX] and subsequent.
-
-   After this function returns, *S points to the first unused character.
-*/
-static void
-ship_label (GtkBox *box, const char **s,
-           const char_directives *dirs, size_t dir_idx)
-{
-  GtkWidget *label ;
-  GString *str = g_string_new (*s);
-
-  if ( dirs)
-    {
-      char_directive dir = dirs->dir[dir_idx];
-      int n = 0;
-
-      while (dir_idx < dirs->count && dir.conversion == '%' )
-       {
-         g_string_erase (str, dir.dir_start - *s, 1);
-         dir = dirs->dir[++dir_idx];
-         n++;
-       }
-
-      g_string_truncate (str, dir.dir_start - *s - n);
-
-      if ( dir_idx >= dirs->count)
-       *s = NULL;
-      else
-       *s = dir.dir_end;
-    }
-
-  label = gtk_label_new (str->str);
-
-  g_string_free (str, TRUE);
-
-  gtk_box_pack_start (box, label, FALSE, FALSE, 0);
-  gtk_widget_show (label);
-}
 
 /* Returns a string generated from FMT and a list of GtkEntry widgets.
    Each conversion in FMT will be replaced with the text from the
@@ -139,104 +99,3 @@ widget_printf (const gchar *fmt, ...)
   g_string_free (output, FALSE);
   return text;
 }
-
-/*
-   Returns a GtkHBox populated with an GtkLabel and GtkEntry widgets.
-   Each conversion in FMT will cause a GtkEntry (possibly a GtkSpinButton) to
-   be created.  Any text between conversions produces a GtkLabel.
-   There should be N arguments following FMT should be of type GtkEntry **,
-   where N is the number of conversions.
-   These arguments will be filled with a pointer to the corresponding widgets.
-   Their properties may be changed, but they should not be unrefed.
- */
-GtkWidget *
-widget_scanf (const gchar *fmt, ...)
-{
-  char_directives d;
-  arguments a;
-  int i;
-  va_list ap;
-  GtkWidget ***widgets = NULL;
-  GtkWidget *hbox = NULL;
-  GtkWidget **w;
-  const char *s = fmt;
-
-  if ( 0 !=  printf_parse (fmt, &d, &a) )
-    return NULL;
-
-  if (a.arg != a.direct_alloc_arg)
-    free (a.arg);
-
-  va_start (ap, fmt);
-
-  if ( d.count > 0 )
-    {
-      hbox = gtk_hbox_new (FALSE, 0);
-      widgets = calloc (sizeof (*widgets), d.count);
-    }
-
-  for (i = 0 ; i < d.count ; ++i )
-    {
-      if ( d.dir[i].conversion != '%')
-       widgets[i] = va_arg (ap, GtkWidget **);
-    }
-  va_end (ap);
-
-
-
-  for (i = 0 ; i < d.count ; ++i )
-    {
-      char_directive dir = d.dir[i];
-      int precision = 0;
-      int width = 0;
-
-
-      if ( dir.precision_start && dir.precision_end)
-       precision = strtol (dir.precision_start + 1,
-                           (char **) &dir.precision_end, 10);
-
-      if ( dir.width_start && dir.width_end )
-       width = strtol (dir.width_start, (char **) &dir.width_end, 10);
-
-      if ( dir.dir_start > s )
-       ship_label (GTK_BOX (hbox), &s, &d, i);
-
-      if ( dir.conversion == '%')
-       {
-         if (s) s++;
-         continue;
-       }
-
-      w = widgets [dir.arg_index];
-      switch (dir.conversion)
-       {
-       case 'd':
-       case 'i':
-       case 'f':
-         {
-           *w = gtk_spin_button_new_with_range (0, 100.0, 1.0);
-           g_object_set (*w, "digits", precision, NULL);
-         }
-         break;
-       case 's':
-         *w = gtk_entry_new ();
-         break;
-       };
-
-      g_object_set (*w, "width-chars", width, NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), *w, FALSE, FALSE, 0);
-      gtk_widget_show (*w);
-    }
-
-  if ( s && *s )
-    ship_label (GTK_BOX (hbox), &s, NULL, 0);
-
-
-
-  g_free (widgets);
-
-  if (d.dir != d.direct_alloc_dir)
-    free (d.dir);
-
-  return hbox;
-}