merged with release_2_0

1 files changed, 13 insertions, 14 deletions

diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 82ac697b..53ebf953 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -40,7 +40,7 @@
 #include "gconfig.h"
 #include "audio.h"
 
-#include <values.h>
+#include <limits.h>
 
 #include <QActionGroup>
 #include <QCloseEvent>
@@ -252,16 +252,13 @@ MasterEdit::MasterEdit()
       connect(canvas, SIGNAL(followEvent(int)), hscroll, SLOT(setOffset(int)));
       connect(canvas, SIGNAL(timeChanged(unsigned)),   SLOT(setTime(unsigned)));
 
-      if(MusEGlobal::config.smartFocus)
-      {
-        connect(curSig,   SIGNAL(returnPressed()), SLOT(focusCanvas()));
-        connect(curSig,   SIGNAL(escapePressed()), SLOT(focusCanvas()));
-        connect(curTempo, SIGNAL(returnPressed()), SLOT(focusCanvas()));
-        connect(curTempo, SIGNAL(escapePressed()), SLOT(focusCanvas()));
-      }
+      connect(curSig,   SIGNAL(returnPressed()), SLOT(focusCanvas()));
+      connect(curSig,   SIGNAL(escapePressed()), SLOT(focusCanvas()));
+      connect(curTempo, SIGNAL(returnPressed()), SLOT(focusCanvas()));
+      connect(curTempo, SIGNAL(escapePressed()), SLOT(focusCanvas()));
       
       initTopwinState();
-      MusEGlobal::muse->topwinMenuInited(this);
+      finalizeInit();
       }
 
 //---------------------------------------------------------
@@ -381,8 +378,11 @@ void MasterEdit::writeConfiguration(int level, MusECore::Xml& xml)
 
 void MasterEdit::focusCanvas()
 {
-  canvas->setFocus();
-  canvas->activateWindow();
+  if(MusEGlobal::config.smartFocus)
+  {
+    canvas->setFocus();
+    canvas->activateWindow();
+  } 
 }
 
 //---------------------------------------------------------
@@ -396,8 +396,7 @@ void MasterEdit::_setRaster(int index)
             };
       _raster = rasterTable[index];
       _rasterInit = _raster;
-      if(MusEGlobal::config.smartFocus)
-        focusCanvas();
+      focusCanvas();
       }
 
 //---------------------------------------------------------
@@ -427,7 +426,7 @@ void MasterEdit::posChanged(int idx, unsigned val, bool)
 
 void MasterEdit::setTime(unsigned tick)
       {
-      if (tick == MAXINT)
+      if (tick == INT_MAX)
             cursorPos->setEnabled(false);
       else {
             cursorPos->setEnabled(true);