added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index e3a149ed857396232c71235ed7e69eee5eecd3cc..0afea150b9179cf0481c1903363095beadbd98aa 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -25,9 +25,11 @@
 
 class WXDLLEXPORT wxWindow;
 
 
 class WXDLLEXPORT wxWindow;
 

+#ifndef __DARWIN__

 class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxTextDataObject;
 class WXDLLEXPORT wxFileDataObject;
 class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxTextDataObject;
 class WXDLLEXPORT wxFileDataObject;

+#endif

 
 class WXDLLEXPORT wxDropTarget;
 class WXDLLEXPORT wxTextDropTarget;
 
 class WXDLLEXPORT wxDropTarget;
 class WXDLLEXPORT wxTextDropTarget;


@@ -35,11 +37,12 @@ class WXDLLEXPORT wxFileDropTarget;
 
 class WXDLLEXPORT wxDropSource;
 
 
 class WXDLLEXPORT wxDropSource;
 

+#ifndef __DARWIN__

 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 // 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!)
 {
 public:
   // all data formats (values are the same as in windows.h, do not change!)


@@ -138,6 +141,8 @@ private:
   wxString  m_files;
   
 };
   wxString  m_files;
   
 };

+#endif
+

 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------


@@ -151,7 +156,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     
     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:
       
 
 //  protected:
       


@@ -163,6 +168,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     virtual wxDataFormat GetFormat(size_t n) const = 0;
 };
 
     virtual wxDataFormat GetFormat(size_t n) const = 0;
 };
 

+#ifndef __DARWIN__

 //-------------------------------------------------------------------------
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxTextDropTarget
 //-------------------------------------------------------------------------


@@ -172,8 +178,8 @@ class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
   public:
 
     wxTextDropTarget() {};
   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:
   
     
   protected:
   


@@ -191,8 +197,8 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
     
     wxFileDropTarget() {};
     
     
     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:
                               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;
 };
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };

+#endif

 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // 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:
 class WXDLLEXPORT wxDropSource: public wxObject
 {
   public: