fingers crossed..

[wxWidgets.git] / src / msw / ole / oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index efec456070eb5368882199fdca7b30dfc407cb21..7649d712e20c5cf379609ee8948ccec584afa33c 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -2,7 +2,7 @@
 // Name:        ole/oleutils.cpp
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin
 // Name:        ole/oleutils.cpp
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -22,27 +22,25 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#define IN_WX_MAIN_CPP

 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 

-#include  <wx/setup.h>
+#include  "wx/setup.h"
+#include  "wx/log.h"

 
 

-#if USE_DRAG_AND_DROP
-
-#include  <wx/log.h>
+#ifndef __CYGWIN10__

 
 #include <windows.h>
 
 // OLE
 
 #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(_MSC_VER) && (_MSC_VER > 1000)
-#include  <docobj.h>
+#if defined(__VISUALC__) && (__VISUALC__ > 1000)
+    #include  <docobj.h>

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -60,27 +58,30 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return FALSE;
 }
 
   return FALSE;
 }
 

+#if wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 

-#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
-const char *GetIidName(REFIID riid)
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)
+static wxString GetIidName(REFIID riid)

 {
   // an association between symbolic name and numeric value of an IID
   struct KNOWN_IID {
     const IID  *pIid;
 {
   // 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
   };
 
   // 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),
 
   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(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),


@@ -88,6 +89,7 @@ const char *GetIidName(REFIID riid)
     ADD_KNOWN_IID(OleDocumentSite),
     ADD_KNOWN_IID(OleDocumentView),
     ADD_KNOWN_IID(Print),
     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),
     ADD_KNOWN_IID(DataAdviseHolder),
     ADD_KNOWN_IID(DataObject),
     ADD_KNOWN_IID(Debug),


@@ -166,14 +168,32 @@ const char *GetIidName(REFIID riid)
   }
 
   // unknown IID, just transform to string
   }
 
   // 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 wxChar *szInterface, REFIID riid)
+{
+  wxLogTrace(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);
+}
+
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)
+{
+  wxLogTrace(wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);

 }
 
 }
 

+#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
+
+// For VC++ 4

 void wxLogQueryInterface(const char *szInterface, REFIID riid)
 {
 void wxLogQueryInterface(const char *szInterface, REFIID riid)
 {

-  wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+  wxLogTrace("%s::QueryInterface", szInterface);

 }
 
 void wxLogAddRef(const char *szInterface, ULONG cRef)
 }
 
 void wxLogAddRef(const char *szInterface, ULONG cRef)


@@ -189,4 +209,8 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
 #endif  //WXDEBUG
 
 #endif
 #endif  //WXDEBUG
 
 #endif

-  // USE_DRAG_AND_DROP
+  // wxUSE_DRAG_AND_DROP
+
+#endif
+  // __CYGWIN10__
+