projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the current value of a parameter when converting it, rather than its value at...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
action_system.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/action_system.cpp
b/synfig-studio/trunk/src/synfigapp/action_system.cpp
index
48579b5
..
33f71f9
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/action_system.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/action_system.cpp
@@
-33,6
+33,8
@@
#include "instance.h"
#include "canvasinterface.h"
#include "instance.h"
#include "canvasinterface.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-64,7
+66,7
@@
Action::System::~System()
}
bool
}
bool
-Action::System::perform_action(handle<Action::Base> action)
+Action::System::perform_action(
etl::
handle<Action::Base> action)
{
handle<UIInterface> uim(get_ui_interface());
{
handle<UIInterface> uim(get_ui_interface());
@@
-207,7
+209,7
@@
Action::System::perform_action(handle<Action::Base> action)
}
bool
}
bool
-synfigapp::Action::System::undo_(handle<UIInterface> uim)
+synfigapp::Action::System::undo_(
etl::
handle<UIInterface> uim)
{
handle<Action::Undoable> action(undo_action_stack().front());
most_recent_action_=action;
{
handle<Action::Undoable> action(undo_action_stack().front());
most_recent_action_=action;
@@
-306,7
+308,7
@@
synfigapp::Action::System::undo()
}
bool
}
bool
-Action::System::redo_(handle<UIInterface> uim)
+Action::System::redo_(
etl::
handle<UIInterface> uim)
{
handle<Action::Undoable> action(redo_action_stack().front());
most_recent_action_=action;
{
handle<Action::Undoable> action(redo_action_stack().front());
most_recent_action_=action;
@@
-540,7
+542,7
@@
Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
return false;
}
return false;
}
-Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<
Action::
System> instance_,synfig::String name_):
+Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<System> instance_,synfig::String name_):
instance_(instance_),
name_(name_),
redraw_requested_(false),
instance_(instance_),
name_(name_),
redraw_requested_(false),
@@
-551,7
+553,7
@@
Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instanc
}
void
}
void
-Action::PassiveGrouper::request_redraw(handle<CanvasInterface> x)
+Action::PassiveGrouper::request_redraw(
etl::
handle<CanvasInterface> x)
{
/* DEBUGPOINT();
if(instance_->group_stack_.empty())
{
/* DEBUGPOINT();
if(instance_->group_stack_.empty())