Dialog Editor corrections for latest wxWin changes; removed wxProp files

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 92a16e713a189690e9303293392043e44021a846..cb2a9e698b74e1abcee1692c68b9c4697f94e665 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -22,7 +22,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -30,9 +29,6 @@
 #endif
 
 #include  <wx/setup.h>
-
-#if USE_DRAG_AND_DROP
-
 #include  <wx/log.h>
 
 #include <windows.h>
@@ -41,7 +37,7 @@
 #include  <wx/msw/ole/uuid.h>
 #include  <wx/msw/ole/oleutils.h>
 
-#ifndef __BORLANDC__
+#if defined(_MSC_VER) && (_MSC_VER > 1000)
 #include  <docobj.h>
 #endif
 
@@ -60,11 +56,13 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return FALSE;
 }
 
+#if wxUSE_DRAG_AND_DROP
+
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
-#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
+#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
@@ -159,7 +157,7 @@ const char *GetIidName(REFIID riid)
   #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;
     }
@@ -186,7 +184,7 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
-#endif  //DEBUG
+#endif  //WXDEBUG
 
 #endif
-  // USE_DRAG_AND_DROP
+  // wxUSE_DRAG_AND_DROP