Fix compilation of MSW wxFSVolume with non-wxMSW ports.

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 91dcb37866410ab69600269d1b52547a3c5581d1..9118eecef8f3afb0ac61bc415a215a3de0be6a06 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -24,13 +24,13 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_OLE && wxUSE_DRAG_AND_DROP
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_OLE && wxUSE_DRAG_AND_DROP
-
-#include "wx/log.h"

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


@@ -64,7 +64,7 @@ private:
   DWORD         m_grfInitKeyState;  // button which started the d&d operation
   wxDropSource *m_pDropSource;      // pointer to C++ class we belong to
 
   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);

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


@@ -233,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());
 


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

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