diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-11-05 13:47:54 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-11-05 14:25:12 +0100 |
commit | f03481c4f296b96b269ca986ec6729640fbb8f88 (patch) | |
tree | 8f7dbf59bbcbec6cfdd42f112e377443bc280a3c | |
parent | 5324e62ab0d1753e0b8c7f36cf5fda1d54f11a3f (diff) | |
download | gtk+-f03481c4f296b96b269ca986ec6729640fbb8f88.tar.gz |
Remove gtk_radio_..._join_group methods that were added for 3.0
These versions were added in order to have a bindable version of
_set_group, but with GtkRadioGroup _set_group is already bindable,
so we remove it.
-rw-r--r-- | gtk/gtkradioaction.c | 55 | ||||
-rw-r--r-- | gtk/gtkradioaction.h | 2 | ||||
-rw-r--r-- | gtk/gtkradiobutton.c | 46 | ||||
-rw-r--r-- | gtk/gtkradiobutton.h | 2 |
4 files changed, 0 insertions, 105 deletions
diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 55b2f75040..a0c5c31aef 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -456,61 +456,6 @@ gtk_radio_action_set_group (GtkRadioAction *action, } /** - * gtk_radio_action_join_group: - * @action: the action object - * @group_source: (allow-none): a radio action object whos group we are - * joining, or %NULL to remove the radio action from its group - * - * Joins a radio action object to the group of another radio action object. - * - * Use this in language bindings instead of the gtk_radio_action_get_group() - * and gtk_radio_action_set_group() methods - * - * A common way to set up a group of radio actions is the following: - * |[ - * GtkRadioAction *action; - * GtkRadioAction *last_action; - * - * while (/* more actions to add */) - * { - * action = gtk_radio_action_new (...); - * - * gtk_radio_action_join_group (action, last_action); - * last_action = action; - * } - * ]| - * - * Since: 3.0 - */ -void -gtk_radio_action_join_group (GtkRadioAction *action, - GtkRadioAction *group_source) -{ - g_return_if_fail (GTK_IS_RADIO_ACTION (action)); - g_return_if_fail (group_source == NULL || GTK_IS_RADIO_ACTION (group_source)); - - if (group_source) - { - GtkRadioGroup *group; - group = gtk_radio_action_get_group (group_source); - - if (!group) - { - /* if we are not already part of a group we need to set up a new one - and then get the newly created group */ - gtk_radio_action_set_group (group_source, NULL); - group = gtk_radio_action_get_group (group_source); - } - - gtk_radio_action_set_group (action, group); - } - else - { - gtk_radio_action_set_group (action, NULL); - } -} - -/** * gtk_radio_action_get_current_value: * @action: a #GtkRadioAction * diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h index 7ae6cdc80a..991e4d6f23 100644 --- a/gtk/gtkradioaction.h +++ b/gtk/gtkradioaction.h @@ -81,8 +81,6 @@ GtkRadioAction *gtk_radio_action_new (const gchar *name, GtkRadioGroup *gtk_radio_action_get_group (GtkRadioAction *action); void gtk_radio_action_set_group (GtkRadioAction *action, GtkRadioGroup *group); -void gtk_radio_action_join_group (GtkRadioAction *action, - GtkRadioAction *group_source); gint gtk_radio_action_get_current_value (GtkRadioAction *action); void gtk_radio_action_set_current_value (GtkRadioAction *action, gint current_value); diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index e3240e88f4..dc749469bc 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -352,52 +352,6 @@ gtk_radio_button_set_group (GtkRadioButton *radio_button, } /** - * gtk_radio_button_join_group: - * @radio_button: the #GtkRadioButton object - * @group_source: (allow-none): a radio button object whos group we are - * joining, or %NULL to remove the radio button from its group - * - * Joins a #GtkRadioButton object to the group of another #GtkRadioButton object - * - * Use this in language bindings instead of the gtk_radio_button_get_group() - * and gtk_radio_button_set_group() methods - * - * A common way to set up a group of radio buttons is the following: - * |[ - * GtkRadioButton *radio_button; - * GtkRadioButton *last_button; - * - * while (/* more buttons to add */) - * { - * radio_button = gtk_radio_button_new (...); - * - * gtk_radio_button_join_group (radio_button, last_button); - * last_button = radio_button; - * } - * ]| - * - * Since: 3.0 - */ -void -gtk_radio_button_join_group (GtkRadioButton *radio_button, - GtkRadioButton *group_source) -{ - g_return_if_fail (GTK_IS_RADIO_BUTTON (radio_button)); - g_return_if_fail (group_source == NULL || GTK_IS_RADIO_BUTTON (group_source)); - - if (group_source) - { - GtkRadioGroup *group; - group = gtk_radio_button_get_group (group_source); - gtk_radio_button_set_group (radio_button, group); - } - else - { - gtk_radio_button_set_group (radio_button, NULL); - } -} - -/** * gtk_radio_button_new: * @group: an existing radio button group, or %NULL if you are creating a new group. * diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 256d68bcf7..c6614a3b88 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -90,8 +90,6 @@ GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *r GtkRadioGroup *gtk_radio_button_get_group (GtkRadioButton *radio_button); void gtk_radio_button_set_group (GtkRadioButton *radio_button, GtkRadioGroup *group); -void gtk_radio_button_join_group (GtkRadioButton *radio_button, - GtkRadioButton *group_source); G_END_DECLS |