From 4e66d23d42af93bd67fcbca9b8053a65f766375a Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 21 Nov 2004 14:26:14 +0000 Subject: [PATCH] work around GCC's wide string constant bug when compiling inline functions svn path=/trunk/; revision=11748 --- reactos/subsys/system/explorer/taskbar/traynotify.cpp | 2 +- reactos/subsys/system/explorer/utility/shellclasses.cpp | 6 ++++++ reactos/subsys/system/explorer/utility/shellclasses.h | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/reactos/subsys/system/explorer/taskbar/traynotify.cpp b/reactos/subsys/system/explorer/taskbar/traynotify.cpp index 011ea1aba23..07c0491cc01 100644 --- a/reactos/subsys/system/explorer/taskbar/traynotify.cpp +++ b/reactos/subsys/system/explorer/taskbar/traynotify.cpp @@ -661,7 +661,7 @@ void NotifyArea::Paint() MemCanvas mem_dc; SelectedBitmap bmp(mem_dc, CreateCompatibleBitmap(canvas, NOTIFYICON_SIZE, NOTIFYICON_SIZE)); RECT rect = {0, 0, NOTIFYICON_SIZE, NOTIFYICON_SIZE}; - BLENDFUNCTION blend = {AC_SRC_OVER, 0, 128, 0}; + BLENDFUNCTION blend = {AC_SRC_OVER, 0, 128, 0}; // 50 % visible for(NotifyIconSet::const_iterator it=_sorted_icons.begin(); it!=_sorted_icons.end(); ++it) { if (it->_dwState & NIS_HIDDEN) { diff --git a/reactos/subsys/system/explorer/utility/shellclasses.cpp b/reactos/subsys/system/explorer/utility/shellclasses.cpp index eff4eb3241b..4b999d97610 100644 --- a/reactos/subsys/system/explorer/utility/shellclasses.cpp +++ b/reactos/subsys/system/explorer/utility/shellclasses.cpp @@ -36,6 +36,12 @@ #endif + // work around GCC's wide string constant bug +#ifdef __GNUC__ +const LPCTSTR sCFSTR_SHELLIDLIST = TEXT("Shell IDList Array"); +#endif + + // helper functions for string copying LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count) diff --git a/reactos/subsys/system/explorer/utility/shellclasses.h b/reactos/subsys/system/explorer/utility/shellclasses.h index 39a9058067f..f3e66a47265 100644 --- a/reactos/subsys/system/explorer/utility/shellclasses.h +++ b/reactos/subsys/system/explorer/utility/shellclasses.h @@ -45,6 +45,13 @@ using namespace _com_util; #endif #endif + // work around GCC's wide string constant bug when compiling inline functions +#ifdef __GNUC__ +extern const LPCTSTR sCFSTR_SHELLIDLIST; +#undef CFSTR_SHELLIDLIST +#define CFSTR_SHELLIDLIST sCFSTR_SHELLIDLIST +#endif + // Exception Handling