Mercurial > hg > svgui

diff layer/TimeInstantLayer.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 2f83b6e3b8ca
children
line wrap: on
line diff
--- a/layer/TimeInstantLayer.h	Thu Nov 29 10:43:54 2007 +0000
+++ b/layer/TimeInstantLayer.h	Wed Feb 27 10:32:45 2008 +0000
@@ -59,8 +59,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 const Model *getModel() const { return m_model; }
@@ -105,6 +105,8 @@
 
     virtual int getDefaultColourHint(bool dark, bool &impose);
 
+    bool clipboardAlignmentDiffers(View *v, const Clipboard &) const;
+
     SparseOneDimensionalModel *m_model;
     bool m_editing;
     SparseOneDimensionalModel::Point m_editingPoint;