gnomemm r1917 - in cluttermm/trunk: . clutter/src tools/m4

[daniel svn gnome org]

Author: daniel
Date: Wed Dec 24 14:49:00 2008
New Revision: 1917
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1917&view=rev

Log:
* clutter/src/actor.{ccg,hg} (ActorFlags): Wrap enumeration.
({set,unset,get}_flags): Implement missing accessors.
(is_{mapped,realized,visible,reactive}): ditto.
* tools/m4/convert_cluttermm.m4 (ActorFlags): Add generic
enumeration conversions and a special conversion from guint32.

Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/actor.ccg
   cluttermm/trunk/clutter/src/actor.hg
   cluttermm/trunk/tools/m4/convert_cluttermm.m4

Modified: cluttermm/trunk/clutter/src/actor.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/actor.ccg	(original)
+++ cluttermm/trunk/clutter/src/actor.ccg	Wed Dec 24 14:49:00 2008
@@ -28,6 +28,36 @@
   gobject_.y2 = y2;
 }
 
+void Actor::set_flags(ActorFlags flags)
+{
+  CLUTTER_ACTOR_SET_FLAGS(gobj(), static_cast<guint32>(flags));
+}
+
+void Actor::unset_flags(ActorFlags flags)
+{
+  CLUTTER_ACTOR_UNSET_FLAGS(gobj(), static_cast<guint32>(flags));
+}
+
+bool Actor::is_mapped() const
+{
+  return (CLUTTER_ACTOR_IS_MAPPED(gobj()) != 0);
+}
+
+bool Actor::is_realized() const
+{
+  return (CLUTTER_ACTOR_IS_REALIZED(gobj()) != 0);
+}
+
+bool Actor::is_visible() const
+{
+  return CLUTTER_ACTOR_IS_VISIBLE(gobj());
+}
+
+bool Actor::is_reactive() const
+{
+  return (CLUTTER_ACTOR_IS_REACTIVE(gobj()) != 0);
+}
+
 Geometry Actor::get_geometry() const
 {
   Geometry geom;

Modified: cluttermm/trunk/clutter/src/actor.hg
==============================================================================
--- cluttermm/trunk/clutter/src/actor.hg	(original)
+++ cluttermm/trunk/clutter/src/actor.hg	Wed Dec 24 14:49:00 2008
@@ -45,6 +45,8 @@
   _MEMBER_SET(y2, y2, Unit, ClutterUnit)
 };
 
+_WRAP_ENUM(ActorFlags, ClutterActorFlags)
+
 class Actor : public Glib::Object, public Scriptable
 {
   _CLASS_GOBJECT(Actor, ClutterActor, CLUTTER_ACTOR, Glib::Object, GObject)
@@ -57,7 +59,16 @@
 public:
   //There is no create() because this is an abstract base class.
   //_WRAP_CREATE()
-  
+
+  void set_flags(ActorFlags flags);
+  void unset_flags(ActorFlags flags);
+  _MEMBER_GET(flags, flags, ActorFlags, guint32)
+
+  bool is_mapped() const;
+  bool is_realized() const;
+  bool is_visible() const;
+  bool is_reactive() const;
+
   _WRAP_METHOD(void show(), clutter_actor_show)
   _WRAP_METHOD(void show_all(), clutter_actor_show_all)
   _WRAP_METHOD(void hide(), clutter_actor_hide)

Modified: cluttermm/trunk/tools/m4/convert_cluttermm.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert_cluttermm.m4	(original)
+++ cluttermm/trunk/tools/m4/convert_cluttermm.m4	Wed Dec 24 14:49:00 2008
@@ -68,6 +68,7 @@
 _EQUAL(ClutterScrollEvent*,ScrollEvent*)
 _EQUAL(ClutterCrossingEvent*,CrossingEvent*)
 
+_CONV_ENUM(Clutter,ActorFlags)
 _CONV_ENUM(Clutter,LayoutFlags)
 _CONV_ENUM(Clutter,PackType)
 _CONV_ENUM(Clutter,TextureFlags)
@@ -79,4 +80,5 @@
 _CONV_ENUM(Pango,EllipsizeMode)
 _CONV_ENUM(Pango,WrapMode)
 
+_CONVERSION(`guint32', `ActorFlags', `static_cast<ActorFlags>($3)')
 _CONVERSION(`const gchar*', `const Glib::ustring&',__GCHARP_TO_USTRING)