latest CW additions

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index efec456070eb5368882199fdca7b30dfc407cb21..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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#define IN_WX_MAIN_CPP

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


@@ -30,9 +29,6 @@
 #endif
 
 #include  <wx/setup.h>
 #endif
 
 #include  <wx/setup.h>

-
-#if USE_DRAG_AND_DROP
-

 #include  <wx/log.h>
 
 #include <windows.h>
 #include  <wx/log.h>
 
 #include <windows.h>


@@ -60,6 +56,8 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return FALSE;
 }
 
   return FALSE;
 }
 

+#if wxUSE_DRAG_AND_DROP
+

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


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

-  // USE_DRAG_AND_DROP
+  // wxUSE_DRAG_AND_DROP