moved smart phone test to chkconf.h from features.h

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

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 252d2376147aa42be7de5dd39051b23172a9ead2..463cd6d44e7a2da2b8a7c52f8652adf361ce2a3b 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -1,16 +1,16 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dnd.h
 // Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dnd.h
 // Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 AUTHOR
+// Copyright:   (c) 1998 Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dnd.h"
 #endif
 
 #pragma interface "dnd.h"
 #endif
 


@@ -43,7 +43,7 @@ class WXDLLEXPORT wxDropSource;
 // the icon 'name' from an XPM file under GTK, but will expand to something
 // else under MSW. If you don't use it, you will have to use #ifdef in the
 // application code.
 // the icon 'name' from an XPM file under GTK, but will expand to something
 // else under MSW. If you don't use it, you will have to use #ifdef in the
 // application code.

-#define wxDROP_ICON(name)   wxICON(name)
+#define wxDROP_ICON(X)   wxCursor( (const char**) X##_xpm )

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


@@ -74,29 +74,34 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
 class WXDLLEXPORT wxDropSource: public wxDropSourceBase
 {
 public:
 class WXDLLEXPORT wxDropSource: public wxDropSourceBase
 {
 public:

-    /* constructor. set data later with SetData() */
+    // ctors: if you use default ctor you must call SetData() later!
+    //
+    // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
+    //     compatibility, as well as both icon parameters

     wxDropSource( wxWindow *win = (wxWindow *)NULL,
     wxDropSource( wxWindow *win = (wxWindow *)NULL,

-                  const wxIcon &copy = wxNullIcon,
-                  const wxIcon &move = wxNullIcon,
-                  const wxIcon &none = wxNullIcon);
+                 const wxCursor &cursorCopy = wxNullCursor,
+                 const wxCursor &cursorMove = wxNullCursor,
+                 const wxCursor &cursorStop = wxNullCursor);

 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& data,
                   wxWindow *win,

-                  const wxIcon &copy = wxNullIcon,
-                  const wxIcon &move = wxNullIcon,
-                  const wxIcon &none = wxNullIcon);
-
+                 const wxCursor &cursorCopy = wxNullCursor,
+                 const wxCursor &cursorMove = wxNullCursor,
+                 const wxCursor &cursorStop = wxNullCursor);

 
     ~wxDropSource();
 
 
     ~wxDropSource();
 

-    /* start drag action */
+    // do it (call this in response to a mouse button press, for example)
+    // params: if bAllowMove is false, data can be only copied

     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);

-    
+

     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }

+       bool                    MacInstallDefaultCursor(wxDragResult effect) ;

   protected :
   protected :

+       

     wxWindow        *m_window;
     void* m_currentDrag ;
 };
     wxWindow        *m_window;
     void* m_currentDrag ;
 };