fixing osx_cocoa

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 7b66b0c3506c8c23f5809a88fe3cf026345898a5..9118eecef8f3afb0ac61bc415a215a3de0be6a06 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ole/dropsrc.cpp
+// Name:        src/msw/ole/dropsrc.cpp

 // Purpose:     implementation of wxIDropSource and wxDropSource
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxIDropSource and wxDropSource
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -23,15 +23,14 @@
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif

-#ifndef WX_PRECOMP
-#include "wx/window.h"
-#endif
-
-#include "wx/setup.h"

 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 

-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/dnd.h"
 
 #include "wx/msw/private.h"
 #include "wx/dnd.h"
 
 #include "wx/msw/private.h"


@@ -55,17 +54,17 @@ public:
   wxIDropSource(wxDropSource *pDropSource);
   virtual ~wxIDropSource() { }
 
   wxIDropSource(wxDropSource *pDropSource);
   virtual ~wxIDropSource() { }
 

-  DECLARE_IUNKNOWN_METHODS;
-

   // IDropSource
   STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState);
   STDMETHODIMP GiveFeedback(DWORD dwEffect);
 
   // IDropSource
   STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState);
   STDMETHODIMP GiveFeedback(DWORD dwEffect);
 

+    DECLARE_IUNKNOWN_METHODS;
+

 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)
+  wxDECLARE_NO_COPY_CLASS(wxIDropSource);

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


@@ -234,7 +233,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
 bool wxDropSource::GiveFeedback(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);
 bool wxDropSource::GiveFeedback(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);

-    if ( cursor.Ok() )
+    if ( cursor.IsOk() )

     {
         ::SetCursor((HCURSOR)cursor.GetHCURSOR());
 
     {
         ::SetCursor((HCURSOR)cursor.GetHCURSOR());
 


@@ -246,4 +245,4 @@ bool wxDropSource::GiveFeedback(wxDragResult effect)
     }
 }
 
     }
 }
 

-#endif  //USE_DRAG_AND_DROP
+#endif  // wxUSE_OLE && wxUSE_DRAG_AND_DROP