Mercurial > hg > svgui

diff layer/ImageLayer.h @ 373:0895517bb2d1 1.2-stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents e9fe3923bdf4
children e1a9e478b7f2
line wrap: on
line diff
--- a/layer/ImageLayer.h	Thu Nov 29 10:43:54 2007 +0000
+++ b/layer/ImageLayer.h	Wed Feb 27 10:32:45 2008 +0000
@@ -58,8 +58,8 @@
     virtual void resizeSelection(Selection s, Selection newSize);
     virtual void deleteSelection(Selection s);
 
-    virtual void copy(Selection s, Clipboard &to);
-    virtual bool paste(const Clipboard &from, int frameOffset,
+    virtual void copy(View *v, Selection s, Clipboard &to);
+    virtual bool paste(View *v, const Clipboard &from, int frameOffset,
                        bool interactive);
 
     virtual bool editOpen(View *, QMouseEvent *); // on double-click