]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkradiobutton.c
replace g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
[~andy/gtk] / gtk / gtkradiobutton.c
index 0c52836e96da1e600370e1e1f79b9cb6ddecf58e..245bec87e9f39e714e812f650022337014026f8b 100644 (file)
@@ -2,25 +2,37 @@
  * 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
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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"
 
 
-#define CHECK_BUTTON_CLASS(w)  GTK_CHECK_BUTTON_CLASS (GTK_OBJECT (w)->klass)
+enum {
+  ARG_0,
+  ARG_GROUP
+};
 
 
 static void gtk_radio_button_class_init     (GtkRadioButtonClass  *klass);
@@ -29,26 +41,34 @@ static void gtk_radio_button_destroy        (GtkObject            *object);
 static void gtk_radio_button_clicked        (GtkButton            *button);
 static void gtk_radio_button_draw_indicator (GtkCheckButton       *check_button,
                                             GdkRectangle         *area);
+static void gtk_radio_button_set_arg       (GtkObject            *object,
+                                            GtkArg               *arg,
+                                            guint                 arg_id);
+static void gtk_radio_button_get_arg       (GtkObject            *object,
+                                            GtkArg               *arg,
+                                            guint                 arg_id);
 
 
 static GtkCheckButtonClass *parent_class = NULL;
 
 
-guint
-gtk_radio_button_get_type ()
+GtkType
+gtk_radio_button_get_type (void)
 {
-  static guint radio_button_type = 0;
+  static GtkType radio_button_type = 0;
 
   if (!radio_button_type)
     {
-      GtkTypeInfo radio_button_info =
+      static const GtkTypeInfo radio_button_info =
       {
        "GtkRadioButton",
        sizeof (GtkRadioButton),
        sizeof (GtkRadioButtonClass),
        (GtkClassInitFunc) gtk_radio_button_class_init,
        (GtkObjectInitFunc) gtk_radio_button_init,
-       (GtkArgFunc) NULL,
+        /* reserved_1 */ NULL,
+       /* reserved_2 */ NULL,
+       (GtkClassInitFunc) NULL,
       };
 
       radio_button_type = gtk_type_unique (gtk_check_button_get_type (), &radio_button_info);
@@ -70,6 +90,10 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
 
   parent_class = gtk_type_class (gtk_check_button_get_type ());
 
+  gtk_object_add_arg_type ("GtkRadioButton::group", GTK_TYPE_RADIO_BUTTON, GTK_ARG_WRITABLE, ARG_GROUP);
+
+  object_class->set_arg = gtk_radio_button_set_arg;
+  object_class->get_arg = gtk_radio_button_get_arg;
   object_class->destroy = gtk_radio_button_destroy;
 
   button_class->clicked = gtk_radio_button_clicked;
@@ -80,37 +104,110 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
 static void
 gtk_radio_button_init (GtkRadioButton *radio_button)
 {
-  radio_button->group = NULL;
+  GTK_WIDGET_SET_FLAGS (radio_button, GTK_NO_WINDOW);
+  GTK_WIDGET_UNSET_FLAGS (radio_button, GTK_RECEIVES_DEFAULT);
+
+  GTK_TOGGLE_BUTTON (radio_button)->active = TRUE;
+
+  radio_button->group = g_slist_prepend (NULL, radio_button);
+
+  gtk_widget_set_state (GTK_WIDGET (radio_button), GTK_STATE_ACTIVE);
 }
 
-GtkWidget*
-gtk_radio_button_new (GSList *group)
+static void
+gtk_radio_button_set_arg (GtkObject     *object,
+                         GtkArg         *arg,
+                         guint           arg_id)
 {
   GtkRadioButton *radio_button;
-  GtkRadioButton *tmp_button;
-  GSList *tmp_list;
 
-  radio_button = gtk_type_new (gtk_radio_button_get_type ());
+  radio_button = GTK_RADIO_BUTTON (object);
 
-  tmp_list = group;
-  radio_button->group = g_slist_prepend (group, radio_button);
+  switch (arg_id)
+    {
+      GSList *slist;
+
+    case ARG_GROUP:
+      if (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);
+      break;
+    default:
+      break;
+    }
+}
 
-  if (tmp_list)
+static void
+gtk_radio_button_get_arg (GtkObject      *object,
+                         GtkArg         *arg,
+                         guint           arg_id)
+{
+  GtkRadioButton *radio_button;
+
+  radio_button = GTK_RADIO_BUTTON (object);
+
+  switch (arg_id)
     {
-      while (tmp_list)
-       {
-         tmp_button = tmp_list->data;
-         tmp_list = tmp_list->next;
+    default:
+      arg->type = GTK_TYPE_INVALID;
+      break;
+    }
+}
+
+void
+gtk_radio_button_set_group (GtkRadioButton *radio_button,
+                           GSList         *group)
+{
+  g_return_if_fail (GTK_IS_RADIO_BUTTON (radio_button));
+  g_return_if_fail (!g_slist_find (group, radio_button));
 
+  if (radio_button->group)
+    {
+      GSList *slist;
+      
+      radio_button->group = g_slist_remove (radio_button->group, radio_button);
+      
+      for (slist = radio_button->group; slist; slist = slist->next)
+       {
+         GtkRadioButton *tmp_button;
+         
+         tmp_button = slist->data;
+         
          tmp_button->group = radio_button->group;
        }
     }
-  else
+  
+  radio_button->group = g_slist_prepend (group, radio_button);
+  
+  if (group)
     {
-      GTK_TOGGLE_BUTTON (radio_button)->active = TRUE;
-      gtk_widget_set_state (GTK_WIDGET (radio_button), GTK_STATE_ACTIVE);
+      GSList *slist;
+      
+      for (slist = group; slist; slist = slist->next)
+       {
+         GtkRadioButton *tmp_button;
+         
+         tmp_button = slist->data;
+         
+         tmp_button->group = radio_button->group;
+       }
     }
 
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), group == NULL);
+}
+
+GtkWidget*
+gtk_radio_button_new (GSList *group)
+{
+  GtkRadioButton *radio_button;
+
+  radio_button = gtk_type_new (gtk_radio_button_get_type ());
+
+  if (group)
+    gtk_radio_button_set_group (radio_button, group);
+
   return GTK_WIDGET (radio_button);
 }
 
@@ -119,14 +216,37 @@ gtk_radio_button_new_with_label (GSList      *group,
                                 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;
 }
@@ -136,7 +256,7 @@ gtk_radio_button_new_from_widget (GtkRadioButton *group)
 {
   GSList *l = NULL;
   if (group)
-    l = gtk_radio_button_group (group);
+    l = gtk_radio_button_get_group (group);
   return gtk_radio_button_new (l);
 }
 
@@ -147,14 +267,34 @@ gtk_radio_button_new_with_label_from_widget (GtkRadioButton *group,
 {
   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;
@@ -168,7 +308,6 @@ gtk_radio_button_destroy (GtkObject *object)
   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);
@@ -184,6 +323,9 @@ gtk_radio_button_destroy (GtkObject *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);
 }
@@ -198,13 +340,14 @@ gtk_radio_button_clicked (GtkButton *button)
   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);
   toggle_button = GTK_TOGGLE_BUTTON (button);
   toggled = FALSE;
 
+  gtk_widget_ref (GTK_WIDGET (button));
+
   if (toggle_button->active)
     {
       tmp_button = NULL;
@@ -215,7 +358,7 @@ gtk_radio_button_clicked (GtkButton *button)
          tmp_button = tmp_list->data;
          tmp_list = tmp_list->next;
 
-         if (tmp_button->active && (tmp_button != toggle_button))
+         if (tmp_button->active && tmp_button != toggle_button)
            break;
 
          tmp_button = NULL;
@@ -255,9 +398,13 @@ gtk_radio_button_clicked (GtkButton *button)
 
   if (GTK_WIDGET_STATE (button) != new_state)
     gtk_widget_set_state (GTK_WIDGET (button), new_state);
+
   if (toggled)
     gtk_toggle_button_toggled (toggle_button);
+
   gtk_widget_queue_draw (GTK_WIDGET (button));
+
+  gtk_widget_unref (GTK_WIDGET (button));
 }
 
 static void
@@ -269,11 +416,11 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
   GtkToggleButton *toggle_button;
   GtkStateType state_type;
   GtkShadowType shadow_type;
-  GdkPoint pts[4];
-  gint width, height;
+  GdkRectangle restrict_area;
+  GdkRectangle new_area;
   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))
@@ -287,35 +434,40 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
          (state_type != GTK_STATE_PRELIGHT))
        state_type = GTK_STATE_NORMAL;
 
-      gtk_style_set_background (widget->style, widget->window, state_type);
-      gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height);
+      _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
 
-      x = CHECK_BUTTON_CLASS (widget)->indicator_spacing + GTK_CONTAINER (widget)->border_width;
-      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;
+      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);
+      restrict_area.height = widget->allocation.height - ( 2 * GTK_CONTAINER (widget)->border_width);
 
-      if (GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE)
-       shadow_type = GTK_SHADOW_IN;
-      else if ((GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT) && toggle_button->active)
+      if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
+       {
+          if (state_type != GTK_STATE_NORMAL)
+            gtk_paint_flat_box(widget->style, widget->window, state_type, 
+                               GTK_SHADOW_ETCHED_OUT,
+                               area, widget, "radiobutton",
+                               new_area.x, new_area.y,
+                               new_area.width, new_area.height);
+       }
+      
+      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;
 
-      pts[0].x = x + width / 2;
-      pts[0].y = y;
-      pts[1].x = x + width;
-      pts[1].y = y + height / 2;
-      pts[2].x = pts[0].x;
-      pts[2].y = y + height;
-      pts[3].x = x;
-      pts[3].y = pts[1].y;
-
-      gdk_draw_polygon (widget->window,
-                       widget->style->bg_gc[GTK_WIDGET_STATE (widget)],
-                       TRUE, pts, 4);
-      gtk_draw_diamond (widget->style, widget->window,
-                       GTK_WIDGET_STATE (widget), shadow_type,
-                       x, y, width, height);
+      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,
+                       state_type, shadow_type,
+                       area, widget, "radiobutton",
+                       x, y, indicator_size, indicator_size);
     }
 }