Am 18.07.2010 um 13:51 schrieb Vincent van Ravesteijn: > Op 18-7-2010 13:49, uwesto...@lyx.org schreef: >> Author: uwestoehr >> Date: Sun Jul 18 13:49:34 2010 >> New Revision: 34969 >> URL: http://www.lyx.org/trac/changeset/34969 >> >> Log: >> GuiWorkArea.cpp: make it compilable >> >> Stephan, please check if this is correct >> >> Modified: >> lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp >> >> Modified: lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp >> ============================================================================== >> --- lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp Sun Jul 18 >> 12:32:54 2010 (r34968) >> +++ lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp Sun Jul 18 >> 13:49:34 2010 (r34969) >> @@ -820,16 +820,16 @@ >> bool zoom = false; >> switch (lyxrc.scroll_whell_zoom) { >> case LyXRC::SCROLL_WHEEL_ZOOM_CTRL: >> - zoom = ev->modifiers()& Qt::ControlModifier; >> - zoom&= !(ev->modifiers()& (Qt::ShiftModifier || >> Qt::AltModifier)); >> + zoom = ev->modifiers()&& Qt::ControlModifier; >> + zoom&= !(ev->modifiers()&& (Qt::ShiftModifier || >> Qt::AltModifier)); >> break; >> case LyXRC::SCROLL_WHEEL_ZOOM_SHIFT: >> - zoom = ev->modifiers()& Qt::ShiftModifier; >> - zoom&= !(ev->modifiers()& (Qt::ControlModifier || >> Qt::AltModifier)); >> + zoom = ev->modifiers()&& Qt::ShiftModifier; >> + zoom&= !(ev->modifiers()&& (Qt::ControlModifier || >> Qt::AltModifier)); >> break; >> case LyXRC::SCROLL_WHEEL_ZOOM_ALT: >> - zoom = ev->modifiers()& Qt::AltModifier; >> - zoom&= !(ev->modifiers()& (Qt::ShiftModifier || >> Qt::ControlModifier)); >> + zoom = ev->modifiers()&& Qt::AltModifier; >> + zoom&= !(ev->modifiers()&& (Qt::ShiftModifier || >> Qt::ControlModifier)); >> break; >> case LyXRC::SCROLL_WHEEL_ZOOM_OFF: >> break; >> > > This is not correct for sure.
Sorry. I answered to fast. Of course I meant - it worked before. I don't know why it does not compile for you, Uwe. Here my version was ok. Now, Vincent is right, it is not correct anymore. Stephan
