X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a9bd487b5ee30238e35ff4962bf70237cfc2c0..d3e780ecdf69233c872d51216eedbc64a1b6db25:/src/msw/ole/oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 34f1109c68..c8ce51a5b7 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -6,7 +6,7 @@
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "oleutils.h"
 #endif
 
@@ -28,14 +28,29 @@
 #pragma hdrstop
 #endif
 
-#include  <wx/setup.h>
-#include  <wx/log.h>
+#include  "wx/setup.h"
+#include  "wx/log.h"
 
-#include <windows.h>
+#if wxUSE_OLE
+
+#ifndef __CYGWIN10__
+
+#include "wx/msw/private.h"
+
+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>
+
+    #define GUID_DEFINED
+    #define UUID_DEFINED
+#endif
 
 // OLE
-#include  <wx/msw/ole/uuid.h>
-#include  <wx/msw/ole/oleutils.h>
+#ifndef __WXWINCE__
+#include  "wx/msw/ole/uuid.h"
+#endif
+
+#include  "wx/msw/ole/oleutils.h"
 
 #if defined(__VISUALC__) && (__VISUALC__ > 1000)
     #include  <docobj.h>
@@ -56,30 +71,30 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return FALSE;
 }
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
-#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)
-const char *GetIidName(REFIID riid)
+#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
+static wxString GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
   struct KNOWN_IID {
     const IID  *pIid;
-    const char *szName;
+    const wxChar *szName;
   };
 
   // construct the table containing all known interfaces
-  #define ADD_KNOWN_IID(name) { &IID_I##name, #name }
+  #define ADD_KNOWN_IID(name) { &IID_I##name, _T(#name) }
 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
-#if !defined( __VISUALC__) || (__VISUALC__!=1010) 
+#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__)
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),
@@ -165,25 +180,29 @@ const char *GetIidName(REFIID riid)
     }
   }
 
+#ifndef __WXWINCE__
   // unknown IID, just transform to string
-  static Uuid s_uuid;
-  s_uuid.Set(riid);
-  return s_uuid;
+  Uuid uuid(riid);
+  return wxString((const wxChar *)uuid);
+#else
+  return wxEmptyString;
+#endif
 }
 
-void wxLogQueryInterface(const char *szInterface, REFIID riid)
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
 {
-  wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+  wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
+             szInterface, GetIidName(riid).c_str());
 }
 
-void wxLogAddRef(const char *szInterface, ULONG cRef)
+void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
 {
-  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);
 }
 
-void wxLogRelease(const char *szInterface, ULONG cRef)
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)
 {
-  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }
 
 #elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
@@ -208,3 +227,10 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
 
 #endif
   // wxUSE_DRAG_AND_DROP
+
+#endif
+  // __CYGWIN10__
+
+#endif
+  // wxUSE_OLE
+