Improve wording. String change! (#355128, David Lodge)

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

diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index df91ddfe83ec4ebc9ff316f357d3b4f7e6f723e1..6f7ce3a1efbf00c1efdb5dd5d0cbebcc461ae2d6 100644 (file)
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -32,17 +32,14 @@
 #include <gtk/gtkcheckbutton.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_RADIO_BUTTON                 (gtk_radio_button_get_type ())
-#define GTK_RADIO_BUTTON(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton))
-#define GTK_RADIO_BUTTON_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
-#define GTK_IS_RADIO_BUTTON(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_RADIO_BUTTON))
-#define GTK_IS_RADIO_BUTTON_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_BUTTON))
-#define GTK_RADIO_BUTTON_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
+#define GTK_RADIO_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton))
+#define GTK_RADIO_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
+#define GTK_IS_RADIO_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON))
+#define GTK_IS_RADIO_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_BUTTON))
+#define GTK_RADIO_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
 
 
 typedef struct _GtkRadioButton      GtkRadioButton;
@@ -58,24 +55,37 @@ struct _GtkRadioButton
 struct _GtkRadioButtonClass
 {
   GtkCheckButtonClass parent_class;
+
+  /* Signals */
+  void (*group_changed) (GtkRadioButton *radio_button);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType            gtk_radio_button_get_type        (void) G_GNUC_CONST;
-GtkWidget*  gtk_radio_button_new            (GSList         *group);
-GtkWidget*  gtk_radio_button_new_from_widget (GtkRadioButton *group);
-GtkWidget*  gtk_radio_button_new_with_label  (GSList        *group,
-                                             const gchar    *label);
-GtkWidget*  gtk_radio_button_new_with_label_from_widget (GtkRadioButton *group,
-                                                        const gchar    *label);
-GSList*            gtk_radio_button_group           (GtkRadioButton *radio_button);
-void       gtk_radio_button_set_group       (GtkRadioButton *radio_button,
-                                             GSList         *group);
+GType     gtk_radio_button_get_type         (void) G_GNUC_CONST;
 
+GtkWidget* gtk_radio_button_new                           (GSList         *group);
+GtkWidget* gtk_radio_button_new_from_widget               (GtkRadioButton *group);
+GtkWidget* gtk_radio_button_new_with_label                (GSList         *group,
+                                                           const gchar    *label);
+GtkWidget* gtk_radio_button_new_with_label_from_widget    (GtkRadioButton *group,
+                                                           const gchar    *label);
+GtkWidget* gtk_radio_button_new_with_mnemonic             (GSList         *group,
+                                                           const gchar    *label);
+GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *group,
+                                                           const gchar    *label);
+GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
+void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
+                                                           GSList         *group);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_radio_button_group gtk_radio_button_get_group
+#endif
 
+G_END_DECLS
 
 #endif /* __GTK_RADIO_BUTTON_H__ */