Mercurial > audlegacy
diff src/audacious/ui_manager.c @ 3418:c27b1b544026 trunk
macos: carbon menubar, try 1
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Sun, 02 Sep 2007 22:40:32 -0500 |
parents | e451f5027d00 |
children | 47d6fb3884fb |
line wrap: on
line diff
--- a/src/audacious/ui_manager.c Sun Sep 02 22:32:57 2007 -0500 +++ b/src/audacious/ui_manager.c Sun Sep 02 22:40:32 2007 -0500 @@ -375,6 +375,10 @@ { "dummy", NULL, "dummy" }, + /* XXX Carbon support */ + { "file", NULL, N_("File") }, + { "help", NULL, N_("Help") }, + { "plugins-menu", NULL, N_("Plugin Services") }, { "current track info", AUD_STOCK_INFO , N_("View Track Details"), "I", @@ -625,6 +629,9 @@ return; } +#ifdef GDK_WINDOWING_QUARTZ +static GtkWidget *carbon_menubar; +#endif static void ui_manager_create_menus_init_pmenu( gchar * path ) @@ -667,6 +674,19 @@ /* initialize plugins-menu for mainwin-menus */ ui_manager_create_menus_init_pmenu( "/mainwin-menus/main-menu/plugins-menu" ); +#ifdef GDK_WINDOWING_QUARTZ + gtk_ui_manager_add_ui_from_file( ui_manager , DATA_DIR "/ui/carbon-menubar.ui" , &gerr ); + + if ( gerr != NULL ) + { + g_critical( "Error creating UI<ui/carbon-menubar.ui>: %s" , gerr->message ); + g_error_free( gerr ); + return; + } + + carbon_menubar = ui_manager_get_popup_menu( ui_manager , "/carbon-menubar/main-menu" ); +#endif + gtk_ui_manager_add_ui_from_file( ui_manager , DATA_DIR "/ui/playlist.ui" , &gerr ); if ( gerr != NULL )