made wxListbook events more consistent with wxNotebook ones (patch 1001271)

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 380d5c1d6a26bf63cfd70c5d37ae8da19a455268..c2210c23a34f55f3408f3aaca4b1a8fd3970d16d 100644 (file)
--- 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
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling

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

 ///////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKDNDH__
 #define __GTKDNDH__
 
 ///////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKDNDH__
 #define __GTKDNDH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -36,6 +36,16 @@ class wxFileDropTarget;
 
 class wxDropSource;
 
 
 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
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------


@@ -61,7 +71,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; }


@@ -76,25 +86,29 @@ public:
 class wxDropSource: public wxDropSourceBase
 {
 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,
     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 +116,20 @@ 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
+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__