Consistent naming of e.g. wxUSE_CTRL

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 1f9708873201e968a9256aaf4c2ec9b0af68976a..e6955bad071ff0efa3d9e8fc2d636088e2e1f943 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -30,7 +30,7 @@
 
 #include  <wx/setup.h>
 
 
 #include  <wx/setup.h>
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

 
 #include  <wx/log.h>
 #include  <wx/msw/ole/oleutils.h>
 
 #include  <wx/log.h>
 #include  <wx/msw/ole/oleutils.h>


@@ -121,13 +121,13 @@ STDMETHODIMP wxIDropSource::QueryContinueDrag(BOOL fEscapePressed,
 // Notes   : default implementation is ok in more than 99% of cases
 STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect)
 {
 // Notes   : default implementation is ok in more than 99% of cases
 STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect)
 {

-  wxDropSource::DragResult effect;
+  wxDragResult effect;

   if ( dwEffect & DROPEFFECT_COPY )
   if ( dwEffect & DROPEFFECT_COPY )

-    effect = wxDropSource::Copy;
+    effect = wxDragCopy;

   else if ( dwEffect & DROPEFFECT_MOVE )
   else if ( dwEffect & DROPEFFECT_MOVE )

-    effect = wxDropSource::Move;
+    effect = wxDragMove;

   else
   else

-    effect = wxDropSource::None;
+    effect = wxDragNone;

 
   if ( m_pDropSource->GiveFeedback(effect,
                                    (dwEffect & DROPEFFECT_SCROLL) != 0 ) )
 
   if ( m_pDropSource->GiveFeedback(effect,
                                    (dwEffect & DROPEFFECT_SCROLL) != 0 ) )


@@ -173,12 +173,12 @@ wxDropSource::~wxDropSource()
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation

-// Returns : DragResult - the code of performed operation
+// Returns : wxDragResult - the code of performed operation

 // Params  : [in] bool bAllowMove: if false, only copy is allowed
 // Notes   : you must call SetData() before if you had used def ctor
 // Params  : [in] bool bAllowMove: if false, only copy is allowed
 // Notes   : you must call SetData() before if you had used def ctor

-wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
+wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)

 {
 {

-  wxCHECK_MSG( m_pData != NULL, None, "No data in wxDropSource!" );
+  wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" );

 
   DWORD dwEffect;
   HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), 
 
   DWORD dwEffect;
   HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), 


@@ -188,23 +188,23 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
                             &dwEffect);
 
   if ( hr == DRAGDROP_S_CANCEL ) {
                             &dwEffect);
 
   if ( hr == DRAGDROP_S_CANCEL ) {

-    return Cancel;
+    return wxDragCancel;

   }
   else if ( hr == DRAGDROP_S_DROP ) {
     if ( dwEffect & DROPEFFECT_COPY ) {
   }
   else if ( hr == DRAGDROP_S_DROP ) {
     if ( dwEffect & DROPEFFECT_COPY ) {

-      return Copy;
+      return wxDragCopy;

     }
     else if ( dwEffect & DROPEFFECT_MOVE ) {
       // consistency check: normally, we shouldn't get "move" at all
       // here if !bAllowMove, but in practice it does happen quite often
       if ( bAllowMove )
     }
     else if ( dwEffect & DROPEFFECT_MOVE ) {
       // consistency check: normally, we shouldn't get "move" at all
       // here if !bAllowMove, but in practice it does happen quite often
       if ( bAllowMove )

-        return Move;
+        return wxDragMove;

       else
       else

-        return Copy;
+        return wxDragCopy;

     }
     else {
       // not copy or move
     }
     else {
       // not copy or move

-      return None;
+      return wxDragNone;

     }
   }
   else {
     }
   }
   else {


@@ -216,7 +216,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
       wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr);
     }
 
       wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr);
     }
 

-    return Error;
+    return wxDragError;

   }
 }
 
   }
 }
 


@@ -226,9 +226,9 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
 // Params  : [in] DragResult effect - what would happen if we dropped now
 //           [in] bool bScrolling   - true if target is scrolling    
 // Notes   : here we just leave this stuff for default implementation
 // Params  : [in] DragResult effect - what would happen if we dropped now
 //           [in] bool bScrolling   - true if target is scrolling    
 // Notes   : here we just leave this stuff for default implementation

-bool wxDropSource::GiveFeedback(DragResult effect, bool bScrolling)
+bool wxDropSource::GiveFeedback(wxDragResult effect, bool bScrolling)

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

-#endif  //USE_DRAG_AND_DROP
\ No newline at end of file
+#endif  //USE_DRAG_AND_DROP