2008-02-01 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-actor.h: Clean up a bit the flag-related macros.

diff --git a/ChangeLog b/ChangeLog
index 789d55a..59a8380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-01  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-actor.h: Clean up a bit the flag-related macros.
+
+2008-02-01  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/clutter-actor.c:
        (clutter_actor_get_property): Use clutter_actor_get_reactive()
        instead of the IS_REACTIVE() macro.

diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 46cf521..d01172a 100644 (file)
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -57,11 +57,8 @@ G_BEGIN_DECLS
 
 #define CLUTTER_ACTOR_IS_MAPPED(e)      (((ClutterActor*)(e))->flags & CLUTTER_ACTOR_MAPPED)
 #define CLUTTER_ACTOR_IS_REALIZED(e)    (((ClutterActor*)(e))->flags & CLUTTER_ACTOR_REALIZED)
-#define CLUTTER_ACTOR_IS_VISIBLE(e)     (CLUTTER_ACTOR_IS_MAPPED (e) && \
-                                         CLUTTER_ACTOR_IS_REALIZED (e))
+#define CLUTTER_ACTOR_IS_VISIBLE(e)     (CLUTTER_ACTOR_IS_MAPPED (e) && CLUTTER_ACTOR_IS_REALIZED (e))
 #define CLUTTER_ACTOR_IS_REACTIVE(e)    (((ClutterActor*)(e))->flags & CLUTTER_ACTOR_REACTIVE)
-/*                                        && CLUTTER_ACTOR_IS_VISIBLE(e)) */
-
 
 typedef struct _ClutterActorClass    ClutterActorClass;
 typedef struct _ClutterActorBox      ClutterActorBox;