diff options
Diffstat (limited to 'gladeui')
-rw-r--r-- | gladeui/glade-editable.c | 6 | ||||
-rw-r--r-- | gladeui/glade-editable.h | 16 | ||||
-rw-r--r-- | gladeui/glade-editor-property.c | 8 | ||||
-rw-r--r-- | gladeui/glade-editor-skeleton.c | 10 | ||||
-rw-r--r-- | gladeui/glade-editor-table.c | 4 | ||||
-rw-r--r-- | gladeui/glade-property-label.c | 10 | ||||
-rw-r--r-- | gladeui/glade-property-shell.c | 10 |
7 files changed, 27 insertions, 37 deletions
diff --git a/gladeui/glade-editable.c b/gladeui/glade-editable.c index dfad7aee..de345eec 100644 --- a/gladeui/glade-editable.c +++ b/gladeui/glade-editable.c @@ -104,7 +104,7 @@ glade_editable_load_default (GladeEditable *editable, } static void -glade_editable_default_init (GladeEditableIface *iface) +glade_editable_default_init (GladeEditableInterface *iface) { glade_editable_project_quark = g_quark_from_static_string ("glade-editable-project-quark"); glade_editable_widget_quark = g_quark_from_static_string ("glade-editable-widget-quark"); @@ -126,7 +126,7 @@ glade_editable_default_init (GladeEditableIface *iface) void glade_editable_load (GladeEditable *editable, GladeWidget *widget) { - GladeEditableIface *iface; + GladeEditableInterface *iface; g_return_if_fail (GLADE_IS_EDITABLE (editable)); g_return_if_fail (widget == NULL || GLADE_IS_WIDGET (widget)); @@ -165,7 +165,7 @@ glade_editable_load (GladeEditable *editable, GladeWidget *widget) void glade_editable_set_show_name (GladeEditable *editable, gboolean show_name) { - GladeEditableIface *iface; + GladeEditableInterface *iface; g_return_if_fail (GLADE_IS_EDITABLE (editable)); iface = GLADE_EDITABLE_GET_IFACE (editable); diff --git a/gladeui/glade-editable.h b/gladeui/glade-editable.h index f578ebe3..509a6931 100644 --- a/gladeui/glade-editable.h +++ b/gladeui/glade-editable.h @@ -6,16 +6,8 @@ G_BEGIN_DECLS -#define GLADE_TYPE_EDITABLE (glade_editable_get_type ()) -#define GLADE_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EDITABLE, GladeEditable)) -#define GLADE_EDITABLE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GLADE_TYPE_EDITABLE, GladeEditableInterface)) -#define GLADE_IS_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EDITABLE)) -#define GLADE_EDITABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GLADE_TYPE_EDITABLE, GladeEditableInterface)) - - -typedef struct _GladeEditable GladeEditable; /* Dummy typedef */ -typedef struct _GladeEditableIface GladeEditableInterface; /* used by G_DEFINE_INTERFACE */ -typedef struct _GladeEditableIface GladeEditableIface; /* keep this symbol for binary compatibility */ +#define GLADE_TYPE_EDITABLE glade_editable_get_type () +G_DECLARE_INTERFACE (GladeEditable, glade_editable, GLADE, EDITABLE, GtkWidget) typedef enum { @@ -28,7 +20,7 @@ typedef enum } GladeEditorPageType; -struct _GladeEditableIface +struct _GladeEditableInterface { GTypeInterface g_iface; @@ -39,8 +31,6 @@ struct _GladeEditableIface gboolean show_name); }; -GType glade_editable_get_type (void) G_GNUC_CONST; - void glade_editable_load (GladeEditable *editable, GladeWidget *widget); void glade_editable_set_show_name (GladeEditable *editable, diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index 4a15fb76..657beff0 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -111,9 +111,9 @@ struct _GladeEditorPropertyPrivate guint disable_check : 1; /* Whether to explicitly disable the optional check button */ }; -static void glade_editor_property_editable_init (GladeEditableIface *iface); +static void glade_editor_property_editable_init (GladeEditableInterface *iface); -static GladeEditableIface *parent_editable_iface; +static GladeEditableInterface *parent_editable_iface; G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BOX, G_ADD_PRIVATE (GladeEditorProperty) @@ -122,7 +122,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BO /******************************************************************************* - * GladeEditableIface * + * GladeEditableInterface * *******************************************************************************/ static void glade_editor_property_editable_load (GladeEditable *editable, @@ -140,7 +140,7 @@ glade_editor_property_set_show_name (GladeEditable *editable, gboolean show_name } static void -glade_editor_property_editable_init (GladeEditableIface *iface) +glade_editor_property_editable_init (GladeEditableInterface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); diff --git a/gladeui/glade-editor-skeleton.c b/gladeui/glade-editor-skeleton.c index 3dd4c491..1d987b1d 100644 --- a/gladeui/glade-editor-skeleton.c +++ b/gladeui/glade-editor-skeleton.c @@ -34,8 +34,8 @@ /* GObjectClass */ static void glade_editor_skeleton_dispose (GObject *object); -/* GladeEditableIface */ -static void glade_editor_skeleton_editable_init (GladeEditableIface *iface); +/* GladeEditableInterface */ +static void glade_editor_skeleton_editable_init (GladeEditableInterface *iface); /* GtkBuildableIface */ static void glade_editor_skeleton_buildable_init (GtkBuildableIface *iface); @@ -47,7 +47,7 @@ struct _GladeEditorSkeletonPrivate GSList *editors; }; -static GladeEditableIface *parent_editable_iface; +static GladeEditableInterface *parent_editable_iface; static GtkBuildableIface *parent_buildable_iface; G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BOX, @@ -90,7 +90,7 @@ glade_editor_skeleton_dispose (GObject *object) } /******************************************************************************* - * GladeEditableIface * + * GladeEditableInterface * *******************************************************************************/ static void glade_editor_skeleton_load (GladeEditable *editable, @@ -127,7 +127,7 @@ glade_editor_skeleton_set_show_name (GladeEditable *editable, gboolean show_name } static void -glade_editor_skeleton_editable_init (GladeEditableIface *iface) +glade_editor_skeleton_editable_init (GladeEditableInterface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c index ac216c02..d03d4aee 100644 --- a/gladeui/glade-editor-table.c +++ b/gladeui/glade-editor-table.c @@ -51,7 +51,7 @@ static void glade_editor_table_set_property (GObject *object, const GValue *value, GParamSpec *pspec); -static void glade_editor_table_editable_init (GladeEditableIface *iface); +static void glade_editor_table_editable_init (GladeEditableInterface *iface); static void glade_editor_table_realize (GtkWidget *widget); static void glade_editor_table_grab_focus (GtkWidget *widget); @@ -447,7 +447,7 @@ glade_editor_table_set_show_name (GladeEditable *editable, gboolean show_name) } static void -glade_editor_table_editable_init (GladeEditableIface *iface) +glade_editor_table_editable_init (GladeEditableInterface *iface) { iface->load = glade_editor_table_load; iface->set_show_name = glade_editor_table_set_show_name; diff --git a/gladeui/glade-property-label.c b/gladeui/glade-property-label.c index 06e995f6..3f1b4259 100644 --- a/gladeui/glade-property-label.c +++ b/gladeui/glade-property-label.c @@ -47,8 +47,8 @@ static void glade_property_label_get_real_property (GObject *object static gint glade_property_label_button_press (GtkWidget *widget, GdkEventButton *event); -/* GladeEditableIface */ -static void glade_property_label_editable_init (GladeEditableIface *iface); +/* GladeEditableInterface */ +static void glade_property_label_editable_init (GladeEditableInterface *iface); struct _GladePropertyLabelPrivate { @@ -81,7 +81,7 @@ enum { PROP_CUSTOM_TOOLTIP, }; -static GladeEditableIface *parent_editable_iface; +static GladeEditableInterface *parent_editable_iface; G_DEFINE_TYPE_WITH_CODE (GladePropertyLabel, glade_property_label, GTK_TYPE_EVENT_BOX, G_ADD_PRIVATE (GladePropertyLabel) @@ -259,7 +259,7 @@ glade_property_label_get_real_property (GObject *object, } /******************************************************************************* - * GladeEditableIface * + * GladeEditableInterface * *******************************************************************************/ static void glade_property_label_load (GladeEditable *editable, @@ -295,7 +295,7 @@ glade_property_label_set_show_name (GladeEditable *editable, gboolean show_name) } static void -glade_property_label_editable_init (GladeEditableIface *iface) +glade_property_label_editable_init (GladeEditableInterface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); diff --git a/gladeui/glade-property-shell.c b/gladeui/glade-property-shell.c index 7d4c2269..a7fec340 100644 --- a/gladeui/glade-property-shell.c +++ b/gladeui/glade-property-shell.c @@ -43,8 +43,8 @@ static void glade_property_shell_get_real_property (GObject *object, GValue *value, GParamSpec *pspec); -/* GladeEditableIface */ -static void glade_property_shell_editable_init (GladeEditableIface *iface); +/* GladeEditableInterface */ +static void glade_property_shell_editable_init (GladeEditableInterface *iface); struct _GladePropertyShellPrivate { @@ -82,7 +82,7 @@ enum static guint glade_property_shell_signals[LAST_SIGNAL] = { 0, }; -static GladeEditableIface *parent_editable_iface; +static GladeEditableInterface *parent_editable_iface; G_DEFINE_TYPE_WITH_CODE (GladePropertyShell, glade_property_shell, GTK_TYPE_BOX, G_ADD_PRIVATE (GladePropertyShell) @@ -270,7 +270,7 @@ glade_property_shell_get_real_property (GObject *object, } /******************************************************************************* - * GladeEditableIface * + * GladeEditableInterface * *******************************************************************************/ static void propagate_pre_commit (GladeEditorProperty *property, @@ -412,7 +412,7 @@ glade_property_shell_set_show_name (GladeEditable *editable, gboolean show_name) } static void -glade_property_shell_editable_init (GladeEditableIface *iface) +glade_property_shell_editable_init (GladeEditableInterface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); |