AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix redefinition errors in wxTaskBarButton code with MSVC

Browse Source 
After 4475fe36a5 there were ambiguities between
PROPERTYKEY and PROPVARIANT defined in the anonymous namespace and the global
header for the compilers that did define them, such as MSVC.

Fix this by not (re)defining PROPERTYKEY if it had been already defined and
not defining PROPVARIANT at all as it's used as PropVariantClear() parameter
in the beginning of this file, before it was defined by us, so it must work
for all the compilers already anyhow.
This commit is contained in:
Vadim Zeitlin 2016-02-12 02:20:44 +01:00
parent 4475fe36a5
commit baf67813b0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/taskbarbutton.cpp
View File

@ -126,17 +126,16 @@ typedef enum TBPFLAG
TBPF_PAUSED = 0x8
} TBPFLAG;
#ifndef PROPERTYKEY_DEFINED
typedef struct _tagpropertykey
{
GUID fmtid;
DWORD pid;
} PROPERTYKEY;
#endif // !PROPERTYKEY_DEFINED
#define REFPROPERTYKEY const PROPERTYKEY &
typedef struct tagPROPVARIANT PROPVARIANT;
#define REFPROPVARIANT const PROPVARIANT &
#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
const PROPERTYKEY name = \
{ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid }
@ -292,7 +291,7 @@ public:
virtual HRESULT wxSTDCALL GetCount(DWORD *) = 0;
virtual HRESULT wxSTDCALL GetAt(DWORD, PROPERTYKEY *) = 0;
virtual HRESULT wxSTDCALL GetValue(REFPROPERTYKEY, PROPVARIANT *) = 0;
virtual HRESULT wxSTDCALL SetValue(REFPROPERTYKEY, REFPROPVARIANT) = 0;
virtual HRESULT wxSTDCALL SetValue(REFPROPERTYKEY, const PROPVARIANT&) = 0;
virtual HRESULT wxSTDCALL Commit() = 0;
};