more backwards compatible kbd handling in wxScrolledWindow

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 2de92ce70938c053672843a674d2f0e4f62101d1..38519d4f9bda2e2bc4adb4a7b66b8ff9c19b08dc 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,23 @@
 #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>
-
-#if USE_DRAG_AND_DROP
-
-#include  <wx/log.h>
+#include  "wx/setup.h"
+#include  "wx/log.h"

 
 #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,11 +56,13 @@ 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)
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)

 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID


@@ -81,6 +79,7 @@ const char *GetIidName(REFIID riid)
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
     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 +87,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),


@@ -159,7 +159,7 @@ const char *GetIidName(REFIID riid)
   #undef ADD_KNOWN_IID
 
   // try to find the interface in the table
   #undef ADD_KNOWN_IID
 
   // try to find the interface in the table

-  for ( uint ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {
+  for ( size_t ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {

     if ( riid == *aKnownIids[ui].pIid ) {
       return aKnownIids[ui].szName;
     }
     if ( riid == *aKnownIids[ui].pIid ) {
       return aKnownIids[ui].szName;
     }


@@ -186,7 +186,25 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
   wxLogTrace("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)
+{
+  wxLogTrace("%s::QueryInterface", szInterface);
+}
+
+void wxLogAddRef(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+}
+
+void wxLogRelease(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+}
+

 #endif  //WXDEBUG
 
 #endif
 #endif  //WXDEBUG
 
 #endif

-  // USE_DRAG_AND_DROP
+  // wxUSE_DRAG_AND_DROP