Mark various OLE helper functions as DLL exported so they can be used from other...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 1b4d5e6d7ea34cedf6a35ccbdb9d0faa51a8f313..87d68c4926bd0abc88f87471fa80a7e5ef7850d0 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -82,7 +82,7 @@ inline void ReleaseInterface(IUnknown *pIUnk)
 #define   RELEASE_AND_NULL(p)   if ( (p) != NULL ) { p->Release(); p = NULL; };
 
 // return true if the iid is in the array
 #define   RELEASE_AND_NULL(p)   if ( (p) != NULL ) { p->Release(); p = NULL; };
 
 // return true if the iid is in the array

-extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
+WXDLLIMPEXP_CORE extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);

 
 // ============================================================================
 // IUnknown implementation helpers
 
 // ============================================================================
 // IUnknown implementation helpers


@@ -197,11 +197,11 @@ private:
 // ----------------------------------------------------------------------------
 
 // tries to translate riid into a symbolic name, if possible
 // ----------------------------------------------------------------------------
 
 // tries to translate riid into a symbolic name, if possible

-void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);
+WXDLLIMPEXP_CORE void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);

 
 // these functions print out the new value of reference counter
 
 // these functions print out the new value of reference counter

-void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
-void wxLogRelease(const wxChar *szInterface, ULONG cRef);
+WXDLLIMPEXP_CORE void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
+WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef);

 
 #else   //!__WXDEBUG__
   #define   wxLogQueryInterface(szInterface, riid)
 
 #else   //!__WXDEBUG__
   #define   wxLogQueryInterface(szInterface, riid)

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index c992ce0af50b7f1811983bfcd17236b622a7fc14..fbfae3a5d9d15e03b579108036a5ed40f8ca12bb 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -58,7 +58,7 @@
 // ============================================================================
 
 // 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)
+WXDLLEXPORT bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)

 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )


@@ -512,18 +512,18 @@ static wxString GetIidName(REFIID riid)
 #endif
 }
 
 #endif
 }
 

-void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
+WXDLLEXPORT void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)

 {
   wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
              szInterface, GetIidName(riid).c_str());
 }
 
 {
   wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
              szInterface, GetIidName(riid).c_str());
 }
 

-void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
+WXDLLEXPORT void wxLogAddRef(const wxChar *szInterface, ULONG cRef)

 {
   wxLogTrace(wxTRACE_OleCalls, 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)
+WXDLLEXPORT void wxLogRelease(const wxChar *szInterface, ULONG cRef)

 {
   wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }
 {
   wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }