protect gs_allThreads with a mutex (modified patch 1518719)

[wxWidgets.git] / src / msw / ole / activex.cpp

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 4b5a415e64389781ff6f7e4162037c69869c0da1..23415001823e0cde63d73f42a8bb7c1c1dae6dd2 100644 (file)
--- 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)
                             );
             }
         }