Merge branch 'TimePath/gtk++' into 'master'

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

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index ac79b10188dbbbd4ff7133a69d1730c885a0e758..32b31c5a382ba753b2999f2ed70cdd0111854d93 100644 (file)
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -21,6 +21,7 @@
 
 #include "plugintoolbar.h"
 
+#include <gtk/gtk.h>
 
 #include "itoolbar.h"
 #include "modulesystem.h"
@@ -65,7 +66,7 @@ void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, co
                auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_plugin_image(icon)), text)));
                gtk_widget_set_tooltip_text(button, tooltip);
                gtk_widget_show_all(button);
-               g_signal_connect(button, "clicked", G_CALLBACK(handler), data);
+               button.connect("clicked", G_CALLBACK(handler), data);
                toolbar.add(button);
                return;
        }
@@ -75,7 +76,7 @@ void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, co
                gtk_tool_button_set_label(button, text);
                gtk_widget_set_tooltip_text(button, tooltip);
                gtk_widget_show_all(button);
-               g_signal_connect(button, "toggled", G_CALLBACK(handler), data);
+               button.connect("toggled", G_CALLBACK(handler), data);
                toolbar.add(button);
                return;
        }
@@ -90,7 +91,7 @@ void PlugInToolbar_AddButton( ui::Toolbar toolbar, const IToolbarButton* button
        toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), G_CALLBACK( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<IToolbarButton*>( button ) ) );
 }
 
-ui::Toolbar g_plugin_toolbar{nullptr};
+ui::Toolbar g_plugin_toolbar{ui::null};
 
 void PluginToolbar_populate(){
        class AddToolbarItemVisitor : public ToolbarModules::Visitor