Disable profiler in childrentreestore.cpp.

[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 d29ce11..2a38d64 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duck.h
+++ b/synfig-studio/trunk/src/gtkmm/duck.h
@@ -44,16 +44,13 @@
 
 /* === 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
 #ifndef __STRING_HASH__
 #define __STRING_HASH__
 class StringHash
 {
-       __gnu_cxx::hash<const char*> hasher_;
+       HASH_MAP_NAMESPACE::hash<const char*> hasher_;
 public:
        size_t operator()(const synfig::String& x)const
        {
@@ -102,11 +99,13 @@ public:
 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;
 
@@ -138,6 +137,7 @@ public:
        ~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; }
@@ -191,6 +191,8 @@ public:
        //! 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);
@@ -246,9 +248,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> >
 {