From 48f2cb1f0903084531402c93935d9ca56d8454dd Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 14 Feb 2011 11:59:49 +0000 Subject: [PATCH] stage/x11: Clean up ClutterStageX11 struct Use the right parent instance and class structure; the X11 stage implementation hasn't been a ClutterGroup in a long, long time. --- clutter/x11/clutter-stage-x11.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/x11/clutter-stage-x11.h index f963e52..f2621f9 100644 --- a/clutter/x11/clutter-stage-x11.h +++ b/clutter/x11/clutter-stage-x11.h @@ -48,33 +48,34 @@ typedef enum struct _ClutterStageX11 { - ClutterGroup parent_instance; + GObject parent_instance; - guint is_foreign_xwin : 1; - guint fullscreening : 1; - guint is_cursor_visible : 1; - guint viewport_initialized : 1; - guint accept_focus : 1; + Window xwin; + gint xwin_width; + gint xwin_height; /* FIXME target_width / height */ - Window xwin; - gint xwin_width; - gint xwin_height; /* FIXME target_width / height */ - gchar *title; + gchar *title; - guint clipped_redraws_cool_off; + guint clipped_redraws_cool_off; - ClutterStageState state; + ClutterStageState state; ClutterStageX11State wm_state; /* backpointers */ ClutterStage *wrapper; ClutterBackendX11 *backend; + + guint is_foreign_xwin : 1; + guint fullscreening : 1; + guint is_cursor_visible : 1; + guint viewport_initialized : 1; + guint accept_focus : 1; }; struct _ClutterStageX11Class { - ClutterGroupClass parent_class; + GObjectClass parent_class; }; GType _clutter_stage_x11_get_type (void) G_GNUC_CONST; -- 2.7.4