X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduck.h;h=167e0c87977a3463ccf897651690c9f6fe6c58ae;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=8be49d6f46c59f6b5e7fded986ee0cdc698d37fa;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duck.h b/synfig-studio/trunk/src/gtkmm/duck.h
index 8be49d6..167e0c8 100644
--- a/synfig-studio/trunk/src/gtkmm/duck.h
+++ b/synfig-studio/trunk/src/gtkmm/duck.h
@@ -2,10 +2,11 @@
 /*!	\file duck.h
 **	\brief Template Header
 **
-**	$Id: duck.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -44,20 +45,27 @@
 
 /* === M A C R O S ========================================================= */
 
-#define HASH_MAP_H <ext/hash_map>
-#define HASH_SET_H <ext/hash_set>
-
 #ifdef HASH_MAP_H
 #include HASH_MAP_H
+#include FUNCTIONAL_H
+
 #ifndef __STRING_HASH__
 #define __STRING_HASH__
 class StringHash
 {
-	__gnu_cxx::hash<const char*> hasher_;
+# ifdef FUNCTIONAL_HASH_ON_STRING
+	HASH_MAP_NAMESPACE::hash<synfig::String> hasher_;
+# else  // FUNCTIONAL_HASH_ON_STRING
+	HASH_MAP_NAMESPACE::hash<const char*> hasher_;
+# endif  // FUNCTIONAL_HASH_ON_STRING
 public:
 	size_t operator()(const synfig::String& x)const
 	{
+# ifdef FUNCTIONAL_HASH_ON_STRING
+		return hasher_(x);
+# else  // FUNCTIONAL_HASH_ON_STRING
 		return hasher_(x.c_str());
+# endif  // FUNCTIONAL_HASH_ON_STRING
 	}
 };
 #endif
@@ -73,13 +81,13 @@ public:
 
 namespace studio {
 class Duckmatic;
-	
+
 /*! \class Duck
 **	\writeme */
 class Duck : public etl::shared_object
 {
 	friend class Duckmatic;
-		
+
 public:
 	enum Type
 	{
@@ -98,18 +106,20 @@ public:
 
 	typedef etl::handle<Duck> Handle;
 	typedef etl::loose_handle<Duck> LooseHandle;
-	
+
 private:
 
 	sigc::signal<bool,const synfig::Point &> signal_edited_;
+	sigc::signal<bool,const synfig::Angle &> signal_edited_angle_;
 	sigc::signal<void> signal_user_click_[5];
-	
+
 	Type type_;
 
 	synfig::Point point;
+	synfig::Angle rotations;
 
 	etl::smart_ptr<synfig::Point> shared_point;
-	
+
 	synfig::Point origin;
 	synfig::String name;
 	synfig::Real scalar;
@@ -119,13 +129,14 @@ private:
 	etl::handle<Duck> connect_duck;
 	etl::handle<Duck> box_duck;
 
-	synfig::GUID guid_;	
+	synfig::GUID guid_;
 
 	// Flags
 	bool editable;
 	bool radius_;
 	bool tangent_;
-	
+	bool hover_;
+
 	synfig::TransformStack transform_stack_;
 
 	synfigapp::ValueDesc value_desc_;
@@ -136,8 +147,9 @@ public:
 	Duck(const synfig::Point &point);
 	Duck(const synfig::Point &point,const synfig::Point &origin);
 	~Duck();
-		
+
 	sigc::signal<bool,const synfig::Point &> &signal_edited() { return signal_edited_; }
+	sigc::signal<bool,const synfig::Angle &> &signal_edited_angle() { return signal_edited_angle_; }
 	sigc::signal<void> &signal_user_click(int i=0) { assert(i>=0); assert(i<5); return signal_user_click_[i]; }
 
 	void set_guid(const synfig::GUID& x) { guid_=x; }
@@ -157,6 +169,12 @@ public:
 	//! \writeme
 	bool get_tangent()const { return tangent_; }
 
+	//! Sets whether to show the duck as if it is being hovered over
+	void set_hover(bool h) { hover_=h; }
+
+	//! Retrieves whether to show the duck as if it is being hovered over
+	bool get_hover()const { return hover_; }
+
 	void set_connect_duck(const etl::handle<Duck>& x) { connect_duck=x; }
 	void set_box_duck(const etl::handle<Duck>& x) { box_duck=x; }
 
@@ -170,7 +188,7 @@ public:
 	void set_transform_stack(const synfig::TransformStack& x) { transform_stack_=x; }
 
 	const synfig::TransformStack& get_transform_stack()const { return transform_stack_; }
-	
+
 	//! \writeme
 	void set_type(Type x) { type_=x; }
 
@@ -187,12 +205,14 @@ public:
 
 	//! Sets the location of the duck with respect to the origin
 	void set_point(const synfig::Point &x) { (shared_point?*shared_point:point)=x; }
-		
+
 	//! Returns the location of the duck
 	synfig::Point get_point()const { return shared_point?*shared_point:point; }
-	
+
+	synfig::Angle get_rotations()const { return rotations; };
+
 	synfig::Point get_trans_point()const;
-	
+
 	void set_trans_point(const synfig::Point &x);
 
 	synfig::Point get_sub_trans_point()const;
@@ -207,22 +227,22 @@ public:
 
 	//! Retrieves the origin location
 	synfig::Point get_origin()const;
-	
+
 	//! Retrieves the origin duck
-	const etl::handle<Duck> & get_origin_duck() const;	
+	const etl::handle<Duck> & get_origin_duck() const;
 
 	//! Retrieves the origin location
 	synfig::Point get_trans_origin()const;
 
 	void set_radius(bool r) { radius_=r; }
 	bool is_radius()const { return radius_; }
-	
+
 	//! Sets the name of the duck
 	void set_name(const synfig::String &x);
 
 	//! Retrieves the name of the duck
 	synfig::String get_name()const { return name; }
-	
+
 	bool operator==(const Duck &rhs)const;
 }; // END of class Duck
 
@@ -246,9 +266,9 @@ operator&(const Duck::Type lhs, const Duck::Type rhs)
 
 class DuckMap : public
 #ifdef HASH_MAP_H
-__gnu_cxx::hash_map<synfig::GUID,etl::handle<studio::Duck>,synfig::GUIDHash>
+HASH_MAP_CLASS<synfig::GUID,etl::handle<studio::Duck>,synfig::GUIDHash>
 {
-	typedef __gnu_cxx::hash_map<synfig::GUID,etl::handle<studio::Duck>,synfig::GUIDHash> PARENT_TYPE;
+	typedef HASH_MAP_CLASS<synfig::GUID,etl::handle<studio::Duck>,synfig::GUIDHash> PARENT_TYPE;
 #else
 std::map<synfig::GUID,etl::handle<studio::Duck> >
 {