[gtksourceview/wip/chergert/gsv-gtk4: 35/125] chooser: modernize GtkSourceStyleSchemeChooser

[Christian Hergert <chergert src gnome org>]

commit 3697f628c5908d5d4c3ec9ac1c63461ec9175000
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 9 10:36:13 2020 -0800

    chooser: modernize GtkSourceStyleSchemeChooser
    
     - Use G_DECLARE_
     - Use get_instance_private()
     - Cleanup multi-line function indentation

 gtksourceview/gtksourceautocleanups.h             |  2 --
 gtksourceview/gtksourcestyleschemechooser.h       | 22 ++++++++-------------
 gtksourceview/gtksourcestyleschemechooserbutton.c | 24 +++++++++++------------
 gtksourceview/gtksourcestyleschemechooserbutton.h | 22 +++++----------------
 gtksourceview/gtksourcestyleschemechooserwidget.c | 22 ++++++++++-----------
 gtksourceview/gtksourcestyleschemechooserwidget.h | 22 +++++----------------
 6 files changed, 39 insertions(+), 75 deletions(-)
---
diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h
index 1d6cbe49..dcfb9d31 100644
--- a/gtksourceview/gtksourceautocleanups.h
+++ b/gtksourceview/gtksourceautocleanups.h
@@ -29,8 +29,6 @@ G_BEGIN_DECLS
 #ifndef __GI_SCANNER__
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserButton, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserWidget, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceUndoManager, g_object_unref)
 
diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h
index 33870c1f..4c9e6189 100644
--- a/gtksourceview/gtksourcestyleschemechooser.h
+++ b/gtksourceview/gtksourcestyleschemechooser.h
@@ -29,12 +29,10 @@
 
 G_BEGIN_DECLS
 
-#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER                  (gtk_source_style_scheme_chooser_get_type ())
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, GtkSourceStyleSchemeChooser))
-#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_GET_IFACE(inst)       (G_TYPE_INSTANCE_GET_INTERFACE ((inst), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, GtkSourceStyleSchemeChooserInterface))
+#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER (gtk_source_style_scheme_chooser_get_type())
 
-typedef struct _GtkSourceStyleSchemeChooserInterface GtkSourceStyleSchemeChooserInterface;
+GTK_SOURCE_AVAILABLE_IN_3_16
+G_DECLARE_INTERFACE (GtkSourceStyleSchemeChooser, gtk_source_style_scheme_chooser, GTK_SOURCE, 
STYLE_SCHEME_CHOOSER, GObject)
 
 struct _GtkSourceStyleSchemeChooserInterface
 {
@@ -46,18 +44,14 @@ struct _GtkSourceStyleSchemeChooserInterface
        void                   (* set_style_scheme)       (GtkSourceStyleSchemeChooser *chooser,
                                                           GtkSourceStyleScheme        *scheme);
 
-       /* Padding */
-       gpointer padding[12];
+       /*< private >*/
+       gpointer _reserved[12];
 };
 
 GTK_SOURCE_AVAILABLE_IN_3_16
-GType                     gtk_source_style_scheme_chooser_get_type               (void) G_GNUC_CONST;
-
-GTK_SOURCE_AVAILABLE_IN_3_16
-GtkSourceStyleScheme     *gtk_source_style_scheme_chooser_get_style_scheme       
(GtkSourceStyleSchemeChooser *chooser);
-
+GtkSourceStyleScheme *gtk_source_style_scheme_chooser_get_style_scheme (GtkSourceStyleSchemeChooser 
*chooser);
 GTK_SOURCE_AVAILABLE_IN_3_16
-void                      gtk_source_style_scheme_chooser_set_style_scheme       
(GtkSourceStyleSchemeChooser *chooser,
-                                                                                  GtkSourceStyleScheme       
 *scheme);
+void                  gtk_source_style_scheme_chooser_set_style_scheme (GtkSourceStyleSchemeChooser *chooser,
+                                                                        GtkSourceStyleScheme        *scheme);
 
 G_END_DECLS
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c 
b/gtksourceview/gtksourcestyleschemechooserbutton.c
index 77d5d1b3..939a91fa 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.c
+++ b/gtksourceview/gtksourcestyleschemechooserbutton.c
@@ -52,16 +52,14 @@ typedef struct
        GtkSourceStyleSchemeChooserWidget *chooser;
 } GtkSourceStyleSchemeChooserButtonPrivate;
 
-static void gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init 
(GtkSourceStyleSchemeChooserInterface *iface);
+static void style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GtkSourceStyleSchemeChooserButton,
                          gtk_source_style_scheme_chooser_button,
                          GTK_TYPE_BUTTON,
                          G_ADD_PRIVATE (GtkSourceStyleSchemeChooserButton)
                          G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER,
-                                                
gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init))
-
-#define GET_PRIV(o) gtk_source_style_scheme_chooser_button_get_instance_private (o)
+                                                style_scheme_chooser_interface_init))
 
 enum
 {
@@ -73,7 +71,7 @@ static void
 gtk_source_style_scheme_chooser_button_dispose (GObject *object)
 {
        GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (object);
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
 
        g_clear_object (&priv->scheme);
 
@@ -132,7 +130,7 @@ dialog_destroy (GtkWidget *widget,
                 gpointer   data)
 {
        GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (data);
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
 
        priv->dialog = NULL;
        priv->chooser = NULL;
@@ -152,7 +150,7 @@ dialog_response (GtkDialog *dialog,
        else if (response == GTK_RESPONSE_OK)
        {
                GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (data);
-               GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+               GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
                GtkSourceStyleScheme *scheme;
 
                scheme = gtk_source_style_scheme_chooser_get_style_scheme (GTK_SOURCE_STYLE_SCHEME_CHOOSER 
(priv->chooser));
@@ -168,7 +166,7 @@ dialog_response (GtkDialog *dialog,
 static void
 ensure_dialog (GtkSourceStyleSchemeChooserButton *button)
 {
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
        GtkWidget *parent, *dialog, *scrolled_window;
        GtkWidget *content_area;
 
@@ -225,7 +223,7 @@ static void
 gtk_source_style_scheme_chooser_button_clicked (GtkButton *button)
 {
        GtkSourceStyleSchemeChooserButton *cbutton = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (button);
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (cbutton);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (cbutton);
 
        ensure_dialog (cbutton);
 
@@ -260,7 +258,7 @@ static GtkSourceStyleScheme *
 gtk_source_style_scheme_chooser_button_get_style_scheme (GtkSourceStyleSchemeChooser *chooser)
 {
        GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (chooser);
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
 
        return priv->scheme;
 }
@@ -268,7 +266,7 @@ gtk_source_style_scheme_chooser_button_get_style_scheme (GtkSourceStyleSchemeCho
 static void
 gtk_source_style_scheme_chooser_button_update_label (GtkSourceStyleSchemeChooserButton *button)
 {
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
        const gchar *label;
 
        label = priv->scheme != NULL ? gtk_source_style_scheme_get_name (priv->scheme) : NULL;
@@ -280,7 +278,7 @@ gtk_source_style_scheme_chooser_button_set_style_scheme (GtkSourceStyleSchemeCho
                                                          GtkSourceStyleScheme        *scheme)
 {
        GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (chooser);
-       GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button);
+       GtkSourceStyleSchemeChooserButtonPrivate *priv = 
gtk_source_style_scheme_chooser_button_get_instance_private (button);
 
        if (g_set_object (&priv->scheme, scheme))
        {
@@ -291,7 +289,7 @@ gtk_source_style_scheme_chooser_button_set_style_scheme (GtkSourceStyleSchemeCho
 }
 
 static void
-gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init 
(GtkSourceStyleSchemeChooserInterface *iface)
+style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface)
 {
        iface->get_style_scheme = gtk_source_style_scheme_chooser_button_get_style_scheme;
        iface->set_style_scheme = gtk_source_style_scheme_chooser_button_set_style_scheme;
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h 
b/gtksourceview/gtksourcestyleschemechooserbutton.h
index 5b53dafb..c515b26a 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.h
+++ b/gtksourceview/gtksourcestyleschemechooserbutton.h
@@ -30,32 +30,20 @@
 
 G_BEGIN_DECLS
 
-#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON            
(gtk_source_style_scheme_chooser_button_get_type())
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButton))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_CONST(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButton const))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButtonClass))
-#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON))
-#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButtonClass))
-
-typedef struct _GtkSourceStyleSchemeChooserButtonClass GtkSourceStyleSchemeChooserButtonClass;
-
-struct _GtkSourceStyleSchemeChooserButton
-{
-       GtkButton parent;
-};
+#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON (gtk_source_style_scheme_chooser_button_get_type())
 
 struct _GtkSourceStyleSchemeChooserButtonClass
 {
        GtkButtonClass parent;
 
-       gpointer padding[10];
+       /*< private >*/
+       gpointer _reserved[10];
 };
 
 GTK_SOURCE_AVAILABLE_IN_3_16
-GType                 gtk_source_style_scheme_chooser_button_get_type              (void);
+G_DECLARE_DERIVABLE_TYPE (GtkSourceStyleSchemeChooserButton, gtk_source_style_scheme_chooser_button, 
GTK_SOURCE, STYLE_SCHEME_CHOOSER_BUTTON, GtkButton)
 
 GTK_SOURCE_AVAILABLE_IN_3_16
-GtkWidget            *gtk_source_style_scheme_chooser_button_new                   (void);
+GtkWidget *gtk_source_style_scheme_chooser_button_new (void);
 
 G_END_DECLS
diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.c 
b/gtksourceview/gtksourcestyleschemechooserwidget.c
index 91025a35..0f00adf5 100644
--- a/gtksourceview/gtksourcestyleschemechooserwidget.c
+++ b/gtksourceview/gtksourcestyleschemechooserwidget.c
@@ -54,16 +54,14 @@ typedef struct
        GtkSourceStyleScheme *scheme;
 } GtkSourceStyleSchemeChooserWidgetPrivate;
 
-static void gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init 
(GtkSourceStyleSchemeChooserInterface *iface);
+static void style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GtkSourceStyleSchemeChooserWidget,
                          gtk_source_style_scheme_chooser_widget,
                          GTK_TYPE_BIN,
                          G_ADD_PRIVATE (GtkSourceStyleSchemeChooserWidget)
                          G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER,
-                                                
gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init))
-
-#define GET_PRIV(o) gtk_source_style_scheme_chooser_widget_get_instance_private (o)
+                                                style_scheme_chooser_interface_init))
 
 enum
 {
@@ -75,7 +73,7 @@ static void
 gtk_source_style_scheme_chooser_widget_dispose (GObject *object)
 {
        GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (object);
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
 
        g_clear_object (&priv->scheme);
 
@@ -184,7 +182,7 @@ on_row_selected (GtkListBox                        *list_box,
                  GtkListBoxRow                     *row,
                  GtkSourceStyleSchemeChooserWidget *widget)
 {
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
 
        if (row != NULL)
        {
@@ -201,7 +199,7 @@ on_row_selected (GtkListBox                        *list_box,
 
 static void
 destroy_child_cb (GtkWidget *widget,
-                 gpointer   data)
+                  gpointer   data)
 {
        gtk_widget_destroy (widget);
 }
@@ -209,7 +207,7 @@ destroy_child_cb (GtkWidget *widget,
 static void
 gtk_source_style_scheme_chooser_widget_populate (GtkSourceStyleSchemeChooserWidget *widget)
 {
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
        GtkSourceLanguageManager *lm;
        GtkSourceLanguage *lang;
        GtkSourceStyleSchemeManager *manager;
@@ -267,7 +265,7 @@ on_scheme_ids_changed (GtkSourceStyleSchemeManager       *manager,
 static void
 gtk_source_style_scheme_chooser_widget_init (GtkSourceStyleSchemeChooserWidget *widget)
 {
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
        GtkSourceStyleSchemeManager *manager;
 
        priv->list_box = GTK_LIST_BOX (gtk_list_box_new ());
@@ -296,7 +294,7 @@ static GtkSourceStyleScheme *
 gtk_source_style_scheme_chooser_widget_get_style_scheme (GtkSourceStyleSchemeChooser *chooser)
 {
        GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (chooser);
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
 
        return priv->scheme;
 }
@@ -306,7 +304,7 @@ gtk_source_style_scheme_chooser_widget_set_style_scheme (GtkSourceStyleSchemeCho
                                                          GtkSourceStyleScheme        *scheme)
 {
        GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (chooser);
-       GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget);
+       GtkSourceStyleSchemeChooserWidgetPrivate *priv = 
gtk_source_style_scheme_chooser_widget_get_instance_private (widget);
 
        if (g_set_object (&priv->scheme, scheme))
        {
@@ -338,7 +336,7 @@ gtk_source_style_scheme_chooser_widget_set_style_scheme (GtkSourceStyleSchemeCho
 }
 
 static void
-gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init 
(GtkSourceStyleSchemeChooserInterface *iface)
+style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface)
 {
        iface->get_style_scheme = gtk_source_style_scheme_chooser_widget_get_style_scheme;
        iface->set_style_scheme = gtk_source_style_scheme_chooser_widget_set_style_scheme;
diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.h 
b/gtksourceview/gtksourcestyleschemechooserwidget.h
index 77a5e7b0..ceb9320b 100644
--- a/gtksourceview/gtksourcestyleschemechooserwidget.h
+++ b/gtksourceview/gtksourcestyleschemechooserwidget.h
@@ -30,32 +30,20 @@
 
 G_BEGIN_DECLS
 
-#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET            
(gtk_source_style_scheme_chooser_widget_get_type())
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidget))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_CONST(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidget const))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidgetClass))
-#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET))
-#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET))
-#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  
GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidgetClass))
-
-typedef struct _GtkSourceStyleSchemeChooserWidgetClass GtkSourceStyleSchemeChooserWidgetClass;
-
-struct _GtkSourceStyleSchemeChooserWidget
-{
-       GtkBin parent;
-};
+#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET (gtk_source_style_scheme_chooser_widget_get_type())
 
 struct _GtkSourceStyleSchemeChooserWidgetClass
 {
        GtkBinClass parent;
 
-       gpointer padding[10];
+       /*< private >*/
+       gpointer _reserved[10];
 };
 
 GTK_SOURCE_AVAILABLE_IN_3_16
-GType        gtk_source_style_scheme_chooser_widget_get_type              (void);
+G_DECLARE_DERIVABLE_TYPE (GtkSourceStyleSchemeChooserWidget, gtk_source_style_scheme_chooser_widget, 
GTK_SOURCE, STYLE_SCHEME_CHOOSER_WIDGET, GtkBin)
 
 GTK_SOURCE_AVAILABLE_IN_3_16
-GtkWidget   *gtk_source_style_scheme_chooser_widget_new                   (void);
+GtkWidget *gtk_source_style_scheme_chooser_widget_new (void);
 
 G_END_DECLS