projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1694393: save 'pref.*' keys first, so the window manager hint preference is loade...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_scale.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index
b758945
..
ef0ac19
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@
-2,7
+2,7
@@
/*! \file valuenode_scale.cpp
** \brief Template File
**
/*! \file valuenode_scale.cpp
** \brief Template File
**
-** $Id
: valuenode_scale.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-79,11
+79,11
@@
ValueNode_Scale::create(const ValueBase& x)
break;
default:
assert(0);
break;
default:
assert(0);
- throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));
+ throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));
}
assert(value_node);
assert(value_node->get_type()==x.get_type());
}
assert(value_node);
assert(value_node->get_type()==x.get_type());
-
+
return value_node;
}
return value_node;
}
@@
-192,13
+192,13
@@
ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
{
if(!(i==0 || i==1))
return false;
{
if(!(i==0 || i==1))
return false;
-
+
if(i==0 && !set_value_node(x))
return false;
else
if(i==1 && !set_scalar(x))
return false;
if(i==0 && !set_value_node(x))
return false;
else
if(i==1 && !set_scalar(x))
return false;
-
+
signal_child_changed()(i);signal_value_changed()();
return true;
signal_child_changed()(i);signal_value_changed()();
return true;
@@
-230,7
+230,7
@@
ValueNode_Scale::link_local_name(int i)const
else if(i==1)
return _("Scalar");
return String();
else if(i==1)
return _("Scalar");
return String();
-}
+}
String
ValueNode_Scale::link_name(int i)const
String
ValueNode_Scale::link_name(int i)const
@@
-250,7
+250,7
@@
ValueNode_Scale::get_link_index_from_name(const String &name)const
return 0;
if(name=="scalar")
return 1;
return 0;
if(name=="scalar")
return 1;
-
+
throw Exception::BadLinkName(name);
}
throw Exception::BadLinkName(name);
}