X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fbutton.h;h=908f6a07cb705364d2a981d272f727902ae85389;hb=refs%2Fheads%2FTimePath%2Fdevelop;hp=15a9f2e8cd4513d10894710d12a92ccf6f8e5a9e;hpb=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/button.h b/libs/gtkutil/button.h
index 15a9f2e8..908f6a07 100644
--- a/libs/gtkutil/button.h
+++ b/libs/gtkutil/button.h
@@ -22,23 +22,31 @@
 #if !defined( INCLUDED_GTKUTIL_BUTTON_H )
 #define INCLUDED_GTKUTIL_BUTTON_H
 
-#include "generic/callbackfwd.h"
+#include <uilib/uilib.h>
+#include "generic/callback.h"
 
-typedef struct _GtkButton GtkButton;
-typedef struct _GtkToggleButton GtkToggleButton;
-typedef struct _GtkRadioButton GtkRadioButton;
 typedef int gint;
 typedef gint gboolean;
 typedef unsigned int guint;
 
-void button_connect_callback( GtkButton* button, const Callback& callback );
-guint toggle_button_connect_callback( GtkToggleButton* button, const Callback& callback );
+void button_connect_callback(ui::Button button, const Callback<void()> &callback);
 
-void button_set_icon( GtkButton* button, const char* icon );
-void toggle_button_set_active_no_signal( GtkToggleButton* item, gboolean active );
+void button_connect_callback(ui::ToolButton button, const Callback<void()> &callback);
 
-void radio_button_set_active( GtkRadioButton* radio, int index );
-void radio_button_set_active_no_signal( GtkRadioButton* radio, int index );
-int radio_button_get_active( GtkRadioButton* radio );
+guint toggle_button_connect_callback(ui::ToggleButton button, const Callback<void()> &callback);
+
+guint toggle_button_connect_callback(ui::ToggleToolButton button, const Callback<void()> &callback);
+
+void button_set_icon(ui::Button button, const char *icon);
+
+void toggle_button_set_active_no_signal(ui::ToggleButton item, gboolean active);
+
+void toggle_button_set_active_no_signal(ui::ToggleToolButton item, gboolean active);
+
+void radio_button_set_active(ui::RadioButton radio, int index);
+
+void radio_button_set_active_no_signal(ui::RadioButton radio, int index);
+
+int radio_button_get_active(ui::RadioButton radio);
 
 #endif