X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Finstance.cpp;h=1dd1171a0e95d8fcd35e73eb65d8b46890176b34;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=f64cac450222def5614f82441eb810d72a33c740;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp
index f64cac4..1dd1171 100644
--- a/synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/synfig-studio/trunk/src/synfigapp/instance.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file instance.cpp
+/*!	\file synfigapp/instance.cpp
 **	\brief Instance
 **
-**	$Id: instance.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -59,7 +61,6 @@ bool
 synfigapp::is_editable(synfig::ValueNode::Handle value_node)
 {
 	if(ValueNode_Const::Handle::cast_dynamic(value_node)
-		|| ValueNode_TimedSwap::Handle::cast_dynamic(value_node)
 		|| ValueNode_Animated::Handle::cast_dynamic(value_node)
 		|| ValueNode_Composite::Handle::cast_dynamic(value_node)
 		|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
@@ -86,7 +87,7 @@ Instance::Instance(Canvas::Handle canvas):
 	assert(canvas->is_root());
 
 	unset_selection_manager();
-	
+
 	instance_map_[canvas]=this;
 } // END of synfigapp::Instance::Instance()
 
@@ -125,7 +126,7 @@ Instance::find_canvas_interface(handle<Canvas> canvas)
 		return 0;
 	while(canvas->is_inline())
 		canvas=canvas->parent();
-	
+
 	CanvasInterfaceList::iterator iter;
 
 	for(iter=canvas_interface_list().begin();iter!=canvas_interface_list().end();iter++)
@@ -148,24 +149,12 @@ Instance::save()const
 }
 
 bool
-Instance::save_as(const std::string &file_name)const
-{
-	bool ret=save_canvas(file_name,canvas_);
-	if(ret)
-	{
-		reset_action_count();
-		const_cast<sigc::signal<void>& >(signal_saved_)();
-	}
-	return ret;
-}
-
-bool
 Instance::save_as(const std::string &file_name)
 {
 	bool ret;
 
 	String old_file_name(get_file_name());
-	
+
 	set_file_name(file_name);
 
 	ret=save_canvas(file_name,canvas_);
@@ -176,9 +165,7 @@ Instance::save_as(const std::string &file_name)
 		signal_saved_();
 	}
 	else
-	{
 		set_file_name(old_file_name);
-	}
 
 	signal_filename_changed_();