Make destruction of a torn off menu work like un-tearing off.

Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkmenu.c: Make destruction of a torn off menu work
	like un-tearing off.

diff --git a/ChangeLog b/ChangeLog
index dbff45fe77142be5b838730716a8f9d40ea0cecc..db144aedba1f647ab987200f5865397336e96b86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c: Make destruction of a torn off menu work 
+       like un-tearing off.
+
 Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dbff45fe77142be5b838730716a8f9d40ea0cecc..db144aedba1f647ab987200f5865397336e96b86 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c: Make destruction of a torn off menu work 
+       like un-tearing off.
+
 Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dbff45fe77142be5b838730716a8f9d40ea0cecc..db144aedba1f647ab987200f5865397336e96b86 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c: Make destruction of a torn off menu work 
+       like un-tearing off.
+
 Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dbff45fe77142be5b838730716a8f9d40ea0cecc..db144aedba1f647ab987200f5865397336e96b86 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon May 10 00:48:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c: Make destruction of a torn off menu work 
+       like un-tearing off.
+
 Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 8b456bd05f10e94b9c06f57b18f52375f3c22893..0856a8c0e0348fa08642ca9d8b46701e9210ec70 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1759,6 +1759,13 @@ gtk_menu_get_toplevel (GtkWidget *menu)
   return NULL;
 }
 
+static void
+gtk_tearoff_window_destroyed (GtkWidget *widget,
+                             GtkMenu   *menu)
+{
+  gtk_menu_set_tearoff_state (menu, FALSE);
+}
+
 void       
 gtk_menu_set_tearoff_state (GtkMenu  *menu,
                            gboolean  torn_off)
@@ -1792,7 +1799,7 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
                                        GDK_WINDOW_TYPE_HINT_MENU);
              gtk_window_set_mnemonic_modifier (GTK_WINDOW (menu->tearoff_window), 0);
              g_signal_connect (menu->tearoff_window, "destroy",
-                               G_CALLBACK (gtk_widget_destroyed), &menu->tearoff_window);
+                               G_CALLBACK (gtk_tearoff_window_destroyed), menu);
              g_signal_connect (menu->tearoff_window, "event",
                                G_CALLBACK (gtk_menu_window_event), menu);