Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index e6e45f03a866f9014fab17d79e8afc98b1f6e889..f4cd2992d2f2e8919e45e6963f77c0312deceba0 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -4,43 +4,29 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_DND_H_
+#define _WX_GTK_DND_H_

 
 

-#ifndef __GTKDNDH__
-#define __GTKDNDH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/gdicmn.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class wxWindow;

 
 

-class wxDropTarget;
-class wxTextDropTarget;
-class wxFileDropTarget;
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-class wxDropSource;
+// 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
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 

-class wxDropTarget: public wxDropTargetBase
+class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase

 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );


@@ -61,7 +47,7 @@ public:
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;
     guint               m_dragTime;
     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; }
 
     void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
     void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }


@@ -73,28 +59,32 @@ public:
 // wxDropSource
 //-------------------------------------------------------------------------
 
 // wxDropSource
 //-------------------------------------------------------------------------
 

-class wxDropSource: public wxDropSourceBase
+class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase

 {
 public:
 {
 public:

-    /* constructor. set data later with SetData() */
+    // constructor. set data later with SetData()

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

-                  const wxIcon &go = wxNullIcon );
+                  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,
     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 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;
 
     GtkWidget       *m_widget;
     GtkWidget       *m_iconWindow;


@@ -102,15 +92,18 @@ public:
     wxWindow        *m_window;
 
     wxDragResult     m_retValue;
     wxWindow        *m_window;
 
     wxDragResult     m_retValue;

-    wxIcon           m_icon;
+    wxIcon           m_iconCopy,
+                     m_iconMove,
+                     m_iconNone;

 
     bool             m_waiting;
 
     bool             m_waiting;

-};

 
 

-#endif
-
-   // wxUSE_DRAG_AND_DROP
+private:
+    // common part of both ctors
+    void SetIcons(const wxIcon& copy,
+                  const wxIcon& move,
+                  const wxIcon& none);
+};

 
 

-#endif
-       //__GTKDNDH__
+#endif // _WX_GTK_DND_H_