Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

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

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 5a7a65335f43519c006de7e4ad8e71f568232b15..2b0f35375d1308c0d0c7010d1b4479ea101b2e2b 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
 //-------------------------------------------------------------------------
@@ -151,11 +156,11 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }
-    virtual bool OnDrop( long x, long y, const void *pData ) = 0;
+    virtual bool OnDrop( wxCoord x, wxCoord y, const void *pData ) = 0;
 
 //  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
 //-------------------------------------------------------------------------
@@ -172,8 +178,8 @@ class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
   public:
 
     wxTextDropTarget() {};
-    virtual bool OnDrop( long x, long y, const void *pData );
-    virtual bool OnDropText( long x, long y, const char *psz );
+    virtual bool OnDrop( wxCoord x, wxCoord y, const void *pData );
+    virtual bool OnDropText( wxCoord x, wxCoord y, const char *psz );
     
   protected:
   
@@ -191,8 +197,8 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
     
     wxFileDropTarget() {};
     
-    virtual bool OnDrop(long x, long y, const void *pData);
-    virtual bool OnDropFiles( long x, long y, 
+    virtual bool OnDrop(wxCoord x, wxCoord y, const void *pData);
+    virtual bool OnDropFiles( wxCoord x, wxCoord y, 
                               size_t nFiles, const char * const aszFiles[]);
 
   protected:
@@ -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: