[cluttermm] Fixed inheritance and layout-manager issues in box.hg.

[Chris Kühl <chriskuehl src gnome org>]

commit 77c81da535377ccb680e676040a95b0ba73649b3
Author: Chris Kühl <chrisk openismus com>
Date:   Sun Feb 27 09:10:47 2011 +0100

    Fixed inheritance and layout-manager issues in box.hg.

 ChangeLog          |   12 ++++++++++++
 clutter/src/box.hg |   14 +++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0d73bc0..93a466d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-27  Chris Kühl  <chrisk openismus com>
+
+	Fixed inheritance and layout-manager issues in box.hg.
+
+	* clutter/src/box.hg:
+
+2011-02-25  Chris Kühl  <chrisk openismus com>
+
+	Example: Added Simple Clutter::Script example.
+
+	* examples/script.cc
+
 1.3.2
 
 2011-02-01  Chris Kühl  <chrisk openismus com>
diff --git a/clutter/src/box.hg b/clutter/src/box.hg
index cb67a2d..d48f73b 100644
--- a/clutter/src/box.hg
+++ b/clutter/src/box.hg
@@ -20,17 +20,17 @@
 #include <cluttermm/color.h>
 
 _DEFS(cluttermm,clutter)
-_PINCLUDE(cluttermm/private/layout-manager_p.h)
+_PINCLUDE(cluttermm/private/actor_p.h)
 _PINCLUDE(cluttermm/private/container_p.h)
 
 namespace Clutter
 {
 
 class Box :
-    public LayoutManager,
+    public Actor,
     public Container
 {
-  _CLASS_GOBJECT(Box, ClutterBox, CLUTTER_BOX, LayoutManager, ClutterLayoutManager)
+  _CLASS_GOBJECT(Box, ClutterBox, CLUTTER_BOX, Actor, ClutterActor)
   _IMPLEMENTS_INTERFACE(Container)
 
 protected:
@@ -39,9 +39,10 @@ protected:
 
 public:
   _WRAP_CREATE()
+  _WRAP_CREATE(const Glib::RefPtr<LayoutManager>& layoutManager)
 
-  _WRAP_METHOD(Glib::RefPtr<LayoutManager> get_manager(), clutter_box_get_manager, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const LayoutManager> get_manager() const, clutter_box_get_manager, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<LayoutManager> get_layout_manager(), clutter_box_get_layout_manager, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const LayoutManager> get_layout_manager() const, clutter_box_get_layout_manager, refreturn, constversion)
 
   _WRAP_METHOD(void set_color(const Color& color), clutter_box_set_color)
 
@@ -55,8 +56,7 @@ public:
 
   _WRAP_PROPERTY("color", Color)
   _WRAP_PROPERTY("color-set", bool)
-  _WRAP_PROPERTY("manager", Glib::RefPtr<LayoutManager>)
+  _WRAP_PROPERTY("layout-manager", Glib::RefPtr<LayoutManager>)
 };
 
 } // namespace Clutter
-