Deprecate widget flag: GTK_WIDGET_VISIBLE

[~andy/gtk] / gtk / gtkradiobutton.c

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 529a025886bb85f8d9e48c6cb2f2e68a40eae91e..11e3c86d502967766d8d29ee4453ea2945aabfa7 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
@@ -100,7 +100,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
    * 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.
    *
@@ -144,10 +144,13 @@ gtk_radio_button_set_property (GObject      *object,
   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);
@@ -298,28 +301,28 @@ gtk_radio_button_new_with_mnemonic (GSList      *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
@@ -329,15 +332,27 @@ gtk_radio_button_new_with_label_from_widget (GtkRadioButton *group,
  * 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)
 {
@@ -381,9 +396,8 @@ gtk_radio_button_destroy (GtkObject *object)
     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 (gtk_radio_button_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
 }
 
 static void
@@ -454,9 +468,6 @@ gtk_radio_button_focus (GtkWidget         *widget,
 
       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);
@@ -467,6 +478,11 @@ gtk_radio_button_focus (GtkWidget         *widget,
          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)
@@ -482,7 +498,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_REALIZED (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
                {
                  new_focus = child;
                  break;
@@ -518,7 +534,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_REALIZED (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
                {
                  new_focus = child;
                  break;
@@ -670,9 +686,10 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
   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);
 
@@ -688,7 +705,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
       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)
@@ -702,7 +719,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
        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;