From 5d3c85c7e9481fb33626f71ba2e01592c9882fdc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 May 2019 00:10:48 -0400 Subject: [PATCH] radio button: Make final --- gtk/gtkradiobutton.c | 13 +++++++++++++ gtk/gtkradiobutton.h | 26 +------------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index c4d115ff9b..303f16a1f8 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -128,6 +128,19 @@ * can be used to determine if the button has been selected or deselected. */ +typedef struct _GtkRadioButtonClass GtkRadioButtonClass; + +struct _GtkRadioButton +{ + GtkCheckButton parent_instance; +}; + +struct _GtkRadioButtonClass +{ + GtkCheckButtonClass parent_class; + + void (*group_changed) (GtkRadioButton *radio_button); +}; typedef struct { diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 135ae0b0bb..eb2d74582c 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -37,34 +37,10 @@ G_BEGIN_DECLS #define GTK_TYPE_RADIO_BUTTON (gtk_radio_button_get_type ()) #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; - -struct _GtkRadioButton -{ - GtkCheckButton parent_instance; -}; - -struct _GtkRadioButtonClass -{ - GtkCheckButtonClass parent_class; - - /* 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); -}; - +typedef struct _GtkRadioButton GtkRadioButton; GDK_AVAILABLE_IN_ALL GType gtk_radio_button_get_type (void) G_GNUC_CONST;