Child positioning fixes and font adjustments

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index fdfeb4fade71e69a732008e29b9ec544ea9f1c9a..59a3c3a9478a289eb64f9f9c7e0d86a0f9cd5b85 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -60,7 +60,7 @@ static const wxChar *TRACE_DND = _T("dnd");
 //----------------------------------------------------------------------------
 
 /* XPM */
-static char * page_xpm[] = {
+static const char * page_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
@@ -155,6 +155,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     wxDragResult result;
     if ( context->suggested_action == GDK_ACTION_COPY )
         result = wxDragCopy;
+    else if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;
     else
         result = wxDragMove;
 
@@ -175,6 +177,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
         GdkDragAction action;
         if (result == wxDragCopy)
             action = GDK_ACTION_COPY;
+        else if (result == wxDragLink)
+            action = GDK_ACTION_LINK;
         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;
+    else if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;
     else
         result = wxDragMove;
 
@@ -570,9 +576,9 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
-static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                     GdkDragContext     *WXUNUSED(context),
-                                     wxDropSource       *WXUNUSED(drop_source) )
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+                                     GdkDragContext *context,
+                                     wxDropSource *WXUNUSED(drop_source) )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
@@ -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;
+    if (source->m_dragContext->action == GDK_ACTION_LINK) action = wxDragLink;
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
     source->GiveFeedback( action );
@@ -800,11 +807,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     /* don't start dragging if no button is down */
     if (button_number)
     {
-        GdkDragAction action = GDK_ACTION_COPY;
-        if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);
+        int action = GDK_ACTION_COPY;
+        if ( allowMove )
+            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 );
 
@@ -816,6 +824,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
         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;
     }