* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
#include "gtklabel.h"
#include "gtkradiobutton.h"
#include "gtksignal.h"
ARG_GROUP
};
-#define CHECK_BUTTON_CLASS(w) GTK_CHECK_BUTTON_CLASS (GTK_OBJECT (w)->klass)
-
static void gtk_radio_button_class_init (GtkRadioButtonClass *klass);
static void gtk_radio_button_init (GtkRadioButton *radio_button);
case ARG_GROUP:
if (GTK_VALUE_OBJECT (*arg))
- slist = gtk_radio_button_group ((GtkRadioButton*) GTK_VALUE_OBJECT (*arg));
+ slist = gtk_radio_button_get_group ((GtkRadioButton*) GTK_VALUE_OBJECT (*arg));
else
slist = NULL;
gtk_radio_button_set_group (radio_button, slist);
gtk_radio_button_set_group (GtkRadioButton *radio_button,
GSList *group)
{
- g_return_if_fail (radio_button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (radio_button));
g_return_if_fail (!g_slist_find (group, radio_button));
const gchar *label)
{
GtkWidget *radio_button;
- GtkWidget *label_widget;
- radio_button = gtk_radio_button_new (group);
- label_widget = gtk_label_new (label);
- gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
+ radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, "label", label, NULL) ;
+
+ if (group)
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group);
+
+ return radio_button;
+}
+
+
+/**
+ * gtk_radio_button_new_with_mnemonic:
+ * @group: the radio button group
+ * @label: the text of the button, with an underscore in front of the
+ * mnemonic character
+ * @returns: a new #GtkRadioButton
+ *
+ * Creates a new #GtkRadioButton containing a label. The label
+ * will be created using gtk_label_new_with_mnemonic(), so underscores
+ * in @label indicate the mnemonic for the button.
+ **/
+GtkWidget*
+gtk_radio_button_new_with_mnemonic (GSList *group,
+ const gchar *label)
+{
+ GtkWidget *radio_button;
+
+ radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, "label", label, "use_underline", TRUE, NULL);
- gtk_container_add (GTK_CONTAINER (radio_button), label_widget);
- gtk_widget_show (label_widget);
+ if (group)
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group);
return radio_button;
}
{
GSList *l = NULL;
if (group)
- l = gtk_radio_button_group (group);
+ l = gtk_radio_button_get_group (group);
return gtk_radio_button_new (l);
}
{
GSList *l = NULL;
if (group)
- l = gtk_radio_button_group (group);
+ l = gtk_radio_button_get_group (group);
return gtk_radio_button_new_with_label (l, label);
}
+/**
+ * gtk_radio_button_new_with_mnemonic_from_widget:
+ * @group: widget to get radio group from
+ * @label: the text of the button, with an underscore in front of the
+ * mnemonic character
+ * @returns: a new #GtkRadioButton
+ *
+ * Creates a new #GtkRadioButton containing a label. The label
+ * will be created using gtk_label_new_with_mnemonic(), so underscores
+ * in @label indicate the mnemonic for the button.
+ **/
+GtkWidget*
+gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *group,
+ const gchar *label)
+{
+ GSList *l = NULL;
+ if (group)
+ l = gtk_radio_button_get_group (group);
+ return gtk_radio_button_new_with_mnemonic (l, label);
+}
+
GSList*
-gtk_radio_button_group (GtkRadioButton *radio_button)
+gtk_radio_button_get_group (GtkRadioButton *radio_button)
{
- g_return_val_if_fail (radio_button != NULL, NULL);
g_return_val_if_fail (GTK_IS_RADIO_BUTTON (radio_button), NULL);
return radio_button->group;
GtkRadioButton *tmp_button;
GSList *tmp_list;
- g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (object));
radio_button = GTK_RADIO_BUTTON (object);
tmp_button->group = radio_button->group;
}
+ /* this button is no longer in the group */
+ radio_button->group = NULL;
+
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
GSList *tmp_list;
gint toggled;
- g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (button));
radio_button = GTK_RADIO_BUTTON (button);
GtkShadowType shadow_type;
GdkRectangle restrict_area;
GdkRectangle new_area;
- gint width, height;
gint x, y;
+ gint indicator_size, indicator_spacing;
- g_return_if_fail (check_button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (check_button));
if (GTK_WIDGET_VISIBLE (check_button) && GTK_WIDGET_MAPPED (check_button))
(state_type != GTK_STATE_PRELIGHT))
state_type = GTK_STATE_NORMAL;
+ _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
+
restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
restrict_area.width = widget->allocation.width - ( 2 * GTK_CONTAINER (widget)->border_width);
new_area.width, new_area.height);
}
- x = widget->allocation.x + CHECK_BUTTON_CLASS (widget)->indicator_spacing + GTK_CONTAINER (widget)->border_width;
- y = widget->allocation.y + (widget->allocation.height - CHECK_BUTTON_CLASS (widget)->indicator_size) / 2;
- width = CHECK_BUTTON_CLASS (widget)->indicator_size;
- height = CHECK_BUTTON_CLASS (widget)->indicator_size;
+ x = widget->allocation.x + indicator_spacing + GTK_CONTAINER (widget)->border_width;
+ y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
if (GTK_TOGGLE_BUTTON (widget)->active)
shadow_type = GTK_SHADOW_IN;
else
shadow_type = GTK_SHADOW_OUT;
+
+ if (GTK_TOGGLE_BUTTON (widget)->inconsistent)
+ shadow_type = GTK_SHADOW_ETCHED_IN;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ x = widget->allocation.x + widget->allocation.width - (indicator_size + x - widget->allocation.x);
+
gtk_paint_option (widget->style, widget->window,
- GTK_WIDGET_STATE (widget), shadow_type,
+ state_type, shadow_type,
area, widget, "radiobutton",
- x, y, width, height);
+ x, y, indicator_size, indicator_size);
}
}
projects / ~andy / gtk / blobdiff