diff layer/TimeInstantLayer.h @ 374:64e84e5efb76 spectrogram-cache-rejig

* Merge from trunk

--- a/layer/TimeInstantLayer.h	Mon Nov 19 15:50:37 2007 +0000
+++ b/layer/TimeInstantLayer.h	Wed Feb 27 11:59:42 2008 +0000
@@ -45,6 +45,10 @@
     virtual void drawDrag(View *v, QMouseEvent *);
     virtual void drawEnd(View *v, QMouseEvent *);
 
+    virtual void eraseStart(View *v, QMouseEvent *);
+    virtual void eraseDrag(View *v, QMouseEvent *);
+    virtual void eraseEnd(View *v, QMouseEvent *);
+
     virtual void editStart(View *v, QMouseEvent *);
     virtual void editDrag(View *v, QMouseEvent *);
     virtual void editEnd(View *v, QMouseEvent *);
@@ -55,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; }
@@ -101,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;