gtkiconview: Use symbolic names for button numbers

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

diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index b1569d859e2649e32f450ded07ddde6b7945e4d3..2fe40c69afc98784be25947e0a702ab562623382 100644 (file)
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -32,7 +32,6 @@
 #define __GTK_RADIO_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcheckbutton.h>
 
 
@@ -46,14 +45,16 @@ G_BEGIN_DECLS
 #define GTK_RADIO_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
 
 
-typedef struct _GtkRadioButton      GtkRadioButton;
-typedef struct _GtkRadioButtonClass  GtkRadioButtonClass;
+typedef struct _GtkRadioButton              GtkRadioButton;
+typedef struct _GtkRadioButtonPrivate       GtkRadioButtonPrivate;
+typedef struct _GtkRadioButtonClass         GtkRadioButtonClass;
 
 struct _GtkRadioButton
 {
   GtkCheckButton check_button;
 
-  GSList *GSEAL (group);
+  /*< private >*/
+  GtkRadioButtonPrivate *priv;
 };
 
 struct _GtkRadioButtonClass
@@ -64,6 +65,7 @@ struct _GtkRadioButtonClass
   void (*group_changed) (GtkRadioButton *radio_button);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
@@ -85,11 +87,8 @@ GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio
 GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
 void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
                                                            GSList         *group);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_radio_button_group gtk_radio_button_get_group
-#endif
-
+void            gtk_radio_button_join_group        (GtkRadioButton        *radio_button,
+                                                    GtkRadioButton        *group_source);
 G_END_DECLS
 
 #endif /* __GTK_RADIO_BUTTON_H__ */