Dnd constant name changes because names like Copy can be #defined by other

apps. Various other changes to stubs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/ole/dropsrc.h

@@ -26,6 +26,15 @@
 class wxIDropSource;
 class wxDataObject;
 
+enum wxDragResult
+  {
+    wxDragError,    // error prevented the d&d operation from completing
+    wxDragNone,     // drag target didn't accept the data
+    wxDragCopy,     // the data was successfully copied
+    wxDragMove,     // the data was successfully moved
+    wxDragCancel    // the operation was cancelled by user (not an error)
+  };
+
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
@@ -33,15 +42,6 @@ class wxDataObject;
 class wxDropSource
 {
 public:
-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-
   // ctors: if you use default ctor you must call SetData() later!
   // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
   //     compatibility
@@ -54,12 +54,12 @@ public:
 
   // do it (call this in response to a mouse button press, for example)
   // params: if bAllowMove is false, data can be only copied
-  DragResult DoDragDrop(bool bAllowMove = FALSE);
+  wxDragResult DoDragDrop(bool bAllowMove = FALSE);
 
   // overridable: you may give some custom UI feedback during d&d operation
   // in this function (it's called on each mouse move, so it shouldn't be too
   // slow). Just return false if you want default feedback.
-  virtual bool GiveFeedback(DragResult effect, bool bScrolling);
+  virtual bool GiveFeedback(wxDragResult effect, bool bScrolling);
 
 protected:
   void Init();
@@ -70,4 +70,4 @@ private:
   wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 };
 
-#endif  //_WX_OLEDROPSRC_H
+#endif  //_WX_OLEDROPSRC_H