added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 8f0ab7e6f409e1c9e2d099d29874b37d274cd63c..fee89b633f6c00a197df4964e13b5446404eb223 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -40,15 +40,11 @@
 
 #include <windows.h>
 
-#if wxUSE_NORLANDER_HEADERS
+// for some compilers, the entire ole2.h must be included, not only oleauto.h
+#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
     #include <ole2.h>
 #endif
 
-#ifndef __WIN32__
-    #include <ole2.h>
-    #include <olestd.h>
-#endif
-
 #include <oleauto.h>
 
 #include "wx/msw/ole/oleutils.h"
@@ -71,6 +67,8 @@ public:
 private:
   DWORD         m_grfInitKeyState;  // button which started the d&d operation
   wxDropSource *m_pDropSource;      // pointer to C++ class we belong to
+
+    DECLARE_NO_COPY_CLASS(wxIDropSource)
 };
 
 // ============================================================================