Wrap gtkutil/button

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

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index c06594012b523a1900ca41a1893a869bc2401648..2f7cf5ff0a5d3ec336eea1919755f1e400897a2d 100644 (file)
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -36,15 +36,15 @@ void toolbar_append( GtkToolbar* toolbar, GtkToolItem* button, const char* descr
        gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
 }
 
-GtkToolButton* toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback ){
-       auto button = GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_local_image(icon)), nullptr));
+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)));
        button_connect_callback(button, callback);
        toolbar_append(toolbar, GTK_TOOL_ITEM(button), description);
        return button;
 }
 
-GtkToggleToolButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback ){
-       auto button = GTK_TOGGLE_TOOL_BUTTON(gtk_toggle_tool_button_new());
+ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* 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_label(GTK_TOOL_BUTTON(button), description);
@@ -52,17 +52,18 @@ GtkToggleToolButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const ch
        return button;
 }
 
-GtkToolButton* toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Command& command ){
+ui::ToolButton toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Command& command ){
        return toolbar_append_button( toolbar, description, icon, command.m_callback );
 }
 
 void toggle_button_set_active_callback( GtkToggleToolButton& button, bool active ){
-       toggle_button_set_active_no_signal( &button, active );
+       toggle_button_set_active_no_signal( ui::ToggleToolButton(&button), active );
 }
 using ToggleButtonSetActiveCaller = ReferenceCaller1<GtkToggleToolButton, bool, toggle_button_set_active_callback>;
 
-GtkToggleToolButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Toggle& toggle ){
+ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Toggle& toggle ){
        auto button = toolbar_append_toggle_button( toolbar, description, icon, toggle.m_command.m_callback );
-       toggle.m_exportCallback( ToggleButtonSetActiveCaller( *button ) );
+       GtkToggleToolButton *button_ = button;
+       toggle.m_exportCallback( ToggleButtonSetActiveCaller( *button_ ) );
        return button;
 }