Added long-filename functions & normalisation; patch to Watcom makefiles

[wxWidgets.git] / include / wx / mac / dnd.h

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 5a7a65335f43519c006de7e4ad8e71f568232b15..4a1295fd1ef9b357c678b09028d05dc0255c4438 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -25,9 +25,11 @@
 
 class WXDLLEXPORT wxWindow;
 
+#ifndef __WXMAC_X__
 class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxTextDataObject;
 class WXDLLEXPORT wxFileDataObject;
+#endif
 
 class WXDLLEXPORT wxDropTarget;
 class WXDLLEXPORT wxTextDropTarget;
@@ -35,11 +37,12 @@ class WXDLLEXPORT wxFileDropTarget;
 
 class WXDLLEXPORT wxDropSource;
 
+#ifndef __WXMAC_X__
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDataObject: public wxObject
+class WXDLLEXPORT wxDataObject : public wxObject
 {
 public:
   // all data formats (values are the same as in windows.h, do not change!)
@@ -138,6 +141,8 @@ private:
   wxString  m_files;
   
 };
+#endif
+
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
@@ -155,7 +160,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
 
 //  protected:
       
-    friend wxWindow;
+    friend class wxWindow;
     
     // Override these to indicate what kind of data you support: 
   
@@ -163,6 +168,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     virtual wxDataFormat GetFormat(size_t n) const = 0;
 };
 
+#ifndef __WXMAC_X__
 //-------------------------------------------------------------------------
 // wxTextDropTarget
 //-------------------------------------------------------------------------
@@ -200,20 +206,12 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
+#endif
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 
-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)
-  };
-
 class WXDLLEXPORT wxDropSource: public wxObject
 {
   public: