X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b5d569973c2bf329a666c38e1612ca836695576..42bf837cea417f83f478709be322eb713e6e2ec8:/include/wx/gtk/dnd.h

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c437f0b3b1..86ec39b1d2 100644
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -4,14 +4,14 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKDNDH__
 #define __GTKDNDH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -36,6 +36,16 @@ class wxFileDropTarget;
 
 class wxDropSource;
 
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// this macro may be used instead for wxDropSource ctor arguments: it will use
+// 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)
+
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
@@ -44,10 +54,10 @@ class wxDropTarget: public wxDropTargetBase
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
-    
+
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
-    virtual bool OnData(wxCoord x, wxCoord y);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 
   // implementation
@@ -61,7 +71,7 @@ public:
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;
     guint               m_dragTime;
-    bool                m_firstMotion;     /* gdk has no "gdk_drag_enter" event */
+    bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 
     void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
     void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
@@ -69,37 +79,6 @@ public:
     void SetDragTime( guint time ) { m_dragTime = time; }
 };
 
-// ----------------------------------------------------------------------------
-// A simple wxDropTarget derived class for text data: you only need to
-// override OnDropText() to get something working
-// ----------------------------------------------------------------------------
-
-class wxTextDropTarget : public wxDropTarget
-{
-public:
-    wxTextDropTarget();
-
-    virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
-
-    virtual bool OnData(wxCoord x, wxCoord y);
-};
-
-// ----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
-
-class wxFileDropTarget : public wxDropTarget
-{
-public:
-    wxFileDropTarget();
-
-    // parameters are the number of files and the array of file names
-    virtual bool OnDropFiles(wxCoord x, wxCoord y,
-                             const wxArrayString& filenames) = 0;
-
-    virtual bool OnData(wxCoord x, wxCoord y);
-};
-
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
@@ -107,41 +86,50 @@ public:
 class wxDropSource: public wxDropSourceBase
 {
 public:
-    /* constructor. set data later with SetData() */
-    wxDropSource( wxWindow *win,
-                  const wxIcon &go = wxNullIcon );
+    // constructor. set data later with SetData()
+    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
 
-    /* constructor for setting one data object */
+    // constructor for setting one data object
     wxDropSource( wxDataObject& data,
                   wxWindow *win,
-                  const wxIcon &go = wxNullIcon );
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
 
-    ~wxDropSource();
+    virtual ~wxDropSource();
 
-    /* start drag action */
-    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+    // start drag action
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
-    /* GTK implementation */
+    // GTK implementation
     void RegisterWindow();
     void UnregisterWindow();
 
-    void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
-    
+    void PrepareIcon( int action, GdkDragContext *context );
+
     GtkWidget       *m_widget;
     GtkWidget       *m_iconWindow;
     GdkDragContext  *m_dragContext;
     wxWindow        *m_window;
-    
+
     wxDragResult     m_retValue;
-    wxIcon           m_icon;
-    
+    wxIcon           m_iconCopy,
+                     m_iconMove,
+                     m_iconNone;
+
     bool             m_waiting;
-};
 
-#endif
+private:
+    // common part of both ctors
+    void SetIcons(const wxIcon& copy,
+                  const wxIcon& move,
+                  const wxIcon& none);
+};
 
-   // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP
 
-#endif
-       //__GTKDNDH__
+#endif //__GTKDNDH__