X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.h;h=0aa3d6b68bb8703f52b0f874add9161ecdbcccd1;hb=82f8b521a55c8985cd0189c9c71940a7312eccaa;hp=dc36786f767db2fff81e79ff488a99a2a98bdaad;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.h b/synfig-core/trunk/src/synfig/layer_pastecanvas.h
index dc36786..0aa3d6b 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.h
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.h
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file layer_pastecanvas.h
-**	\brief Template Header
+**	\brief Header file for implementation of the "Paste Canvas" layer
 **
-**	$Id: layer_pastecanvas.h,v 1.2 2005/01/24 03:08:18 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
 */
 /* ========================================================================= */
@@ -42,7 +44,7 @@
 /* === C L A S S E S & S T R U C T S ======================================= */
 
 namespace synfig {
-	
+
 class Layer_PasteCanvas : public Layer_Composite, public Layer_NoDeform
 {
 	SYNFIG_LAYER_MODULE_EXT
@@ -61,10 +63,8 @@ private:
 
 	mutable Time curr_time;
 
-	bool optimize_layers(synfig::Context context,synfig::CanvasBase&)const;
+	bool muck_with_time_;
 
-	bool do_not_muck_with_time_;
-	
 	bool children_lock;
 
 	mutable Rect bounds;
@@ -74,11 +74,11 @@ public:
 
 	virtual void on_canvas_set();
 
-	void set_do_not_muck_with_time(bool x=true) { do_not_muck_with_time_=true; }
+	void set_muck_with_time(bool x=false) { muck_with_time_=x; }
 
 	etl::handle<synfig::Canvas> get_sub_canvas()const { return canvas; }
 	void set_sub_canvas(etl::handle<synfig::Canvas> x);
-	
+
 	Real get_zoom()const { return zoom; }
 
 	Time get_time_offset()const { return time_offset; }
@@ -89,7 +89,7 @@ public:
 	virtual ~Layer_PasteCanvas();
 
 	virtual String get_local_name()const;
-	
+
 	virtual bool set_param(const String & param, const synfig::ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
@@ -105,9 +105,9 @@ public:
 	virtual synfig::Rect get_bounding_rect()const;
 
 	virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
-	
+
 protected:
-	virtual void get_times_vfunc(Node::time_set &set) const;	
+	virtual void get_times_vfunc(Node::time_set &set) const;
 
 }; // END of class Layer_PasteCanvas