X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..e5d4ef7410d597bdf6d426ceedc656dbefd69e90:/src/msw/ole/oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 543c54f9fe..ce53368f7a 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 <windows.h>
+#include "wx/msw/private.h"
+
+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>
+
+    #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)
@@ -49,18 +60,18 @@
 // Implementation
 // ============================================================================
 
-// return TRUE if the iid is in the array
+// return true if the iid is in the array
 bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )
-      return TRUE;
+      return true;
   }
 
-  return FALSE;
+  return false;
 }
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 // Debug support
@@ -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)