X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c18da2e41b828804dce26bafa93bd21ca8a04b9..e736b21a8c9295b42a528d76863559a4265dab02:/src/msw/ole/oleutils.cpp diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 1a0966bfd9..c8ce51a5b7 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "oleutils.h" #endif @@ -35,10 +35,21 @@ #ifndef __CYGWIN10__ -#include +#include "wx/msw/private.h" + +#ifdef __WXWINCE__ + #include + #include + + #define GUID_DEFINED + #define UUID_DEFINED +#endif // OLE +#ifndef __WXWINCE__ #include "wx/msw/ole/uuid.h" +#endif + #include "wx/msw/ole/oleutils.h" #if defined(__VISUALC__) && (__VISUALC__ > 1000) @@ -169,9 +180,13 @@ static wxString GetIidName(REFIID riid) } } +#ifndef __WXWINCE__ // unknown IID, just transform to string Uuid uuid(riid); return wxString((const wxChar *)uuid); +#else + return wxEmptyString; +#endif } void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)