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 551679062f72a70afa167f755ae713c00ed1a4a1..af3dd6758645438acbf1284067f335c19c33e20b 100644 (file)
--- 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)
 {
 
 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;
     // 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
         s_pfnFlashWindowEx(&fwi);
     }
     else // FlashWindowEx() not available

-#endif // FLASHW_STOP
+#endif // FlashWindowEx() defined

     {
         wxUnusedVar(flags);
 #ifndef __WXWINCE__
     {
         wxUnusedVar(flags);
 #ifndef __WXWINCE__