X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkutil%2Ftoolbar.cpp;h=049d05ec1fc62fd4684ecb79661fb54077a70551;hb=6882578a4675ab8b8609d0b0421918dc664a2c18;hp=c06594012b523a1900ca41a1893a869bc2401648;hpb=c52a4bd4da209e657018e8d799dcb488cd848e4c;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index c0659401..049d05ec 100644
--- 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,39 +31,39 @@
 #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);
 }
 
-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( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback ){
+	auto button = ui::ToolButton::from(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;
 }
 
-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( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback ){
+	auto button = ui::ToggleToolButton::from(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;
 }
 
-GtkToolButton* 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 );
 }
 
-void toggle_button_set_active_callback( GtkToggleToolButton& button, bool active ){
-	toggle_button_set_active_no_signal( &button, active );
+void toggle_button_set_active_callback(void *it, bool active ){
+	auto button = ui::ToggleToolButton::from(it);
+	toggle_button_set_active_no_signal( 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( 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 );
-	toggle.m_exportCallback( ToggleButtonSetActiveCaller( *button ) );
+	toggle.m_exportCallback( PointerCaller<void, void(bool), toggle_button_set_active_callback>( button._handle ) );
 	return button;
 }