Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 4a1295fd1ef9b357c678b09028d05dc0255c4438..0afea150b9179cf0481c1903363095beadbd98aa 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -25,7 +25,7 @@
 
 class WXDLLEXPORT wxWindow;
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxTextDataObject;
 class WXDLLEXPORT wxFileDataObject;
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxFileDropTarget;
 
 class WXDLLEXPORT wxDropSource;
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
@@ -156,7 +156,7 @@ 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:
       
@@ -168,7 +168,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     virtual wxDataFormat GetFormat(size_t n) const = 0;
 };
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 //-------------------------------------------------------------------------
 // wxTextDropTarget
 //-------------------------------------------------------------------------
@@ -178,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:
   
@@ -197,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: