Purge gtk_container_add

[xonotic/netradiant.git] / libs / gtkutil / toolbar.cpp

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index 85e371adeb57945c07032fcf330989501a2a3897..1bd3be42f9faa665db3b5039c273a65380b4b85b 100644 (file)
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -30,16 +30,16 @@
 #include "image.h"
 
 
-void toolbar_append( ui::Toolbar toolbar, GtkToolItem* button, const char* description ){
+void toolbar_append( ui::Toolbar toolbar, ui::ToolItem button, const char* description ){
        gtk_widget_show_all(GTK_WIDGET(button));
        gtk_widget_set_tooltip_text(GTK_WIDGET(button), description);
-       gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+       toolbar.add(button);
 }
 
 ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback& callback ){
        auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_local_image(icon)), nullptr)));
        button_connect_callback(button, callback);
-       toolbar_append(toolbar, GTK_TOOL_ITEM(button), description);
+       toolbar_append(toolbar, button, description);
        return button;
 }
 
@@ -48,7 +48,7 @@ ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const ch
        toggle_button_connect_callback(button, callback);
        gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), GTK_WIDGET(new_local_image(icon)));
        gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), description);
-       toolbar_append(toolbar, GTK_TOOL_ITEM(button), description);
+       toolbar_append(toolbar, button, description);
        return button;
 }