#pragma hdrstop
#endif
-#include <wx/setup.h>
-#include <wx/log.h>
+#include "wx/setup.h"
+#include "wx/log.h"
+
+#ifndef __CYGWIN10__
#include <windows.h>
// OLE
-#include <wx/msw/ole/uuid.h>
-#include <wx/msw/ole/oleutils.h>
+#include "wx/msw/ole/uuid.h"
+#include "wx/msw/ole/oleutils.h"
#if defined(__VISUALC__) && (__VISUALC__ > 1000)
#include <docobj.h>
// ----------------------------------------------------------------------------
#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)
-const char *GetIidName(REFIID riid)
+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)
ADD_KNOWN_IID(ContinueCallback),
ADD_KNOWN_IID(EnumOleDocumentViews),
ADD_KNOWN_IID(OleCommandTarget),
ADD_KNOWN_IID(OleDocumentSite),
ADD_KNOWN_IID(OleDocumentView),
ADD_KNOWN_IID(Print),
+#endif
ADD_KNOWN_IID(DataAdviseHolder),
ADD_KNOWN_IID(DataObject),
ADD_KNOWN_IID(Debug),
}
// 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);
}
-void wxLogQueryInterface(const char *szInterface, REFIID riid)
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
{
- wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+ wxLogTrace(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(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(wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
}
#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
#endif
// wxUSE_DRAG_AND_DROP
+
+#endif
+ // __CYGWIN10__
+