projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't show 'Duplicate' in the Convert menu. The user doesn't need to see it, since...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
canvas.cpp
diff --git
a/synfig-core/trunk/src/synfig/canvas.cpp
b/synfig-core/trunk/src/synfig/canvas.cpp
index
c0763b5
..
b8e33a0
100644
(file)
--- a/
synfig-core/trunk/src/synfig/canvas.cpp
+++ b/
synfig-core/trunk/src/synfig/canvas.cpp
@@
-69,8
+69,9
@@
int _CanvasCounter::counter(0);
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-Canvas::Canvas(const
s
tring &id):
+Canvas::Canvas(const
S
tring &id):
id_ (id),
id_ (id),
+ version_ (CURRENT_CANVAS_VERSION),
cur_time_ (0),
is_inline_ (false),
is_dirty_ (true),
cur_time_ (0),
is_inline_ (false),
is_dirty_ (true),
@@
-734,7
+735,7
@@
Canvas::push_back_simple(etl::handle<Layer> x)
}
void
}
void
-Canvas::erase(
Canvas::
iterator iter)
+Canvas::erase(iterator iter)
{
if(!(*iter)->get_group().empty())
remove_group_pair((*iter)->get_group(),(*iter));
{
if(!(*iter)->get_group().empty())
remove_group_pair((*iter)->get_group(),(*iter));
@@
-1258,13
+1259,13
@@
Canvas::remove_group_pair(String group, etl::handle<Layer> layer)
}
void
}
void
-Canvas::add_connection(
Layer::LooseHandle
layer, sigc::connection connection)
+Canvas::add_connection(
etl::loose_handle<Layer>
layer, sigc::connection connection)
{
connections_[layer].push_back(connection);
}
void
{
connections_[layer].push_back(connection);
}
void
-Canvas::disconnect_connections(
Layer::LooseHandle
layer)
+Canvas::disconnect_connections(
etl::loose_handle<Layer>
layer)
{
std::vector<sigc::connection>::iterator iter;
for(iter=connections_[layer].begin();iter!=connections_[layer].end();++iter)
{
std::vector<sigc::connection>::iterator iter;
for(iter=connections_[layer].begin();iter!=connections_[layer].end();++iter)