Fixed Cygwin crash on toolbar tooltip

[wxWidgets.git] / src / gtk1 / dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 83dd2e4f3d82806751de5037cf4c43d5560329b3..5d4111c304504f143a1528ded43805aa478e8d3d 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -155,6 +155,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     wxDragResult result;
     if ( context->suggested_action == GDK_ACTION_COPY )
         result = wxDragCopy;
     wxDragResult result;
     if ( context->suggested_action == GDK_ACTION_COPY )
         result = wxDragCopy;

+    else if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;

     else
         result = wxDragMove;
 
     else
         result = wxDragMove;
 


@@ -175,6 +177,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
         GdkDragAction action;
         if (result == wxDragCopy)
             action = GDK_ACTION_COPY;
         GdkDragAction action;
         if (result == wxDragCopy)
             action = GDK_ACTION_COPY;

+        else if (result == wxDragLink)
+            action = GDK_ACTION_LINK;

         else
             action = GDK_ACTION_MOVE;
 
         else
             action = GDK_ACTION_MOVE;
 


@@ -325,6 +329,8 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     wxDragResult result;
     if ( context->suggested_action == GDK_ACTION_COPY )
         result = wxDragCopy;
     wxDragResult result;
     if ( context->suggested_action == GDK_ACTION_COPY )
         result = wxDragCopy;

+    else if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;

     else
         result = wxDragMove;
 
     else
         result = wxDragMove;
 


@@ -621,6 +627,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
 
     wxDragResult action = wxDragNone;
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
 
     wxDragResult action = wxDragNone;
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;

+    if (source->m_dragContext->action == GDK_ACTION_LINK) action = wxDragLink;

     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
     source->GiveFeedback( action );
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
     source->GiveFeedback( action );


@@ -805,7 +812,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
             action |= GDK_ACTION_MOVE;
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
             action |= GDK_ACTION_MOVE;
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,

-                action,
+                (GdkDragAction)action,

                 button_number,  /* number of mouse button which started drag */
                 (GdkEvent*) &event );
 
                 button_number,  /* number of mouse button which started drag */
                 (GdkEvent*) &event );
 


@@ -817,6 +824,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
         if (context->action == GDK_ACTION_COPY)
             m_retValue = wxDragCopy;
 
         if (context->action == GDK_ACTION_COPY)
             m_retValue = wxDragCopy;

+        if (context->action == GDK_ACTION_LINK)
+            m_retValue = wxDragLink;

         if (context->action == GDK_ACTION_MOVE)
             m_retValue = wxDragMove;
     }
         if (context->action == GDK_ACTION_MOVE)
             m_retValue = wxDragMove;
     }