X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkradiobutton.h;h=b4121a66e47bd93c32dd98d4d3771f8695c71da3;hb=79695ee64d41c9aadfe2c6f18dc7dd1e3fd44852;hp=df91ddfe83ec4ebc9ff316f357d3b4f7e6f723e1;hpb=0176b387c85a150b7d6fdac22be6db627d523217;p=~andy%2Fgtk

diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index df91ddfe8..b4121a66e 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -12,70 +12,81 @@
  * 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/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_RADIO_BUTTON_H__
 #define __GTK_RADIO_BUTTON_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkcheckbutton.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#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;
-typedef struct _GtkRadioButtonClass  GtkRadioButtonClass;
+typedef struct _GtkRadioButton              GtkRadioButton;
+typedef struct _GtkRadioButtonPrivate       GtkRadioButtonPrivate;
+typedef struct _GtkRadioButtonClass         GtkRadioButtonClass;
 
 struct _GtkRadioButton
 {
   GtkCheckButton check_button;
-  
-  GSList *group;
+
+  /*< private >*/
+  GtkRadioButtonPrivate *priv;
 };
 
 struct _GtkRadioButtonClass
 {
   GtkCheckButtonClass parent_class;
-};
-
 
-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);
+  /* Signals */
+  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);
+};
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+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 *radio_group_member);
+GtkWidget* gtk_radio_button_new_with_label                (GSList         *group,
+                                                           const gchar    *label);
+GtkWidget* gtk_radio_button_new_with_label_from_widget    (GtkRadioButton *radio_group_member,
+                                                           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 *radio_group_member,
+                                                           const gchar    *label);
+GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
+void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
+                                                           GSList         *group);
+void            gtk_radio_button_join_group        (GtkRadioButton        *radio_button,
+                                                    GtkRadioButton        *group_source);
+G_END_DECLS
 
 #endif /* __GTK_RADIO_BUTTON_H__ */