gnomemm r1295 - in cluttermm/trunk: . clutter/src

[jjongsma svn gnome org]

Author: jjongsma
Date: Mon Jan 21 04:09:44 2008
New Revision: 1295
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1295&view=rev

Log:
	* clutter/src/actor.hg: implement Scriptable interface
	* clutter/src/behaviour-bspline.hg: implement Scriptable interface
	* clutter/src/behaviour-path.hg: implement Scriptable interface
	* clutter/src/scriptable.hg: remove errant actor.h include



Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/actor.hg
   cluttermm/trunk/clutter/src/behaviour-bspline.hg
   cluttermm/trunk/clutter/src/behaviour-path.hg
   cluttermm/trunk/clutter/src/scriptable.hg

Modified: cluttermm/trunk/clutter/src/actor.hg
==============================================================================
--- cluttermm/trunk/clutter/src/actor.hg	(original)
+++ cluttermm/trunk/clutter/src/actor.hg	Mon Jan 21 04:09:44 2008
@@ -17,6 +17,7 @@
 
 #include <glibmm/object.h>
 #include <cluttermm/color.h>
+#include <cluttermm/scriptable.h>
 #include <clutter/clutter-event.h> //For Clutter*Event
  
 _DEFS(cluttermm,clutter)
@@ -33,10 +34,11 @@
 typedef ClutterScrollEvent ScrollEvent;
 typedef ClutterCrossingEvent CrossingEvent;
 
-class Actor : public Glib::Object
+class Actor : public Glib::Object, public Scriptable
 {
   _CLASS_GOBJECT(Actor, ClutterActor, CLUTTER_ACTOR, Glib::Object, GObject)
   _DERIVES_INITIALLY_UNOWNED()
+  _IMPLEMENTS_INTERFACE(Scriptable)
 
 protected:
   _CTOR_DEFAULT()

Modified: cluttermm/trunk/clutter/src/behaviour-bspline.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-bspline.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-bspline.hg	Mon Jan 21 04:09:44 2008
@@ -17,6 +17,7 @@
 
 #include <cluttermm/behaviour.h>
 #include <cluttermm/alpha.h>
+#include <cluttermm/scriptable.h>
 #include <cluttermm/types.h>
  
 _DEFS(cluttermm,clutter)
@@ -26,9 +27,10 @@
 namespace Clutter
 {
 
-class BehaviourBspline : public Behaviour
+class BehaviourBspline : public Behaviour, public Scriptable
 {
   _CLASS_GOBJECT(BehaviourBspline, ClutterBehaviourBspline, CLUTTER_BEHAVIOUR_BSPLINE, Behaviour, ClutterBehaviour)
+  _IMPLEMENTS_INTERFACE(Scriptable)
 
 protected:
   // TODO: pass the knots as a C++ container

Modified: cluttermm/trunk/clutter/src/behaviour-path.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-path.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-path.hg	Mon Jan 21 04:09:44 2008
@@ -16,6 +16,7 @@
  */
 
 #include <cluttermm/behaviour.h>
+#include <cluttermm/scriptable.h>
 #include <cluttermm/alpha.h>
 #include <cluttermm/types.h>
  
@@ -26,9 +27,10 @@
 namespace Clutter
 {
 
-class BehaviourPath : public Behaviour
+class BehaviourPath : public Behaviour, public Scriptable
 {
   _CLASS_GOBJECT(BehaviourPath, ClutterBehaviourPath, CLUTTER_BEHAVIOUR_PATH, Behaviour, ClutterBehaviour)
+  _IMPLEMENTS_INTERFACE(Scriptable)
 
 protected:
   // TODO: pass the knots as a C++ container

Modified: cluttermm/trunk/clutter/src/scriptable.hg
==============================================================================
--- cluttermm/trunk/clutter/src/scriptable.hg	(original)
+++ cluttermm/trunk/clutter/src/scriptable.hg	Mon Jan 21 04:09:44 2008
@@ -15,7 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <cluttermm/actor.h>
 #include <glibmm/interface.h>
 #include <glibmm/ustring.h>
 #include <clutter/clutter-scriptable.h>