GTK: wrap GTK_WIDGET

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

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index 2f7cf5ff0a5d3ec336eea1919755f1e400897a2d..d2ab45a76e0598e68ec69c3d4d2e591af8389c53 100644 (file)
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -22,6 +22,7 @@
 #include "toolbar.h"
 
 #include <uilib/uilib.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 
@@ -30,29 +31,29 @@
 #include "image.h"
 
 
-void toolbar_append( GtkToolbar* toolbar, GtkToolItem* 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));
+void toolbar_append( ui::Toolbar toolbar, ui::ToolItem button, const char* description ){
+       gtk_widget_show_all(button);
+       gtk_widget_set_tooltip_text(button, description);
+       toolbar.add(button);
 }
 
-ui::ToolButton toolbar_append_button( GtkToolbar* 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)));
+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(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;
 }
 
-ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback ){
+ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback& callback ){
        auto button = ui::ToggleToolButton(GTK_TOGGLE_TOOL_BUTTON(gtk_toggle_tool_button_new()));
        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_icon_widget(GTK_TOOL_BUTTON(button), 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;
 }
 
-ui::ToolButton toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Command& command ){
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Command& command ){
        return toolbar_append_button( toolbar, description, icon, command.m_callback );
 }
 
@@ -61,7 +62,7 @@ void toggle_button_set_active_callback( GtkToggleToolButton& button, bool active
 }
 using ToggleButtonSetActiveCaller = ReferenceCaller1<GtkToggleToolButton, bool, toggle_button_set_active_callback>;
 
-ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Toggle& toggle ){
+ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Toggle& toggle ){
        auto button = toolbar_append_toggle_button( toolbar, description, icon, toggle.m_command.m_callback );
        GtkToggleToolButton *button_ = button;
        toggle.m_exportCallback( ToggleButtonSetActiveCaller( *button_ ) );