daemonmap: update submodule

[xonotic/netradiant.git] / radiant / pluginmenu.cpp

diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index 69e5c0841eaaa6898abc56a3ae1221db3dd082f7..8155d0a92d7d7bbe01c011111d9a9260c0854860 100644 (file)
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -65,7 +65,7 @@ void PlugInMenu_Add( ui::Menu plugin_menu, IPlugIn* pPlugIn ){
 
                        if ( menuText != 0 && strlen( menuText ) > 0 ) {
                                if ( !strcmp( menuText, "-" ) ) {
-                                       item = ui::Widget(gtk_menu_item_new());
+                                       item = ui::Widget::from(gtk_menu_item_new());
                                        gtk_widget_set_sensitive( item, FALSE );
                                }
                                else if ( !strcmp( menuText, ">" ) ) {
@@ -125,7 +125,7 @@ void PlugInMenu_Add( ui::Menu plugin_menu, IPlugIn* pPlugIn ){
 }
 
 ui::Menu g_plugins_menu{ui::null};
-GtkMenuItem* g_plugins_menu_separator = 0;
+ui::MenuItem g_plugins_menu_separator{ui::null};
 
 void PluginsMenu_populate(){
        class PluginsMenuConstructor : public PluginsVisitor
@@ -146,18 +146,18 @@ public:
 void PluginsMenu_clear(){
        m_nNextPlugInID = 0;
 
-       GList* lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) );
+       GList* lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ), g_plugins_menu_separator._handle );
        while ( lst->next )
        {
-               gtk_container_remove( GTK_CONTAINER( g_plugins_menu ), GTK_WIDGET( lst->next->data ) );
-               lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ),  GTK_WIDGET( g_plugins_menu_separator ) );
+               g_plugins_menu.remove(ui::Widget::from(lst->next->data));
+               lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ),  g_plugins_menu_separator._handle );
        }
 }
 
 ui::MenuItem create_plugins_menu(){
        // Plugins menu
        auto plugins_menu_item = new_sub_menu_item_with_mnemonic( "_Plugins" );
-       auto menu = ui::Menu(GTK_MENU( gtk_menu_item_get_submenu( plugins_menu_item ) ));
+       auto menu = ui::Menu::from( gtk_menu_item_get_submenu( plugins_menu_item ) );
        if ( g_Layout_enableDetachableMenus.m_value ) {
                menu_tearoff( menu );
        }
@@ -166,7 +166,7 @@ ui::MenuItem create_plugins_menu(){
 
        //TODO: some modules/plugins do not yet support refresh
 #if 0
-       create_menu_item_with_mnemonic( menu, "Refresh", FreeCaller<Restart>() );
+       create_menu_item_with_mnemonic( menu, "Refresh", makeCallbackF(Restart) );
 
        // NOTE: the seperator is used when doing a refresh of the list, everything past the seperator is removed
        g_plugins_menu_separator = menu_separator( menu );