Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch to build wxMSW with CW7 (patch 550445)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-09 22:34:44 +00:00
parent 7cf46fdb3e
commit ba14d9861d
32 changed files with 30658 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/ole/oleutils.cpp
View File

@@ -66,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
@@ -83,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),
@@ -176,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)