projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revision 1494 introduced a bug in the bline tool. Dragging a tangent while drawing...
[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
89bebdc
..
5ea5446
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/duck.h
+++ b/
synfig-studio/trunk/src/gtkmm/duck.h
@@
-44,20
+44,27
@@
/* === M A C R O S ========================================================= */
/* === 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
#ifdef HASH_MAP_H
#include HASH_MAP_H
+#include FUNCTIONAL_H
+
#ifndef __STRING_HASH__
#define __STRING_HASH__
class StringHash
{
#ifndef __STRING_HASH__
#define __STRING_HASH__
class StringHash
{
- __gnu_cxx::hash<const char*> hasher_;
+# ifdef FUNCTIONAL_HASH_ON_STRING
+ HASH_MAP_NAMESPACE::hash<const 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
{
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());
return hasher_(x.c_str());
+# endif // FUNCTIONAL_HASH_ON_STRING
}
};
#endif
}
};
#endif
@@
-102,6
+109,7
@@
public:
private:
sigc::signal<bool,const synfig::Point &> signal_edited_;
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_;
sigc::signal<void> signal_user_click_[5];
Type type_;
@@
-139,6
+147,7
@@
public:
~Duck();
sigc::signal<bool,const synfig::Point &> &signal_edited() { return signal_edited_; }
~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; }
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; }
@@
-192,6
+201,8
@@
public:
//! Returns the location of the duck
synfig::Point get_point()const { return shared_point?*shared_point:point; }
//! 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_trans_point()const;
void set_trans_point(const synfig::Point &x);
@@
-247,9
+258,9
@@
operator&(const Duck::Type lhs, const Duck::Type rhs)
class DuckMap : public
#ifdef HASH_MAP_H
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> >
{
#else
std::map<synfig::GUID,etl::handle<studio::Duck> >
{