merged experimental into trunk

new features:
 - MDI user interface
 - improved pasting (dialogs etc)
 - some fixes

1 files changed, 1 insertions, 6 deletions

diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index 3e5a5a61..64929555 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -66,15 +66,10 @@ class WaveEdit : public MidiEditor {
       QAction* copyAction;
       QAction* pasteAction;
       
-      static int _widthInit, _heightInit;
-      static QByteArray _toolbarInit;
 
       
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
-      virtual void resizeEvent(QResizeEvent* ev);
-      virtual void focusOutEvent(QFocusEvent*);
-      void storeInitialState();
 
       QMenu* menuFunctions, *select, *menuGain;
 
@@ -96,7 +91,7 @@ class WaveEdit : public MidiEditor {
 
 
    signals:
-      void deleted(unsigned long);
+      void deleted(TopWin*);
 
    public:
       WaveEdit(PartList*);