Wrap more GTK

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

diff --git a/libs/gtkutil/button.cpp b/libs/gtkutil/button.cpp
index af19ef3521719737d946e6cf2de43b26738d7a6a..9f40f9e9600fae70f465782742c7b8675e23cf65 100644 (file)
--- a/libs/gtkutil/button.cpp
+++ b/libs/gtkutil/button.cpp
@@ -31,10 +31,10 @@
 #include "pointer.h"
 
 void clicked_closure_callback( ui::Widget widget, gpointer data ){
-       ( *reinterpret_cast<Callback*>( data ) )( );
+       ( *reinterpret_cast<Callback<void()>*>( data ) )( );
 }
 
-void button_connect_callback( ui::Button button, const Callback& callback ){
+void button_connect_callback( ui::Button button, const Callback<void()>& callback ){
 #if 1
        g_signal_connect_swapped( G_OBJECT( button ), "clicked", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
@@ -42,7 +42,7 @@ void button_connect_callback( ui::Button button, const Callback& callback ){
 #endif
 }
 
-void button_connect_callback( ui::ToolButton button, const Callback& callback ){
+void button_connect_callback( ui::ToolButton button, const Callback<void()>& callback ){
 #if 1
        g_signal_connect_swapped( G_OBJECT( button ), "clicked", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
@@ -50,7 +50,7 @@ void button_connect_callback( ui::ToolButton button, const Callback& callback ){
 #endif
 }
 
-guint toggle_button_connect_callback( ui::ToggleButton button, const Callback& callback ){
+guint toggle_button_connect_callback( ui::ToggleButton button, const Callback<void()>& callback ){
 #if 1
        guint handler = g_signal_connect_swapped( G_OBJECT( button ), "toggled", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
@@ -60,7 +60,7 @@ guint toggle_button_connect_callback( ui::ToggleButton button, const Callback& c
        return handler;
 }
 
-guint toggle_button_connect_callback( ui::ToggleToolButton button, const Callback& callback ){
+guint toggle_button_connect_callback( ui::ToggleToolButton button, const Callback<void()>& callback ){
 #if 1
        guint handler = g_signal_connect_swapped( G_OBJECT( button ), "toggled", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
@@ -105,9 +105,9 @@ void radio_button_print_state( ui::RadioButton button ){
        globalOutputStream() << "\n";
 }
 
-GtkToggleButton* radio_button_get_nth( ui::RadioButton radio, int index ){
+ui::ToggleButton radio_button_get_nth( ui::RadioButton radio, int index ){
        GSList *group = gtk_radio_button_get_group( radio );
-       return GTK_TOGGLE_BUTTON( g_slist_nth_data( group, g_slist_length( group ) - index - 1 ) );
+       return ui::ToggleButton::from( g_slist_nth_data( group, g_slist_length( group ) - index - 1 ) );
 }
 
 void radio_button_set_active( ui::RadioButton radio, int index ){