In DialogEd, changed Close to Destroy to make it shut down properly.

[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 1430abbbe294aecd3e20e65703cfb161354c65b9..2335dd5468df969b2f9f894ea07a2777ddcc7408 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -6,16 +6,18 @@
 // Created:     19.02.1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _OLEUTILS_H
-#define   _OLEUTILS_H
+#ifndef   _WX_OLEUTILS_H
+#define   _WX_OLEUTILS_H
 
 #ifdef __GNUG__
 #pragma interface "oleutils.h"
 #endif
 
+#include "wx/defs.h"
+
 // ============================================================================
 // General purpose functions and macros
 // ============================================================================
@@ -119,8 +121,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // Debugging support
 // ============================================================================
 
-#ifdef  __DEBUG__
-
+#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
 // ----------------------------------------------------------------------------
 // 
 // ----------------------------------------------------------------------------
@@ -136,10 +137,10 @@ void wxLogQueryInterface(const char *szInterface, REFIID riid);
 void wxLogAddRef (const char *szInterface, ULONG cRef);
 void wxLogRelease(const char *szInterface, ULONG cRef);
 
-#else   //!DEBUG
+#else   //!WXDEBUG
   #define   wxLogQueryInterface(szInterface, riid)
   #define   wxLogAddRef(szInterface, cRef)
   #define   wxLogRelease(szInterface, cRef)
-#endif  //DEBUG
+#endif  //WXDEBUG
 
-#endif  //_OLEUTILS_H
\ No newline at end of file
+#endif  //_WX_OLEUTILS_H
\ No newline at end of file