gnomemm r1667 - in cluttermm/trunk: . clutter/src examples scripts

[murrayc svn gnome org]

Author: murrayc
Date: Sun Aug 10 11:56:31 2008
New Revision: 1667
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1667&view=rev

Log:
2008-08-10  Murray Cumming  <murrayc murrayc com>

* clutter/src/container.ccg:
* clutter/src/container.hg: get_child_property(), 
set_child_property(): Correct the implementation to fix 
a compile error when using these templated methods.

Removed:
   cluttermm/trunk/scripts/config.guess
   cluttermm/trunk/scripts/config.sub
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/container.ccg
   cluttermm/trunk/clutter/src/container.hg
   cluttermm/trunk/examples/test-actors.cc

Modified: cluttermm/trunk/clutter/src/container.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/container.ccg	(original)
+++ cluttermm/trunk/clutter/src/container.ccg	Sun Aug 10 11:56:31 2008
@@ -58,9 +58,9 @@
 }
 
 
-void Container::get_child_property_value(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, Glib::ValueBase& value) const
+void Container::get_child_property_value(const Glib::RefPtr<const Actor>& child, const Glib::ustring& property_name, Glib::ValueBase& value) const
 {
-  clutter_container_child_get_property(const_cast<ClutterContainer*>(gobj()), child->gobj(), property_name.c_str(), value.gobj());
+  clutter_container_child_get_property(const_cast<ClutterContainer*>(gobj()), const_cast<ClutterActor*>(child->gobj()), property_name.c_str(), value.gobj());
 }
 
 } //namespace Clutter

Modified: cluttermm/trunk/clutter/src/container.hg
==============================================================================
--- cluttermm/trunk/clutter/src/container.hg	(original)
+++ cluttermm/trunk/clutter/src/container.hg	Sun Aug 10 11:56:31 2008
@@ -66,9 +66,10 @@
   _WRAP_METHOD(void set_child_property_value(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, const Glib::ValueBase& value), clutter_container_child_set_property)
 
   template <class PropertyType> inline
-  void get_child_property(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, PropertyType& value) const;
+  void get_child_property(const Glib::RefPtr<const Actor>& child, const Glib::ustring& property_name, PropertyType& value) const;
 
-  void get_child_property_value(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, Glib::ValueBase& value) const;
+  void get_child_property_value(const Glib::RefPtr<const Actor>& child, const Glib::ustring& property_name, Glib::ValueBase& value) const;
+  _IGNORE(clutter_container_child_get_property)
 
 
   /*
@@ -125,16 +126,16 @@
   property_value.init(Glib::Value<PropertyType>::value_type());
 
   property_value.set(value);
-  this->set_child_property_value(property_name, property_value);
+  this->set_child_property_value(child, property_name, property_value);
 }
 
 template <class PropertyType> inline
-void Container::get_child_property(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, PropertyType& value) const
+void Container::get_child_property(const Glib::RefPtr<const Actor>& child, const Glib::ustring& property_name, PropertyType& value) const
 {
   Glib::Value<PropertyType> property_value;
   property_value.init(Glib::Value<PropertyType>::value_type());
 
-  this->get_child_property_value(property_name, property_value);
+  this->get_child_property_value(child, property_name, property_value);
 
   value = property_value.get();
 }

Modified: cluttermm/trunk/examples/test-actors.cc
==============================================================================
--- cluttermm/trunk/examples/test-actors.cc	(original)
+++ cluttermm/trunk/examples/test-actors.cc	Sun Aug 10 11:56:31 2008
@@ -13,8 +13,9 @@
     + Clutter::Stage::get_default()->get_height()) / num_actors;
 }
 
-struct SuperOH
+class SuperOH
 {
+public:
   std::vector<Glib::RefPtr<Clutter::Actor> > hands;
   Glib::RefPtr<Clutter::Actor> bgtex;
   Glib::RefPtr<Clutter::Group> group;