Callback: remove fixed-arity wrappers

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

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index 048636096675b95ebf1b075c6cab39c111465a05..87651466b6dd596ebb86817cb5cabd59e3dc49c3 100644 (file)
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -32,22 +32,22 @@
 
 
 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_widget_show_all(button);
+       gtk_widget_set_tooltip_text(button, description);
        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)));
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& 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, button, description);
        return button;
 }
 
-ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar 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<void()>& 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, button, description);
        return button;
@@ -60,7 +60,7 @@ ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* descripti
 void toggle_button_set_active_callback( GtkToggleToolButton& button, bool active ){
        toggle_button_set_active_no_signal( ui::ToggleToolButton(&button), active );
 }
-using ToggleButtonSetActiveCaller = ReferenceCaller1<GtkToggleToolButton, bool, toggle_button_set_active_callback>;
+using ToggleButtonSetActiveCaller = ReferenceCaller<GtkToggleToolButton, void(bool), toggle_button_set_active_callback>;
 
 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 );