diff options
author | Tristan Van Berkom <tvb@src.gnome.org> | 2008-12-09 18:46:04 +0000 |
---|---|---|
committer | Tristan Van Berkom <tvb@src.gnome.org> | 2008-12-09 18:46:04 +0000 |
commit | 0c97337671d8d711937c0b74adef86e405111ba1 (patch) | |
tree | 8b004f3552e16c5d964c811287055d828b7e5fe4 /gladeui/glade-widget-adaptor.h | |
parent | a2a5cd045b14b6d92a5a368d642ec3852486b40a (diff) | |
download | glade-0c97337671d8d711937c0b74adef86e405111ba1.tar.gz |
Bumping gtk+ required version to 2.14
* configure.ac: Bumping gtk+ required version to 2.14
* gladeui/glade-xml-utils.c, gladeui/glade-widget-adaptor.[ch],
gladeui/glade-property-class.[ch], gladeui/glade-project.c: Added support
for "builder-since" versioning (since builder supported this property/widget).
* plugins/gtk+/gtk+.xml.in: Marked appropriate properties and objects "builder-since"
and brought up to date new properties and signals introduced in 2.14.
* gladeui/glade-base-editor.c: Plugged resource leak in finalize().
svn path=/trunk/; revision=2060
Diffstat (limited to 'gladeui/glade-widget-adaptor.h')
-rw-r--r-- | gladeui/glade-widget-adaptor.h | 83 |
1 files changed, 52 insertions, 31 deletions
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h index 2fde45db..ac184d4e 100644 --- a/gladeui/glade-widget-adaptor.h +++ b/gladeui/glade-widget-adaptor.h @@ -67,8 +67,8 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * * Checks major version in which this widget was introduced */ -#define GWA_VERSION_SINCE_MAJOR(obj) \ - ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_major : FALSE) +#define GWA_VERSION_SINCE_MAJOR(obj) \ + ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_major : 0) /** * GWA_VERSION_SINCE_MINOR: @@ -76,8 +76,27 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * * Checks minor version in which this widget was introduced */ -#define GWA_VERSION_SINCE_MINOR(obj) \ - ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_minor : FALSE) +#define GWA_VERSION_SINCE_MINOR(obj) \ + ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->version_since_minor : 0) + +/** + * GWA_BUILDER_SINCE_MAJOR: + * @obj: A #GladeWidgetAdaptor + * + * Checks major version in which this widget introduced gtkbuilder support + */ +#define GWA_BUILDER_SINCE_MAJOR(obj) \ + ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->builder_since_major : 0) + +/** + * GWA_BUILDER_SINCE_MINOR: + * @obj: A #GladeWidgetAdaptor + * + * Checks minor version in which this widget introduced gtkbuilder support + */ +#define GWA_BUILDER_SINCE_MINOR(obj) \ + ((obj) ? GLADE_WIDGET_ADAPTOR_GET_CLASS(obj)->builder_since_minor : 0) + /** * GWA_IS_TOPLEVEL: @@ -590,29 +609,31 @@ struct _GladeWidgetAdaptorClass { GObjectClass parent_class; - gint version_since_major; /* Version in which this widget was - * introduced - */ - gint version_since_minor; - - gboolean deprecated; /* If this widget is currently - * deprecated - */ - gboolean libglade_unsupported; /* If this widget is not supported - * by libglade - */ - gboolean libglade_only; /* If this widget is only supported - * by libglade - */ + guint16 version_since_major; /* Version in which this widget was */ + guint16 version_since_minor; /* introduced. */ - gboolean fixed; /* If this is a GtkContainer, use free-form - * placement with drag/resize/paste at mouse... - */ - gboolean toplevel; /* If this class is toplevel */ + guint16 builder_since_major; /* Version in which this widget became */ + guint16 builder_since_minor; /* available in GtkBuilder format */ - gboolean use_placeholders; /* Whether or not to use placeholders - * to interface with child widgets. - */ + + guint deprecated : 1; /* If this widget is currently + * deprecated + */ + guint libglade_unsupported : 1; /* If this widget is not supported + * by libglade + */ + guint libglade_only : 1; /* If this widget is only supported + * by libglade + */ + + guint fixed : 1; /* If this is a Container, use free-form + * placement with drag/resize/paste at mouse... + */ + guint toplevel : 1; /* If this class is toplevel */ + + guint use_placeholders : 1; /* Whether or not to use placeholders + * to interface with child widgets. + */ gint default_width; /* Default width in GladeDesignLayout */ gint default_height; /* Default height in GladeDesignLayout */ @@ -673,12 +694,12 @@ struct _GladeWidgetAdaptorClass GladeChildSetPropertyFunc child_set_property; /* Sets/Gets a packing property */ GladeChildGetPropertyFunc child_get_property; /* for this child */ - GladeReplaceChildFunc replace_child; /* This method replaces a - * child widget with - * another one: it's used to - * replace a placeholder with - * a widget and viceversa. - */ + GladeReplaceChildFunc replace_child; /* This method replaces a + * child widget with + * another one: it's used to + * replace a placeholder with + * a widget and viceversa. + */ GladeActionActivateFunc action_activate; /* This method is used to catch actions */ GladeChildActionActivateFunc child_action_activate; /* This method is used to catch packing actions */ |