X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.h;h=5bb3ec0e3124250bad6892fb0eb9ef0d733bc7c9;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=09654fbf113f97e827fb880693c555ebe8ab6f7f;hpb=c34decdd956abc5fc2e4b7b2461e775843e6d53c;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.h b/synfig-studio/trunk/src/synfigapp/canvasinterface.h
index 09654fb..5bb3ec0 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.h
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.h
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -210,13 +211,13 @@ public:
 	etl::loose_handle<Instance> get_instance()const { return instance_; }
 
 	//! Changes the name of the canvas. Undoable.
-	bool set_name(const synfig::String &x);
+	void set_name(const synfig::String &x);
 
 	//! Changes the description of the canvas. Undoable.
-	bool set_description(const synfig::String &x);
+	void set_description(const synfig::String &x);
 
 	//! Changes the ID of the canvas. Undoable.
-	bool set_id(const synfig::String &x);
+	void set_id(const synfig::String &x);
 
 	//! Convenience function to retrieve the name of the canvas
 	synfig::String get_name()const { return get_canvas()->get_name(); }
@@ -255,7 +256,7 @@ public:
 	Mode get_mode()const;
 
 	//! Creates a new layer, of type \c id at the top of the layer stack
-	synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
+	// synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
 
 	synfig::Layer::Handle add_layer_to(synfig::String id,synfig::Canvas::Handle canvas, int depth=0);
 
@@ -270,7 +271,7 @@ public:
 
 	void set_rend_desc(const synfig::RendDesc &rend_desc);
 
-	bool import(const synfig::String &filename, bool copy=false);
+	bool import(const synfig::String &filename, synfig::String &errors, synfig::String &warnings, bool resize_image=false);
 
 
 	void waypoint_duplicate(synfigapp::ValueDesc value_desc,synfig::Waypoint waypoint);