From d4aefc60abf3e014633b9a7544cb4b701864a061 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 24 Aug 2009 14:31:18 +0200 Subject: Compile after a41d614eb8afd7c1c5b95b8ac34335fc0aaf0a18 Change a41d614 sets _WIN32_WINNT to 0x500, which will cause FAPPCOMMAND_MOUSE to be defined in the PlatformSDK, but not APPCOMMAND_MICROPHONE_VOLUME_MUTE (which requires 0x501 for the version.) The check for APPCOMMAND_MICROPHONE_VOLUME_MUTE would thus be #ifdef'd out and compilation would fail. Reviewed-by: Thierry --- src/gui/kernel/qapplication_win.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 12cd879..76a3b1e 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -323,6 +323,7 @@ extern HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int #define APPCOMMAND_BASS_UP 21 #define APPCOMMAND_TREBLE_DOWN 22 #define APPCOMMAND_TREBLE_UP 23 +#endif // FAPPCOMMAND_MOUSE // New commands from Windows XP (some even Sp1) #ifndef APPCOMMAND_MICROPHONE_VOLUME_MUTE @@ -357,8 +358,6 @@ extern HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int #define APPCOMMAND_MEDIA_CHANNEL_DOWN 52 #endif // APPCOMMAND_MICROPHONE_VOLUME_MUTE -#endif // FAPPCOMMAND_MOUSE - #if (_WIN32_WINNT < 0x0400) // This struct is defined in winuser.h if the _WIN32_WINNT >= 0x0400 -- in the // other cases we have to define it on our own. -- cgit v0.12