Fixed bug in internationalization.

[pspp-builds.git] / src / ui / gui / var-type-dialog.c

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index d3eb97edf0515195a63418c9730eb1c53353f7ce..bd4571283c271512638daed7575e786a885e8a37 100644 (file)
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -46,7 +46,7 @@ struct tgs
 
 
 struct format_opt {
-  gchar desc[18];
+  gchar desc[21];
   struct fmt_spec spec;
 };
 
@@ -69,7 +69,8 @@ static const struct format_opt format_option[] =
     { "mmm yy",      {FMT_MOYR, 6, 0} },
     { "dd WK yyyy",  {FMT_WKYR, 10, 0} },
     { "dd WK yy",    {FMT_WKYR, 8, 0} },
-    { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}}
+    { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}},
+    { "dd-mmm-yyyy HH:MM:SS", {FMT_DATETIME, 20, 0}}
   };
 
 
@@ -207,8 +208,8 @@ on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data)
 
 
 static gint on_var_type_ok_clicked (GtkWidget *w, gpointer data);
+static gint hide_dialog (GtkWidget *w,  gpointer data);
 
-#define LEN 20
 
 static void
 add_to_group (GtkWidget *w, gpointer data)
@@ -334,6 +335,10 @@ var_type_dialog_create (GladeXML *xml)
 
   dialog->window = get_widget_assert (xml,"var_type_dialog");
 
+
+  g_signal_connect (dialog->window, "delete-event",
+                   G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
   gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
                               GTK_WINDOW (get_widget_assert (xml, "data_editor")));
 
@@ -542,11 +547,17 @@ var_type_dialog_create (GladeXML *xml)
                   GTK_SIGNAL_FUNC (preview_custom), dialog);
 
 
-  /* Connect the OK button */
+  /* Connect to the OK button */
   g_signal_connect (dialog->ok, "clicked", G_CALLBACK (on_var_type_ok_clicked),
                   dialog);
 
 
+  /* And the cancel button */
+  g_signal_connect (get_widget_assert (xml, "var_type_cancel") , "clicked",
+                   G_CALLBACK (hide_dialog),
+                   dialog);
+
+
   }
 
   return dialog;
@@ -832,10 +843,12 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data)
 
 
 
-gint
-on_var_type_cancel_clicked (GtkWidget *w,  gpointer data)
+static gint
+hide_dialog (GtkWidget *w,  gpointer data)
 {
-  gtk_widget_hide (w);
+  struct var_type_dialog *dialog = data;
+
+  gtk_widget_hide (dialog->window);
 
   return FALSE;
 }