X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d484919aad7cbd553103c414424bf488df272f7..25b34b267ec6878c04add03e874986673fa0f19f:/src/msw/ole/activex.cpp diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 4b5a415e64..2341500182 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -23,8 +23,10 @@ #pragma hdrstop #endif -#include "wx/dcclient.h" -#include "wx/math.h" +#ifndef WX_PRECOMP + #include "wx/dcclient.h" + #include "wx/math.h" +#endif // I don't know why members of tagVARIANT aren't found when compiling // with Wine @@ -946,7 +948,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) hret = cp->Advise(new wxActiveXEvents(this, ta->guid), &adviseCookie); wxASSERT_MSG( SUCCEEDED(hret), - wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), hret) + wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), (unsigned int)hret) ); } }