ensure that the relevant quarks are initialized before linking cocoa & gtk menu items and menus

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6529 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-01-21 16:39:23 +00:00
parent 4903ca5b60
commit 52204ca987

View file

@ -655,6 +655,10 @@ cocoa_menu_connect (GtkWidget *menu,
NSMenu* cocoa_menu)
{
[cocoa_menu retain];
if (cocoa_menu_quark == 0)
cocoa_menu_quark = g_quark_from_static_string ("NSMenu");
g_object_set_qdata_full (G_OBJECT (menu), cocoa_menu_quark,
cocoa_menu,
(GDestroyNotify) cocoa_menu_free);
@ -984,6 +988,9 @@ cocoa_menu_item_connect (GtkWidget* menu_item,
[cocoa_item retain];
if (cocoa_menu_item_quark == 0)
cocoa_menu_item_quark = g_quark_from_static_string ("NSMenuItem");
g_object_set_qdata_full (G_OBJECT (menu_item), cocoa_menu_item_quark,
cocoa_item,
(GDestroyNotify) cocoa_menu_item_free);