[Pspp-cvs] pspp/src/ui/gui ChangeLog var-type-dialog.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/01/27 00:56:29

Modified files:
        src/ui/gui     : ChangeLog var-type-dialog.c 

Log message:
        Fixed bug closing variable type dialog

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-type-dialog.c?cvsroot=pspp&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ChangeLog   26 Jan 2007 07:35:04 -0000      1.39
+++ ChangeLog   27 Jan 2007 00:56:29 -0000      1.40
@@ -1,3 +1,8 @@
+Sat Jan 27 09:48:21 WST 2007 John Darrington <address@hidden>
+
+       * var-type-dialog.c: Fixed bugs closing window, apparent when compiled
+       against gtk.2.10
+
 Fri Jan 26 15:51:34 WST 2007 John Darrington <address@hidden>
 
        * psppire-var-select.c psppire-var-select.h : Deleted.

Index: var-type-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-type-dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- var-type-dialog.c   24 Dec 2006 23:08:25 -0000      1.14
+++ var-type-dialog.c   27 Jan 2007 00:56:29 -0000      1.15
@@ -207,8 +207,8 @@
 
 
 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 +334,10 @@
 
   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 +546,17 @@
                   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 +842,12 @@
 
 
 
-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;
 }