[clutter/wip/clutter-1.99: 12/28] 1.99: Make ClutterStage inherit from ClutterActor
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/clutter-1.99: 12/28] 1.99: Make ClutterStage inherit from ClutterActor
- Date: Thu, 21 Jun 2012 20:09:05 +0000 (UTC)
commit e4132cab5f8ff20871ea49402ec225f5e647c8ab
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Jun 21 17:21:15 2012 +0100
1.99: Make ClutterStage inherit from ClutterActor
clutter/clutter-stage.c | 71 +----------------------------------------------
clutter/clutter-stage.h | 6 ++--
2 files changed, 4 insertions(+), 73 deletions(-)
---
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 8d01214..7580f5e 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -75,17 +75,12 @@
#include "clutter-profile.h"
#include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h"
-#include "clutter-util.h"
#include "clutter-version.h" /* For flavour */
#include "clutter-private.h"
#include "cogl/cogl.h"
-static void clutter_container_iface_init (ClutterContainerIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_GROUP,
- G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
- clutter_container_iface_init))
+G_DEFINE_TYPE (ClutterStage, clutter_stage, CLUTTER_TYPE_ACTOR)
#define CLUTTER_STAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_STAGE, ClutterStagePrivate))
@@ -215,70 +210,6 @@ static const ClutterColor default_stage_color = { 255, 255, 255, 255 };
static void _clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
static void
-clutter_stage_real_add (ClutterContainer *container,
- ClutterActor *child)
-{
- clutter_actor_add_child (CLUTTER_ACTOR (container), child);
-}
-
-static void
-clutter_stage_real_remove (ClutterContainer *container,
- ClutterActor *child)
-{
- clutter_actor_remove_child (CLUTTER_ACTOR (container), child);
-}
-
-static void
-clutter_stage_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
-{
- ClutterActorIter iter;
- ClutterActor *child;
-
- clutter_actor_iter_init (&iter, CLUTTER_ACTOR (container));
-
- while (clutter_actor_iter_next (&iter, &child))
- callback (child, user_data);
-}
-
-static void
-clutter_stage_real_raise (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- clutter_actor_set_child_above_sibling (CLUTTER_ACTOR (container),
- child,
- sibling);
-}
-
-static void
-clutter_stage_real_lower (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- clutter_actor_set_child_below_sibling (CLUTTER_ACTOR (container),
- child,
- sibling);
-}
-
-static void
-clutter_stage_real_sort_depth_order (ClutterContainer *container)
-{
-}
-
-static void
-clutter_container_iface_init (ClutterContainerIface *iface)
-{
- iface->add = clutter_stage_real_add;
- iface->remove = clutter_stage_real_remove;
- iface->foreach = clutter_stage_real_foreach;
- iface->raise = clutter_stage_real_raise;
- iface->lower = clutter_stage_real_lower;
- iface->sort_depth_order = clutter_stage_real_sort_depth_order;
-}
-
-static void
clutter_stage_get_preferred_width (ClutterActor *self,
gfloat for_height,
gfloat *min_width_p,
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index e3c1d7e..851d402 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -29,7 +29,7 @@
#define __CLUTTER_STAGE_H__
#include <clutter/clutter-types.h>
-#include <clutter/clutter-group.h>
+#include <clutter/clutter-actor.h>
G_BEGIN_DECLS
@@ -55,7 +55,7 @@ typedef struct _ClutterStagePrivate ClutterStagePrivate;
struct _ClutterStage
{
/*< private >*/
- ClutterGroup parent_instance;
+ ClutterActor parent_instance;
ClutterStagePrivate *priv;
};
@@ -75,7 +75,7 @@ struct _ClutterStage
struct _ClutterStageClass
{
/*< private >*/
- ClutterGroupClass parent_class;
+ ClutterActorClass parent_class;
/*< public >*/
/* signals */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]