X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..78e376b56fe2716067010e355cbc5b49cab82002:/src/msw/ole/oleutils.cpp diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 55e74c6c45..6a68095f7d 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -31,6 +31,10 @@ #include "wx/setup.h" #include "wx/log.h" +#if wxUSE_OLE + +#ifndef __CYGWIN10__ + #include // OLE @@ -62,7 +66,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount) // Debug support // ---------------------------------------------------------------------------- -#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000) +#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 @@ -79,7 +83,7 @@ static wxString GetIidName(REFIID riid) 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), @@ -172,18 +176,18 @@ static wxString GetIidName(REFIID riid) void wxLogQueryInterface(const wxChar *szInterface, REFIID riid) { - wxLogTrace(wxT("%s::QueryInterface (iid = %s)"), + wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"), szInterface, GetIidName(riid).c_str()); } void wxLogAddRef(const wxChar *szInterface, ULONG cRef) { - wxLogTrace(wxT("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 wxChar *szInterface, ULONG cRef) { - wxLogTrace(wxT("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 +212,10 @@ void wxLogRelease(const char *szInterface, ULONG cRef) #endif // wxUSE_DRAG_AND_DROP + +#endif + // __CYGWIN10__ + +#endif + // wxUSE_OLE +