From 1a838ff58bfd0fd040156a16ce6fd804e20b5f46 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Sat, 18 Sep 2004 14:16:37 +0000 Subject: [PATCH] fix compile break for unknown FLASHWINFO git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 12 ++++++++++++ src/msw/toplevel.cpp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index d4532496ae..1c413a3462 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -184,6 +184,7 @@ typedef struct { #define LVM_SETUNICODEFORMAT 0x2005 #endif + // ---------------------------------------------------------------------------- // Toolbar define value missing // ---------------------------------------------------------------------------- @@ -592,6 +593,17 @@ typedef struct { #define OFN_ENABLESIZING 0x00800000 #endif +// ------------------ For Flashing Window ------------- +#if (defined(__BORLANDC__) && (__BORLANDC__ < 550)) +typedef struct { + UINT cbSize; + HWND hwnd; + DWORD dwFlags; + UINT uCount; + DWORD dwTimeout; +} FLASHWINFO, *PFLASHWINFO; +#endif + // In addition, include stuff not defined in WinCE #ifdef __WXWINCE__ #include "wx/msw/wince/missing.h" diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index af3dd67586..ae28587509 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -907,7 +907,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags) // 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 +#if (WINVER >= 0x0500 && (defined FLASHW_STOP)) // available in the headers, check if it is supported by the system typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi); FlashWindowEx_t s_pfnFlashWindowEx = NULL; -- 2.47.2