include jconfig.vc under OS/2 too

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 1b5020da3aac9508a0a1d37ce03dfb855f1016ac..90f89d419e0412b09bf9659b2f3761c8fcf6f98e 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"


@@ -54,12 +54,12 @@ 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


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

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