X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2245b2b2c3339ecf023e5880caa803610a5d1907..8da1f9a99ee0ff9493cc7845ec13100cdeac431c:/include/wx/dnd.h

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 7ce567f726..3c893f685a 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     26.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dndbase.h"
 #endif
 
@@ -97,9 +97,9 @@ public:
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) = 0;
 
     // override to give feedback depending on the current operation result
-    // "effect" and return TRUE if you did something, FALSE to let the library
+    // "effect" and return true if you did something, false to let the library
     // give the default feedback
-    virtual bool GiveFeedback(wxDragResult WXUNUSED(effect)) { return FALSE; }
+    virtual bool GiveFeedback(wxDragResult WXUNUSED(effect)) { return false; }
 
 protected:
     const wxCursor& GetCursor(wxDragResult res) const
@@ -119,6 +119,8 @@ protected:
     wxCursor m_cursorCopy,
              m_cursorMove,
              m_cursorStop;
+
+    DECLARE_NO_COPY_CLASS(wxDropSourceBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -175,7 +177,7 @@ public:
     virtual void OnLeave() { }
 
     // this function is called when data is dropped at position (x, y) - if it
-    // returns TRUE, OnData() will be called immediately afterwards which will
+    // returns true, OnData() will be called immediately afterwards which will
     // allow to retrieve the data dropped.
     virtual bool OnDrop(wxCoord x, wxCoord y) = 0;
 
@@ -187,11 +189,13 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) = 0;
 
     // may be called *only* from inside OnData() and will fill m_dataObject
-    // with the data from the drop source if it returns TRUE
+    // with the data from the drop source if it returns true
     virtual bool GetData() = 0;
 
 protected:
     wxDataObject *m_dataObject;
+
+    DECLARE_NO_COPY_CLASS(wxDropTargetBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -211,8 +215,6 @@ protected:
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dnd.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -229,6 +231,9 @@ public:
     virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxTextDropTarget)
 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
@@ -242,6 +247,9 @@ public:
                              const wxArrayString& filenames) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxFileDropTarget)
 };
 
 #endif // wxUSE_DRAG_AND_DROP