GTK: wrap GTK_WIDGET

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

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 32b31c5a382ba753b2999f2ed70cdd0111854d93..6076616c780f66abd71c530a8c977cf6684e2248 100644 (file)
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -57,13 +57,13 @@ ui::Image new_plugin_image( const char* filename ){
 
 void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GCallback handler, gpointer data ){
        if (type == IToolbarButton::eSpace) {
-               auto it = ui::Widget(GTK_WIDGET(gtk_separator_tool_item_new()));
+               auto it = ui::ToolItem(gtk_separator_tool_item_new());
                it.show();
                toolbar.add(it);
                return;
        }
        if (type == IToolbarButton::eButton) {
-               auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_plugin_image(icon)), text)));
+               auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(new_plugin_image(icon), text)));
                gtk_widget_set_tooltip_text(button, tooltip);
                gtk_widget_show_all(button);
                button.connect("clicked", G_CALLBACK(handler), data);
@@ -72,7 +72,7 @@ void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, co
        }
        if (type == IToolbarButton::eToggleButton) {
                auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_toggle_tool_button_new()));
-               gtk_tool_button_set_icon_widget(button, GTK_WIDGET(new_plugin_image(icon)));
+               gtk_tool_button_set_icon_widget(button, new_plugin_image(icon));
                gtk_tool_button_set_label(button, text);
                gtk_widget_set_tooltip_text(button, tooltip);
                gtk_widget_show_all(button);