Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / duck.h

diff --git a/synfig-studio/trunk/src/gtkmm/duck.h b/synfig-studio/trunk/src/gtkmm/duck.h
index 2a38d64..9ba7b00 100644 (file)
--- 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; }
 
@@ -226,6 +251,15 @@ public:
        synfig::String get_name()const { return name; }
 
        bool operator==(const Duck &rhs)const;
+
+#ifdef _DEBUG
+       //!     Returns a string containing the name of the given Type
+       static synfig::String type_name(Type id);
+
+       //!     Returns a string containing the name of the type
+       synfig::String type_name()const { return type_name(get_type()); }
+#endif // _DEBUG
+
 }; // END of class Duck
 
 //! Combine Flags