When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index ee679af13f5805b7a8beaf09d97828fac54988de..c9f677d3c7488e0cea2075185793c262d3d45f24 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.h
+// Name:        wx/gtk/dnd.h

 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -41,7 +41,8 @@ public:
 
     // implementation
 
 
     // implementation
 

-    GdkAtom GtkGetMatchingPair(bool quiet = false);
+    GdkAtom GTKGetMatchingPair(bool quiet = false);
+    wxDragResult GTKFigureOutSuggestedAction();

 
     void GtkRegisterWidget( GtkWidget *widget );
     void GtkUnregisterWidget( GtkWidget *widget );
 
     void GtkRegisterWidget( GtkWidget *widget );
     void GtkUnregisterWidget( GtkWidget *widget );


@@ -49,13 +50,13 @@ public:
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
     GtkSelectionData   *m_dragData;

-    guint               m_dragTime;
+    unsigned            m_dragTime;

     bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 
     bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 

-    void GtkSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
-    void GtkSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
-    void GtkSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
-    void GtkSetDragTime( guint time ) { m_dragTime = time; }
+    void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
+    void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
+    void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
+    void GTKSetDragTime(unsigned time) { m_dragTime = time; }

 };
 
 //-------------------------------------------------------------------------
 };
 
 //-------------------------------------------------------------------------


@@ -80,6 +81,17 @@ public:
 
     virtual ~wxDropSource();
 
 
     virtual ~wxDropSource();
 

+    // set the icon corresponding to given drag result
+    void SetIcon(wxDragResult res, const wxIcon& icon)
+    {
+        if ( res == wxDragCopy )
+            m_iconCopy = icon;
+        else if ( res == wxDragMove )
+            m_iconMove = icon;
+        else
+            m_iconNone = icon;
+    }
+

     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);