X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduck.h;h=8ac7dbb3f77988475a886b644a9ed764543a7010;hb=8d84ce1bd606706b14e876d61856644b9d5d3c20;hp=2a38d6479ec19be78115bdc2e75f3149fd89df5d;hpb=392b62fa87099d8576a9da614be431a5046fe595;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duck.h b/synfig-studio/trunk/src/gtkmm/duck.h
index 2a38d64..8ac7dbb 100644
--- a/synfig-studio/trunk/src/gtkmm/duck.h
+++ b/synfig-studio/trunk/src/gtkmm/duck.h
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 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
@@ -46,15 +47,25 @@
 
 #ifdef HASH_MAP_H
 #include HASH_MAP_H
+#include FUNCTIONAL_H
+
 #ifndef __STRING_HASH__
 #define __STRING_HASH__
 class StringHash
 {
+# 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
@@ -80,13 +91,13 @@ class Duck : public etl::shared_object
 public:
 	enum Type
 	{
-		TYPE_NONE		=	(0),
-		TYPE_POSITION	=	(1<<0),
-		TYPE_TANGENT	=	(1<<1),
-		TYPE_RADIUS		=	(1<<2),
-		TYPE_WIDTH		=	(1<<3),
-		TYPE_ANGLE		=	(1<<4),
-		TYPE_VERTEX		=	(1<<5),
+		TYPE_NONE		=	(0),	//  0
+		TYPE_POSITION	=	(1<<0),	//  1
+		TYPE_TANGENT	=	(1<<1),	//  2
+		TYPE_RADIUS		=	(1<<2),	//  4
+		TYPE_WIDTH		=	(1<<3),	//  8
+		TYPE_ANGLE		=	(1<<4),	// 16
+		TYPE_VERTEX		=	(1<<5),	// 32
 
 		TYPE_ALL		=	(~0),
 
@@ -124,6 +135,8 @@ private:
 	bool editable;
 	bool radius_;
 	bool tangent_;
+	bool hover_;
+	bool ignore_;
 
 	synfig::TransformStack transform_stack_;
 
@@ -157,6 +170,18 @@ 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_; }
+
+	//! Sets whether to ignore the duck when checking for user interaction
+	void set_ignore(bool i) { ignore_=i; }
+
+	//! Retrieves whether to ignore the duck when checking for user interaction
+	bool get_ignore()const { return ignore_; }
+
 	void set_connect_duck(const etl::handle<Duck>& x) { connect_duck=x; }
 	void set_box_duck(const etl::handle<Duck>& x) { box_duck=x; }