X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fhelp.cpp;h=b11743d69319a9af587cf71b2302ec9330e4fb7e;hp=07b51603de548afe5ea44394bc1be1376061bc9a;hb=cfc38f86f878d79656aba515838cb75cf5a371f6;hpb=33c1fb60da3357af527a46ed06995e808853b9ff

diff --git a/radiant/help.cpp b/radiant/help.cpp
index 07b51603..b11743d6 100644
--- a/radiant/help.cpp
+++ b/radiant/help.cpp
@@ -51,13 +51,13 @@ void HandleHelpCommand( CopiedString& str ){
 	OpenURL( str.c_str() );
 }
 
-void process_xlink( const char* filename, const char *menu_name, const char *base_url, GtkMenu *menu ){
+void process_xlink( const char* filename, const char *menu_name, const char *base_url, ui::Menu menu ){
 	if ( file_exists( filename ) ) {
 		xmlDocPtr pDoc = xmlParseFile( filename );
 		if ( pDoc ) {
 			globalOutputStream() << "Processing .xlink file '" << filename << "'\n";
 			// create sub menu
-			GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic( menu, menu_name );
+			auto menu_in_menu = create_sub_menu_with_mnemonic( menu, menu_name );
 			if ( g_Layout_enableDetachableMenus.m_value ) {
 				menu_tearoff( menu_in_menu );
 			}
@@ -94,7 +94,7 @@ void process_xlink( const char* filename, const char *menu_name, const char *bas
 
 						prop = xmlGetProp( pNode, reinterpret_cast<const xmlChar*>( "name" ) );
 						ASSERT_NOTNULL( prop );
-						create_menu_item_with_mnemonic( menu_in_menu, reinterpret_cast<const char*>( prop ), ReferenceCaller<CopiedString, HandleHelpCommand>( mHelpURLs.back() ) );
+						create_menu_item_with_mnemonic( menu_in_menu, reinterpret_cast<const char*>( prop ), ReferenceCaller<CopiedString, void(), HandleHelpCommand>( mHelpURLs.back() ) );
 						xmlFree( prop );
 					}
 					pNode = pNode->next;
@@ -113,7 +113,7 @@ void process_xlink( const char* filename, const char *menu_name, const char *bas
 	}
 }
 
-void create_game_help_menu( GtkMenu *menu ){
+void create_game_help_menu( ui::Menu menu ){
 	StringOutputStream filename( 256 );
 	filename << AppPath_get() << "global.xlink";
 	process_xlink( filename.c_str(), "General", AppPath_get(), menu );