brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout-manager: Add a private struct to hold future properties

Browse Source 
In order to allow the abstract ClutterLayoutManager class to have own
GObject properties we'll need a private structure.

https://bugzilla.gnome.org/show_bug.cgi?id=676827
This commit is contained in:
Bastian Winkler 2012-05-24 14:26:57 +02:00
parent f9c29d5067
commit 734720ef0f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-layout-manager.c
View File

@ -345,6 +345,11 @@
G_OBJECT_TYPE_NAME (_obj), \ G_OBJECT_TYPE_NAME (_obj), \
(method)); } G_STMT_END (method)); } G_STMT_END
struct _ClutterLayoutManagerPrivate
{
gpointer dummy;
};
enum enum
{ {
LAYOUT_CHANGED, LAYOUT_CHANGED,
@ -585,6 +590,8 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
quark_layout_alpha = quark_layout_alpha =
g_quark_from_static_string ("clutter-layout-manager-alpha"); g_quark_from_static_string ("clutter-layout-manager-alpha");
g_type_class_add_private (klass, sizeof (ClutterLayoutManagerPrivate));
klass->get_preferred_width = layout_manager_real_get_preferred_width; klass->get_preferred_width = layout_manager_real_get_preferred_width;
klass->get_preferred_height = layout_manager_real_get_preferred_height; klass->get_preferred_height = layout_manager_real_get_preferred_height;
klass->allocate = layout_manager_real_allocate; klass->allocate = layout_manager_real_allocate;
@ -638,6 +645,9 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
static void static void
clutter_layout_manager_init (ClutterLayoutManager *manager) clutter_layout_manager_init (ClutterLayoutManager *manager)
{ {
manager->priv =
G_TYPE_INSTANCE_GET_PRIVATE (manager, CLUTTER_TYPE_LAYOUT_MANAGER,
ClutterLayoutManagerPrivate);
} }
/** /**

4
clutter/clutter-layout-manager.h
View File

@ -40,6 +40,7 @@ G_BEGIN_DECLS
#define CLUTTER_IS_LAYOUT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_LAYOUT_MANAGER)) #define CLUTTER_IS_LAYOUT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_LAYOUT_MANAGER))
#define CLUTTER_LAYOUT_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_LAYOUT_MANAGER, ClutterLayoutManagerClass)) #define CLUTTER_LAYOUT_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_LAYOUT_MANAGER, ClutterLayoutManagerClass))
typedef struct _ClutterLayoutManagerPrivate ClutterLayoutManagerPrivate;
typedef struct _ClutterLayoutManagerClass ClutterLayoutManagerClass; typedef struct _ClutterLayoutManagerClass ClutterLayoutManagerClass;
/** /**
@ -55,8 +56,7 @@ struct _ClutterLayoutManager
/*< private >*/ /*< private >*/
GInitiallyUnowned parent_instance; GInitiallyUnowned parent_instance;
/* padding for future expansion */ ClutterLayoutManagerPrivate *priv;
gpointer dummy;
}; };
/** /**