From: Jürgen Spitzmüller Date: Wed, 16 Feb 2011 15:56:07 +0000 (+0000) Subject: Menus.cpp: use proper ifdefs. X-Git-Tag: 2.0.0~722 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7a7676e3fee018533c7ffa99d8c455b40f65ba07;p=features.git Menus.cpp: use proper ifdefs. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37693 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 84dc193312..c25ad978ab 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -1572,7 +1572,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) } } -#ifdef Q_WS_WIN && QT_VERSION >= 0x040600 +#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600) class AlwaysMnemonicStyle : public QProxyStyle { public: int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0, @@ -1592,7 +1592,7 @@ public: Menu::Menu(GuiView * gv, QString const & name, bool top_level, bool keyboard) : QMenu(gv), d(new Menu::Impl) { -#ifdef Q_WS_WIN && QT_VERSION >= 0x040600 +#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600) if (keyboard) setStyle(new AlwaysMnemonicStyle); #else