diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2019-08-16 16:47:25 +0200 |
|---|---|---|
| committer | Alberto Fanjul <albertofanjul@gmail.com> | 2019-08-20 18:58:15 +0000 |
| commit | 1b1ffac4ec8cc6c5c822d8215514abd10440f24a (patch) | |
| tree | dad42fd43195088d7d3c43f2799c01806ea175d8 | |
| parent | 1fa027ed94b3054906c18c03906b3f1d80afd672 (diff) | |
| download | glade-1b1ffac4ec8cc6c5c822d8215514abd10440f24a.tar.gz | |
gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeAdaptorChooserWidget
| -rw-r--r-- | gladeui/glade-adaptor-chooser-widget.c | 3 | ||||
| -rw-r--r-- | gladeui/glade-adaptor-chooser-widget.h | 21 |
2 files changed, 5 insertions, 19 deletions
diff --git a/gladeui/glade-adaptor-chooser-widget.c b/gladeui/glade-adaptor-chooser-widget.c index 3dcaac84..75867061 100644 --- a/gladeui/glade-adaptor-chooser-widget.c +++ b/gladeui/glade-adaptor-chooser-widget.c @@ -38,7 +38,8 @@ enum N_COLUMN }; -struct _GladeAdaptorChooserWidgetPrivate +typedef struct __GladeAdaptorChooserWidgetPrivate _GladeAdaptorChooserWidgetPrivate; +struct __GladeAdaptorChooserWidgetPrivate { GtkTreeView *treeview; GtkListStore *store; diff --git a/gladeui/glade-adaptor-chooser-widget.h b/gladeui/glade-adaptor-chooser-widget.h index d6be1556..7a1d4cd5 100644 --- a/gladeui/glade-adaptor-chooser-widget.h +++ b/gladeui/glade-adaptor-chooser-widget.h @@ -28,16 +28,8 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET (_glade_adaptor_chooser_widget_get_type ()) -#define GLADE_ADAPTOR_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET, _GladeAdaptorChooserWidget)) -#define GLADE_ADAPTOR_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET, _GladeAdaptorChooserWidgetClass)) -#define GLADE_IS_ADAPTOR_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET)) -#define GLADE_IS_ADAPTOR_CHOOSER_WIDGET_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET)) -#define GLADE_ADAPTOR_CHOOSER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET, _GladeAdaptorChooserWidgetClass)) - -typedef struct _GladeAdaptorChooserWidgetClass _GladeAdaptorChooserWidgetClass; -typedef struct _GladeAdaptorChooserWidget _GladeAdaptorChooserWidget; -typedef struct _GladeAdaptorChooserWidgetPrivate _GladeAdaptorChooserWidgetPrivate; +#define GLADE_TYPE_ADAPTOR_CHOOSER_WIDGET _glade_adaptor_chooser_widget_get_type () +G_DECLARE_DERIVABLE_TYPE (_GladeAdaptorChooserWidget, _glade_adaptor_chooser_widget, GLADE, ADAPTOR_CHOOSER_WIDGET, GtkBox) typedef enum { @@ -47,18 +39,11 @@ typedef enum GLADE_ADAPTOR_CHOOSER_WIDGET_SKIP_DEPRECATED = 1 << 3 } _GladeAdaptorChooserWidgetFlags; -struct _GladeAdaptorChooserWidgetClass +struct __GladeAdaptorChooserWidgetClass { GtkBoxClass parent_class; }; -struct _GladeAdaptorChooserWidget -{ - GtkBox parent_instance; -}; - -GType _glade_adaptor_chooser_widget_get_type (void) G_GNUC_CONST; - GtkWidget *_glade_adaptor_chooser_widget_new (_GladeAdaptorChooserWidgetFlags flags, GladeProject *project); |