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.
This commit is contained in:
Matthias Clasen 2004-05-10 04:49:11 +00:00 committed by Matthias Clasen
parent 5d335fe8d4
commit 48a89ec5c6
5 changed files with 28 additions and 1 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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);