Translation updated by Ivar Smolin.

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

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index aca55cbd6f33ac46e929881f51346fa93a4f9f98..1c42cf127fefb8767444700893049780cde129ad 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -28,7 +28,9 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -112,7 +114,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
                                                        P_("Group"),
                                                        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;
@@ -124,7 +126,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
   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
@@ -256,6 +258,7 @@ gtk_radio_button_set_group (GtkRadioButton *radio_button,
 
   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)
     {
@@ -319,7 +322,10 @@ gtk_radio_button_new_with_mnemonic (GSList      *group,
 {
   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);
@@ -509,7 +515,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_REALIZED (child) && GTK_WIDGET_IS_SENSITIVE (child))
                {
                  new_focus = child;
                  break;
@@ -527,7 +533,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_REALIZED (child) && GTK_WIDGET_IS_SENSITIVE (child))
                {
                  new_focus = child;
                  break;
@@ -680,7 +686,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *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);
@@ -739,3 +745,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
                        x, y, indicator_size, indicator_size);
     }
 }
+
+#define __GTK_RADIO_BUTTON_C__
+#include "gtkaliasdef.c"