X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkradiobutton.h;h=b4121a66e47bd93c32dd98d4d3771f8695c71da3;hb=HEAD;hp=3e7abf81d43ab6edf276d13c697f8246cbe2b619;hpb=57223c9a056bfff1635ddd1e67f660cd5a61e9ff;p=~andy%2Fgtk

diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 3e7abf81d..b4121a66e 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,15 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_RADIO_BUTTON_H__
 #define __GTK_RADIO_BUTTON_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcheckbutton.h>
 
 
@@ -46,14 +43,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 +63,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 +85,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__ */