X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkradiomenuitem.h;h=2adb5636d00cf46cefe3691c65a3f25dfb943046;hb=898385a3e094c4a1f4c5241feb765aefe592a108;hp=9b2b28a6a44a0fd4fbc7c33039b45a8ad638c5ac;hpb=afee2c67c5091539cbe6270b14e7e74b2a7b60a7;p=~andy%2Fgtk

diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index 9b2b28a6a..2adb5636d 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -31,18 +31,14 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkcheckmenuitem.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_RADIO_MENU_ITEM	      (gtk_radio_menu_item_get_type ())
-#define GTK_RADIO_MENU_ITEM(obj)	      (GTK_CHECK_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem))
-#define GTK_RADIO_MENU_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
-#define GTK_IS_RADIO_MENU_ITEM(obj)	      (GTK_CHECK_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_IS_RADIO_MENU_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_RADIO_MENU_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
+#define GTK_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem))
+#define GTK_RADIO_MENU_ITEM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
+#define GTK_IS_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM))
+#define GTK_IS_RADIO_MENU_ITEM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM))
+#define GTK_RADIO_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
 
 
 typedef struct _GtkRadioMenuItem       GtkRadioMenuItem;
@@ -58,21 +54,37 @@ struct _GtkRadioMenuItem
 struct _GtkRadioMenuItemClass
 {
   GtkCheckMenuItemClass parent_class;
-};
-
-
-GtkType    gtk_radio_menu_item_get_type	      (void);
-GtkWidget* gtk_radio_menu_item_new	      (GSList		*group);
-GtkWidget* gtk_radio_menu_item_new_with_label (GSList		*group,
-					       const gchar	*label);
-GSList*	   gtk_radio_menu_item_group	      (GtkRadioMenuItem *radio_menu_item);
-void	   gtk_radio_menu_item_set_group      (GtkRadioMenuItem *radio_menu_item,
-					       GSList		*group);
+  
+  /* Signals */
+  void (*group_changed) (GtkRadioMenuItem *radio_menu_item);
 
+  /* Padding for future expansion */
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+GType      gtk_radio_menu_item_get_type	         (void) G_GNUC_CONST;
+							
+GtkWidget* gtk_radio_menu_item_new                           (GSList           *group);
+GtkWidget* gtk_radio_menu_item_new_with_label                (GSList           *group,
+							      const gchar      *label);
+GtkWidget* gtk_radio_menu_item_new_with_mnemonic             (GSList           *group,
+							      const gchar      *label);
+GtkWidget* gtk_radio_menu_item_new_from_widget               (GtkRadioMenuItem *group);
+GtkWidget *gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+							      const gchar      *label);
+GtkWidget *gtk_radio_menu_item_new_with_label_from_widget    (GtkRadioMenuItem *group,
+							      const gchar      *label);
+GSList*    gtk_radio_menu_item_get_group                     (GtkRadioMenuItem *radio_menu_item);
+void       gtk_radio_menu_item_set_group                     (GtkRadioMenuItem *radio_menu_item,
+							      GSList           *group);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_radio_menu_item_group gtk_radio_menu_item_get_group
+#endif
+
+G_END_DECLS
 
 #endif /* __GTK_RADIO_MENU_ITEM_H__ */