Reworked settings so as to use one large struct instead of lots of static

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 6910ddd1f403e46cae869b93cc08d12af2f9e36c..07557fed5136d3c1230b1ae6e1ab3a6b306d7908 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 
+#include <locale.h>
 #include <assert.h>
 #include <libintl.h>
 #include <gsl/gsl_errno.h>
@@ -87,7 +88,6 @@ initialize (void)
   glade_init ();
 
   gsl_set_error_handler_off ();
-  fmt_init ();
   fn_init ();
   outp_init ();
   settings_init (&viewer_width, &viewer_length);
@@ -194,12 +194,20 @@ create_icon_factory (void)
     /* Create our own "pspp-stock-reset" item, using the
        GTK_STOCK_REFRESH icon set */
 
-    GtkStockItem item = {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE};
-    GtkIconSet *icon_set =
-      gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH);
+    GtkStockItem items[] = {
+      {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+      {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
+    };
 
-    gtk_stock_add (&item, 1);
-    gtk_icon_factory_add (factory, "pspp-stock-reset", icon_set);
+
+    gtk_stock_add (items, 2);
+    gtk_icon_factory_add (factory, "pspp-stock-reset", 
+                         gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
+                         );
+
+    gtk_icon_factory_add (factory, "pspp-stock-select", 
+                         gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
+                         );
   }
 
   gtk_icon_factory_add_default (factory);