merged with release_2_0

1 files changed, 8 insertions, 5 deletions

diff --git a/muse2/awl/posedit.h b/muse2/awl/posedit.h
index 65bc48de..b834be3c 100644
--- a/muse2/awl/posedit.h
+++ b/muse2/awl/posedit.h
@@ -44,7 +44,10 @@ class PosEdit : public QAbstractSpinBox
       bool _smpte;
       MusECore::Pos _pos;
       bool initialized;
-
+      bool _returnMode;
+      int cur_minute, cur_sec, cur_frame, cur_subframe;
+      int cur_bar, cur_beat, cur_tick;
+      
       QIntValidator* validator;
       
       virtual void paintEvent(QPaintEvent* event);
@@ -52,10 +55,9 @@ class PosEdit : public QAbstractSpinBox
       virtual StepEnabled stepEnabled() const;
       virtual void fixup(QString& input) const;
       virtual QValidator::State validate(QString&, int&) const;
-      void updateValue();
       int curSegment() const;
       virtual bool event(QEvent*);
-      void finishEdit();
+      bool finishEdit();
 
    signals:
       void valueChanged(const MusECore::Pos&);
@@ -74,13 +76,14 @@ class PosEdit : public QAbstractSpinBox
 
    public:
       PosEdit(QWidget* parent = 0);
-      ~PosEdit();
       QSize sizeHint() const;
 
       MusECore::Pos pos() const { return _pos; }
       void setSmpte(bool);
       bool smpte() const { return _smpte; }
-      // void* operator new(size_t);          // What was this for? Tim.
+      void setReturnMode(bool v) { _returnMode = v; } 
+      bool returnMode() const    { return _returnMode; }
+      void updateValue();
       };
 }