From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 9 Sep 2004 14:34:48 +0000 (+0000)
Subject: compilation fix for VC6 (closes 1025093)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4f79eb791ac98442e4813fd06b884ce91cab2e67?ds=inline

compilation fix for VC6 (closes 1025093)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 551679062f..af3dd67586 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -904,8 +904,10 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 
 void wxTopLevelWindowMSW::RequestUserAttention(int flags)
 {
-    // check if we can use FlashWindowEx()
-#ifdef FLASHW_STOP
+    // check if we can use FlashWindowEx(): unfortunately an explicit test for
+    // FLASHW_STOP, for example, doesn't work because MSVC6 headers do #define
+    // it but don't provide FlashWindowEx() declaration
+#if WINVER >= 0x0500
     // available in the headers, check if it is supported by the system
     typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi);
     FlashWindowEx_t s_pfnFlashWindowEx = NULL;
@@ -938,7 +940,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
         s_pfnFlashWindowEx(&fwi);
     }
     else // FlashWindowEx() not available
-#endif // FLASHW_STOP
+#endif // FlashWindowEx() defined
     {
         wxUnusedVar(flags);
 #ifndef __WXWINCE__