make sure we are getting the gui mutex before shutting down

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 8f0ab7e6f409e1c9e2d099d29874b37d274cd63c..7972450bd250b09e4828a53145c3c61bef41808e 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -6,7 +6,7 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "dropsrc.h"
 #endif
 
   #pragma implementation "dropsrc.h"
 #endif
 


@@ -38,17 +38,13 @@
 #include "wx/log.h"
 #include "wx/dnd.h"
 
 #include "wx/log.h"
 #include "wx/dnd.h"
 

-#include <windows.h>
+#include "wx/msw/private.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__) || defined(__WXWINCE__)

     #include <ole2.h>
 #endif
 
     #include <ole2.h>
 #endif
 

-#ifndef __WIN32__
-    #include <ole2.h>
-    #include <olestd.h>
-#endif
-

 #include <oleauto.h>
 
 #include "wx/msw/ole/oleutils.h"
 #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
 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)

 };
 
 // ============================================================================
 };
 
 // ============================================================================