[clutter] Deprecate mallum's add() macros for Group and Stage



commit e9a42f23fe6325a95861d51f2c1152b438ea705e
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Sun Jul 3 19:31:15 2011 +0100

    Deprecate mallum's add() macros for Group and Stage
    
    I think we're way past overdue.

 clutter/clutter-group.h |    6 +++++-
 clutter/clutter-stage.h |    4 ++++
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/clutter/clutter-group.h b/clutter/clutter-group.h
index 99a3749..9b270a3 100644
--- a/clutter/clutter-group.h
+++ b/clutter/clutter-group.h
@@ -104,7 +104,9 @@ ClutterActor *clutter_group_get_nth_child    (ClutterGroup    *self,
 gint          clutter_group_get_n_children   (ClutterGroup    *self);
 void          clutter_group_remove_all       (ClutterGroup    *group);
 
-/* for Mr. Mallum */
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
+/* for Mr. Mallum only */
 #define clutter_group_add(group,actor)                  G_STMT_START {  \
   ClutterActor *_actor = (ClutterActor *) (actor);                      \
   if (CLUTTER_IS_GROUP ((group)) && CLUTTER_IS_ACTOR ((_actor)))        \
@@ -113,6 +115,8 @@ void          clutter_group_remove_all       (ClutterGroup    *group);
       clutter_container_add_actor (_container, _actor);                 \
     }                                                   } G_STMT_END
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_GROUP_H__ */
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 54cb918..855fe36 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -267,6 +267,8 @@ void                  clutter_stage_set_motion_events_enabled (ClutterStage *sta
                                                                gboolean      enabled);
 gboolean              clutter_stage_get_motion_events_enabled (ClutterStage *stage);
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 /* Commodity macro, for mallum only */
 #define clutter_stage_add(stage,actor)                  G_STMT_START {  \
   if (CLUTTER_IS_STAGE ((stage)) && CLUTTER_IS_ACTOR ((actor)))         \
@@ -276,6 +278,8 @@ gboolean              clutter_stage_get_motion_events_enabled (ClutterStage *sta
       clutter_container_add_actor (_container, _actor);                 \
     }                                                   } G_STMT_END
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_STAGE_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]