wxCALLBACK added, wxCOMPFUNC_CONV moved to defs.h

[wxWidgets.git] / include / wx / msw / ole / oleutils.h

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 2335dd5468df969b2f9f894ea07a2777ddcc7408..d20c22c17bd78f343f8ecc0d3598de503197461b 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -2,7 +2,7 @@
 // Name:        oleutils.h
 // Purpose:     OLE helper routines, OLE debugging support &c
 // Author:      Vadim Zeitlin
 // Name:        oleutils.h
 // Purpose:     OLE helper routines, OLE debugging support &c
 // Author:      Vadim Zeitlin

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

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


@@ -17,7 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-
+#ifdef wxUSE_NORLANDER_HEADERS
+#include <ole2.h>
+#endif

 // ============================================================================
 // General purpose functions and macros
 // ============================================================================
 // ============================================================================
 // General purpose functions and macros
 // ============================================================================


@@ -44,7 +46,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // ============================================================================
 
 /*
 // ============================================================================
 
 /*

-   The most dumb implementation of IUnknown methods. We don't support 
+   The most dumb implementation of IUnknown methods. We don't support

    aggregation nor containment, but for 99% of cases this simple
    implementation is quite enough.
 
    aggregation nor containment, but for 99% of cases this simple
    implementation is quite enough.
 


@@ -121,11 +123,10 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // Debugging support
 // ============================================================================
 
 // Debugging support
 // ============================================================================
 

-#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
-// ----------------------------------------------------------------------------
-// 
-// ----------------------------------------------------------------------------
-
+// VZ: I don't know it's not done for compilers other than VC++ but I leave it
+//     as is. Please note, though, that tracing OLE interface calls may be
+//     incredibly useful when debugging OLE programs.
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000)

 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------


@@ -143,4 +144,5 @@ void wxLogRelease(const char *szInterface, ULONG cRef);
   #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG
 
   #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG
 

-#endif  //_WX_OLEUTILS_H
\ No newline at end of file
+#endif  //_WX_OLEUTILS_H
+