Merge branch 'smooth' into 'master'

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

diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index e3b278c5fede6e64c406616333b0e5289d4871fc..e2af3b97100d8e584a0415813f51959b80da8332 100644 (file)
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -21,6 +21,8 @@
 
 #include "pluginmenu.h"
 
+#include <gtk/gtk.h>
+
 #include "stream/textstream.h"
 
 #include "gtkutil/pointer.h"
@@ -42,7 +44,7 @@ void plugin_activated( ui::Widget widget, gpointer data ){
 
 void PlugInMenu_Add( ui::Menu plugin_menu, IPlugIn* pPlugIn ){
        ui::Widget item, parent;
-       ui::Menu menu{nullptr}, subMenu{nullptr};
+       ui::Menu menu{ui::null}, subMenu{ui::null};
        const char *menuText, *menuCommand;
        std::stack<ui::Menu> menuStack;
 
@@ -99,7 +101,7 @@ void PlugInMenu_Add( ui::Menu plugin_menu, IPlugIn* pPlugIn ){
                                {
                                        item = ui::MenuItem( menuText );
                                        g_object_set_data( G_OBJECT( item ),"command", const_cast<gpointer>( static_cast<const void*>( menuCommand ) ) );
-                                       g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( plugin_activated ), gint_to_pointer( m_nNextPlugInID ) );
+                                       item.connect( "activate", G_CALLBACK( plugin_activated ), gint_to_pointer( m_nNextPlugInID ) );
                                }
                                item.show();
                                menu.add(item);