AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 05:20:17 +00:00
Code Issues Projects Releases Wiki Activity

Menufactory now refs&sinks its children.

Browse Source 
--sg
This commit is contained in:
scott 1998-02-05 04:10:43 +00:00
parent 9258a7aecb
commit d3c3333735
8 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Wed Feb 4 23:05:28 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* gtk/gtkmenufactory.c: menufactories now ref&sink the menus they
create
Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org> Thu Feb 5 02:13:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.h: * gtk/gtklist.h:

18
gtk/gtkmenufactory.c
View File

@ -88,6 +88,9 @@ gtk_menu_factory_destroy (GtkMenuFactory *factory)
if (factory->table) if (factory->table)
gtk_accelerator_table_unref (factory->table); gtk_accelerator_table_unref (factory->table);
if (factory->widget)
gtk_widget_unref (factory->widget);
} }
void void
@ -102,7 +105,11 @@ gtk_menu_factory_add_entries (GtkMenuFactory *factory,
g_return_if_fail (nentries > 0); g_return_if_fail (nentries > 0);
if (!factory->widget) if (!factory->widget)
factory->widget = gtk_menu_factory_make_widget (factory); {
factory->widget = gtk_menu_factory_make_widget (factory);
gtk_widget_ref (factory->widget);
gtk_object_sink (GTK_OBJECT (factory->widget));
}
for (i = 0; i < nentries; i++) for (i = 0; i < nentries; i++)
gtk_menu_factory_create (factory, &entries[i], factory->widget, entries[i].path); gtk_menu_factory_create (factory, &entries[i], factory->widget, entries[i].path);
@ -272,8 +279,13 @@ gtk_menu_factory_create (GtkMenuFactory *factory,
if (subfactory->path && if (subfactory->path &&
(strcmp (subfactory->path, tmp_path) == 0)) (strcmp (subfactory->path, tmp_path) == 0))
{ {
if (!subfactory->widget) if (!subfactory->widget)
subfactory->widget = gtk_menu_factory_make_widget (subfactory); {
subfactory->widget = gtk_menu_factory_make_widget (subfactory);
gtk_widget_ref (subfactory->widget);
gtk_object_sink (GTK_OBJECT (subfactory->widget));
}
gtk_menu_factory_create (subfactory, entry, subfactory->widget, p + 1); gtk_menu_factory_create (subfactory, entry, subfactory->widget, p + 1);
return; return;
} }