X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkutil%2Fbutton.cpp;h=2a74c4ba69c135ddddc067e9d29077effbfc6af1;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=0356ba39d1947ab0fb0046a63db6fc5cb693072b;hpb=12b372f89ce109a4db9d510884fbe7d05af79870;p=xonotic%2Fnetradiant.git diff --git a/libs/gtkutil/button.cpp b/libs/gtkutil/button.cpp index 0356ba39..2a74c4ba 100644 --- a/libs/gtkutil/button.cpp +++ b/libs/gtkutil/button.cpp @@ -1,27 +1,27 @@ /* -Copyright (C) 2001-2006, William Joseph. -All Rights Reserved. + Copyright (C) 2001-2006, William Joseph. + All Rights Reserved. -This file is part of GtkRadiant. + This file is part of GtkRadiant. -GtkRadiant is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -GtkRadiant is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include "button.h" -#include +#include #include "stream/textstream.h" #include "stream/stringstream.h" @@ -30,108 +30,131 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "image.h" #include "pointer.h" -void clicked_closure_callback(GtkWidget* widget, gpointer data) +void clicked_closure_callback(ui::Widget widget, gpointer data) { - (*reinterpret_cast(data))(); + (*reinterpret_cast *>( data ))(); } -void button_connect_callback(GtkButton* button, const Callback& callback) +void button_connect_callback(ui::Button button, const Callback &callback) { #if 1 - g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(callback.getThunk()), callback.getEnvironment()); + g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(callback.getThunk()), callback.getEnvironment()); #else - g_signal_connect_closure(G_OBJECT(button), "clicked", create_cclosure(G_CALLBACK(clicked_closure_callback), callback), FALSE); + g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE ); #endif } - -guint toggle_button_connect_callback(GtkToggleButton* button, const Callback& callback) + +void button_connect_callback(ui::ToolButton button, const Callback &callback) { #if 1 - guint handler = g_signal_connect_swapped(G_OBJECT(button), "toggled", G_CALLBACK(callback.getThunk()), callback.getEnvironment()); + g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(callback.getThunk()), callback.getEnvironment()); #else - guint handler = g_signal_connect_closure(G_OBJECT(button), "toggled", create_cclosure(G_CALLBACK(clicked_closure_callback), callback), TRUE); + g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE ); #endif - g_object_set_data(G_OBJECT(button), "handler", gint_to_pointer(handler)); - return handler; } - -void button_set_icon(GtkButton* button, const char* icon) + +guint toggle_button_connect_callback(ui::ToggleButton button, const Callback &callback) { - GtkImage* image = new_local_image(icon); - gtk_widget_show(GTK_WIDGET(image)); - gtk_container_add(GTK_CONTAINER(button), GTK_WIDGET(image)); +#if 1 + guint handler = g_signal_connect_swapped(G_OBJECT(button), "toggled", G_CALLBACK(callback.getThunk()), + callback.getEnvironment()); +#else + guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE ); +#endif + g_object_set_data(G_OBJECT(button), "handler", gint_to_pointer(handler)); + return handler; } -void toggle_button_set_active_no_signal(GtkToggleButton* button, gboolean active) +guint toggle_button_connect_callback(ui::ToggleToolButton button, const Callback &callback) { - //globalOutputStream() << "set active: " << active << "\n"; - guint handler_id = gpointer_to_int(g_object_get_data(G_OBJECT(button), "handler")); - //guint signal_id = g_signal_lookup("toggled", G_OBJECT_TYPE (button)); - //globalOutputStream() << "signal_id: " << signal_id << "\n"; - //guint found = g_signal_handler_find(G_OBJECT(button), G_SIGNAL_MATCH_ID, signal_id, 0, 0, 0, 0); - //globalOutputStream() << " handler found: " << found << "\n"; - g_signal_handler_block(G_OBJECT(button), handler_id); - gtk_toggle_button_set_active(button, active); - g_signal_handler_unblock(G_OBJECT(button), handler_id); +#if 1 + guint handler = g_signal_connect_swapped(G_OBJECT(button), "toggled", G_CALLBACK(callback.getThunk()), + callback.getEnvironment()); +#else + guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE ); +#endif + g_object_set_data(G_OBJECT(button), "handler", gint_to_pointer(handler)); + return handler; } - -void radio_button_print_state(GtkRadioButton* button) +void button_set_icon(ui::Button button, const char *icon) { - globalOutputStream() << "toggle button: "; - for(GSList* radio = gtk_radio_button_group(button); radio != 0; radio = g_slist_next(radio)) - { - globalOutputStream() << gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio->data)); - } - globalOutputStream() << "\n"; + ui::Image image = ui::Image(new_local_image(icon)); + image.show(); + button.add(image); } -GtkToggleButton* radio_button_get_nth(GtkRadioButton* radio, int index) +void toggle_button_set_active_no_signal(ui::ToggleButton button, gboolean active) { - GSList *group = gtk_radio_button_group(radio); - return GTK_TOGGLE_BUTTON(g_slist_nth_data(group, g_slist_length(group) - index - 1)); + //globalOutputStream() << "set active: " << active << "\n"; + guint handler_id = gpointer_to_int(g_object_get_data(G_OBJECT(button), "handler")); + //guint signal_id = g_signal_lookup("toggled", G_OBJECT_TYPE (button)); + //globalOutputStream() << "signal_id: " << signal_id << "\n"; + //guint found = g_signal_handler_find(G_OBJECT(button), G_SIGNAL_MATCH_ID, signal_id, 0, 0, 0, 0); + //globalOutputStream() << " handler found: " << found << "\n"; + g_signal_handler_block(G_OBJECT(button), handler_id); + gtk_toggle_button_set_active(button, active); + g_signal_handler_unblock(G_OBJECT(button), handler_id); } -void radio_button_set_active(GtkRadioButton* radio, int index) +void toggle_button_set_active_no_signal(ui::ToggleToolButton button, gboolean active) { - //radio_button_print_state(radio); - gtk_toggle_button_set_active(radio_button_get_nth(radio, index), TRUE); - //radio_button_print_state(radio); + guint handler_id = gpointer_to_int(g_object_get_data(G_OBJECT(button), "handler")); + g_signal_handler_block(G_OBJECT(button), handler_id); + gtk_toggle_tool_button_set_active(button, active); + g_signal_handler_unblock(G_OBJECT(button), handler_id); } -void radio_button_set_active_no_signal(GtkRadioButton* radio, int index) + +void radio_button_print_state(ui::RadioButton button) { - { - for(GSList* l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) - { - g_signal_handler_block(G_OBJECT(l->data), gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler"))); + globalOutputStream() << "toggle button: "; + for (GSList *radio = gtk_radio_button_get_group(button); radio != 0; radio = g_slist_next(radio)) { + globalOutputStream() << gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio->data)); } - } - radio_button_set_active(radio, index); - { - for(GSList* l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) - { - g_signal_handler_unblock(G_OBJECT(l->data), gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler"))); - } - } + globalOutputStream() << "\n"; +} + +ui::ToggleButton radio_button_get_nth(ui::RadioButton radio, int index) +{ + GSList *group = gtk_radio_button_get_group(radio); + return ui::ToggleButton::from(g_slist_nth_data(group, g_slist_length(group) - index - 1)); } -int radio_button_get_active(GtkRadioButton* radio) +void radio_button_set_active(ui::RadioButton radio, int index) +{ + //radio_button_print_state(radio); + gtk_toggle_button_set_active(radio_button_get_nth(radio, index), TRUE); + //radio_button_print_state(radio); +} + +void radio_button_set_active_no_signal(ui::RadioButton radio, int index) { - //radio_button_print_state(radio); - GSList *group = gtk_radio_button_group(radio); - int index = g_slist_length(group) - 1; - for (; group != 0; group = g_slist_next(group)) - { - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(group->data))) { - break; + for (GSList *l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) { + g_signal_handler_block(G_OBJECT(l->data), gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler"))); + } } - else + radio_button_set_active(radio, index); { - index--; + for (GSList *l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) { + g_signal_handler_unblock(G_OBJECT(l->data), + gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler"))); + } } - } - return index; } +int radio_button_get_active(ui::RadioButton radio) +{ + //radio_button_print_state(radio); + GSList *group = gtk_radio_button_get_group(radio); + int index = g_slist_length(group) - 1; + for (; group != 0; group = g_slist_next(group)) { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(group->data))) { + break; + } else { + index--; + } + } + return index; +}