* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
#include "gtkradiobutton.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
+#include "gtkalias.h"
enum {
};
-static void gtk_radio_button_class_init (GtkRadioButtonClass *klass);
-static void gtk_radio_button_init (GtkRadioButton *radio_button);
static void gtk_radio_button_destroy (GtkObject *object);
static gboolean gtk_radio_button_focus (GtkWidget *widget,
GtkDirectionType direction);
GValue *value,
GParamSpec *pspec);
-static GtkCheckButtonClass *parent_class = NULL;
+G_DEFINE_TYPE (GtkRadioButton, gtk_radio_button, GTK_TYPE_CHECK_BUTTON)
static guint group_changed_signal = 0;
-GType
-gtk_radio_button_get_type (void)
-{
- static GType radio_button_type = 0;
-
- if (!radio_button_type)
- {
- static const GTypeInfo radio_button_info =
- {
- sizeof (GtkRadioButtonClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_radio_button_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkRadioButton),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_radio_button_init,
- };
-
- radio_button_type =
- g_type_register_static (GTK_TYPE_CHECK_BUTTON, "GtkRadioButton",
- &radio_button_info, 0);
- }
-
- return radio_button_type;
-}
-
static void
gtk_radio_button_class_init (GtkRadioButtonClass *class)
{
button_class = (GtkButtonClass*) class;
check_button_class = (GtkCheckButtonClass*) class;
- parent_class = g_type_class_peek_parent (class);
-
gobject_class->set_property = gtk_radio_button_set_property;
gobject_class->get_property = gtk_radio_button_get_property;
PROP_GROUP,
g_param_spec_object ("group",
P_("Group"),
- P_("The radio button whose group this widget belongs."),
+ P_("The radio button whose group this widget belongs to."),
GTK_TYPE_RADIO_BUTTON,
- G_PARAM_WRITABLE));
+ GTK_PARAM_WRITABLE));
object_class->destroy = gtk_radio_button_destroy;
widget_class->focus = gtk_radio_button_focus;
class->group_changed = NULL;
/**
- * GtkStyle::group-changed:
+ * GtkRadioButton::group-changed:
* @style: the object which received the signal
*
* Emitted when the group of radio buttons that a radio button belongs
* to changes. This is emitted when a radio button switches from
* being alone to being part of a group of 2 or more buttons, or
- * vice-versa, and when a buttton is moved from one group of 2 or
+ * vice-versa, and when a button is moved from one group of 2 or
* more buttons to a different one, but not when the composition
* of the group that a button belongs to changes.
*
* Since: 2.4
*/
- group_changed_signal = g_signal_new ("group-changed",
+ group_changed_signal = g_signal_new (I_("group-changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkRadioButtonClass, group_changed),
gtk_radio_button_init (GtkRadioButton *radio_button)
{
GTK_WIDGET_SET_FLAGS (radio_button, GTK_NO_WINDOW);
- GTK_WIDGET_UNSET_FLAGS (radio_button, GTK_RECEIVES_DEFAULT);
+ gtk_widget_set_receives_default (GTK_WIDGET (radio_button), FALSE);
GTK_TOGGLE_BUTTON (radio_button)->active = TRUE;
switch (prop_id)
{
GSList *slist;
+ GtkRadioButton *button;
case PROP_GROUP:
- if (G_VALUE_HOLDS_OBJECT (value))
- slist = gtk_radio_button_get_group ((GtkRadioButton*) g_value_get_object (value));
+ button = g_value_get_object (value);
+
+ if (button)
+ slist = gtk_radio_button_get_group (button);
else
slist = NULL;
gtk_radio_button_set_group (radio_button, slist);
GValue *value,
GParamSpec *pspec)
{
- GtkRadioButton *radio_button;
-
- radio_button = GTK_RADIO_BUTTON (object);
-
switch (prop_id)
{
default:
g_object_ref (radio_button);
+ g_object_notify (G_OBJECT (radio_button), "group");
g_signal_emit (radio_button, group_changed_signal, 0);
if (old_group_singleton)
{
{
GtkWidget *radio_button;
- radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, "label", label, "use_underline", TRUE, NULL);
+ radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON,
+ "label", label,
+ "use-underline", TRUE,
+ NULL);
if (group)
gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group);
}
GtkWidget*
-gtk_radio_button_new_from_widget (GtkRadioButton *group)
+gtk_radio_button_new_from_widget (GtkRadioButton *radio_group_member)
{
GSList *l = NULL;
- if (group)
- l = gtk_radio_button_get_group (group);
+ if (radio_group_member)
+ l = gtk_radio_button_get_group (radio_group_member);
return gtk_radio_button_new (l);
}
GtkWidget*
-gtk_radio_button_new_with_label_from_widget (GtkRadioButton *group,
+gtk_radio_button_new_with_label_from_widget (GtkRadioButton *radio_group_member,
const gchar *label)
{
GSList *l = NULL;
- if (group)
- l = gtk_radio_button_get_group (group);
+ if (radio_group_member)
+ l = gtk_radio_button_get_group (radio_group_member);
return gtk_radio_button_new_with_label (l, label);
}
/**
* gtk_radio_button_new_with_mnemonic_from_widget:
- * @group: widget to get radio group from
+ * @radio_group_member: (allow-none): widget to get radio group from or %NULL
* @label: the text of the button, with an underscore in front of the
* mnemonic character
* @returns: a new #GtkRadioButton
* in @label indicate the mnemonic for the button.
**/
GtkWidget*
-gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *group,
+gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member,
const gchar *label)
{
GSList *l = NULL;
- if (group)
- l = gtk_radio_button_get_group (group);
+ if (radio_group_member)
+ l = gtk_radio_button_get_group (radio_group_member);
return gtk_radio_button_new_with_mnemonic (l, label);
}
+
+/**
+ * gtk_radio_button_get_group:
+ * @radio_button: a #GtkRadioButton.
+ *
+ * Retrieves the group assigned to a radio button.
+ *
+ * Return value: (element-type GtkRadioButton) (transfer none): a linked list
+ * containing all the radio buttons in the same group
+ * as @radio_button. The returned list is owned by the radio button
+ * and must not be modified or freed.
+ */
GSList*
gtk_radio_button_get_group (GtkRadioButton *radio_button)
{
g_signal_emit (old_group_singleton, group_changed_signal, 0);
if (was_in_group)
g_signal_emit (radio_button, group_changed_signal, 0);
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+ GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
}
static void
* they look like buttons to the user.
*/
if (!GTK_TOGGLE_BUTTON (widget)->draw_indicator)
- return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+ return GTK_WIDGET_CLASS (gtk_radio_button_parent_class)->focus (widget, direction);
if (gtk_widget_is_focus (widget))
{
+ GtkSettings *settings = gtk_widget_get_settings (widget);
GSList *focus_list, *tmp_list;
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
GtkWidget *new_focus = NULL;
+ gboolean cursor_only;
+ gboolean wrap_around;
- focus_list = g_slist_copy (radio_button->group);
-
switch (direction)
{
- case GTK_DIR_TAB_FORWARD:
- case GTK_DIR_TAB_BACKWARD:
- return FALSE;
case GTK_DIR_LEFT:
case GTK_DIR_RIGHT:
+ focus_list = g_slist_copy (radio_button->group);
focus_list = g_slist_sort_with_data (focus_list, left_right_compare, toplevel);
break;
case GTK_DIR_UP:
case GTK_DIR_DOWN:
+ focus_list = g_slist_copy (radio_button->group);
focus_list = g_slist_sort_with_data (focus_list, up_down_compare, toplevel);
break;
+ case GTK_DIR_TAB_FORWARD:
+ case GTK_DIR_TAB_BACKWARD:
+ /* fall through */
+ default:
+ return FALSE;
}
if (direction == GTK_DIR_LEFT || direction == GTK_DIR_UP)
{
GtkWidget *child = tmp_list->data;
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_IS_SENSITIVE (child))
+ if (gtk_widget_get_mapped (child) && gtk_widget_is_sensitive (child))
{
new_focus = child;
break;
}
}
+ g_object_get (settings,
+ "gtk-keynav-cursor-only", &cursor_only,
+ "gtk-keynav-wrap-around", &wrap_around,
+ NULL);
+
if (!new_focus)
{
+ if (cursor_only)
+ {
+ g_slist_free (focus_list);
+ return FALSE;
+ }
+
+ if (!wrap_around)
+ {
+ g_slist_free (focus_list);
+ gtk_widget_error_bell (widget);
+ return TRUE;
+ }
+
tmp_list = focus_list;
while (tmp_list)
{
GtkWidget *child = tmp_list->data;
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_IS_SENSITIVE (child))
+ if (gtk_widget_get_mapped (child) && gtk_widget_is_sensitive (child))
{
new_focus = child;
break;
if (new_focus)
{
gtk_widget_grab_focus (new_focus);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (new_focus), TRUE);
+
+ if (!cursor_only)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (new_focus), TRUE);
}
return TRUE;
{
toggled = TRUE;
toggle_button->active = !toggle_button->active;
-
+
tmp_list = radio_button->group;
while (tmp_list)
{
gtk_widget_set_state (GTK_WIDGET (button), new_state);
if (toggled)
- gtk_toggle_button_toggled (toggle_button);
+ {
+ gtk_toggle_button_toggled (toggle_button);
+
+ g_object_notify (G_OBJECT (toggle_button), "active");
+ }
_gtk_button_set_depressed (button, depressed);
gint focus_pad;
gboolean interior_focus;
- if (GTK_WIDGET_DRAWABLE (check_button))
+ widget = GTK_WIDGET (check_button);
+
+ if (gtk_widget_is_drawable (widget))
{
- widget = GTK_WIDGET (check_button);
button = GTK_BUTTON (check_button);
toggle_button = GTK_TOGGLE_BUTTON (check_button);
gtk_widget_style_get (widget,
- "interior_focus", &interior_focus,
+ "interior-focus", &interior_focus,
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
NULL);
y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
child = GTK_BIN (check_button)->child;
- if (!interior_focus || !(child && GTK_WIDGET_VISIBLE (child)))
+ if (!interior_focus || !(child && gtk_widget_get_visible (child)))
x += focus_width + focus_pad;
if (toggle_button->inconsistent)
state_type = GTK_STATE_ACTIVE;
else if (button->in_button)
state_type = GTK_STATE_PRELIGHT;
- else if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ else if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
else
state_type = GTK_STATE_NORMAL;
x, y, indicator_size, indicator_size);
}
}
+
+#define __GTK_RADIO_BUTTON_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff