Fix bug #6367: Screen jumps around when using undo/redo

[lyx.git] / src / FuncStatus.cpp

diff --git a/src/FuncStatus.cpp b/src/FuncStatus.cpp
index 17e59e677ded3666dfb11a794b1d020f6305f2b4..576376a4eec20ad5d4196d4410c188ece136541f 100644 (file)
--- a/src/FuncStatus.cpp
+++ b/src/FuncStatus.cpp
@@ -28,20 +28,12 @@ void FuncStatus::clear()
 }
 
 
-void FuncStatus::operator|=(FuncStatus const & f)
-{
-       v_ |= f.v_;
-       if (!f.message_.empty())
-               message_ = f.message_;
-}
-
-
-void FuncStatus::unknown(bool b)
+void FuncStatus::setUnknown(bool b)
 {
        if (b)
                v_ |= UNKNOWN;
        else
-               v_ &= !UNKNOWN;
+               v_ &= ~UNKNOWN;
 }
 
 
@@ -52,10 +44,10 @@ bool FuncStatus::unknown() const
 }
 
 
-void FuncStatus::enabled(bool b)
+void FuncStatus::setEnabled(bool b)
 {
        if (b)
-               v_ &= !DISABLED;
+               v_ &= ~DISABLED;
        else
                v_ |= DISABLED;
 }
@@ -73,7 +65,7 @@ void FuncStatus::setOnOff(bool b)
 }
 
 
-bool FuncStatus::onoff(bool b) const
+bool FuncStatus::onOff(bool b) const
 {
        if (b)
                return (v_ & ON);