X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7dd62924826c2015d9c2563ce0e9443e73dbddc1..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/dnd.cpp

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 4349abe348..25b6eb46f6 100644
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -230,7 +230,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     if (!ret)
     {
-        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
+        wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") );
 
         /* cancel the whole thing */
         gtk_drag_finish( context,
@@ -426,20 +426,6 @@ bool wxDropTarget::GetData()
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 
-    if (dragFormat.GetType() == wxDF_TEXT)
-    {
-        wxTextDataObject *text_object = (wxTextDataObject*)m_dataObject;
-        text_object->SetText( (const char*)m_dragData->data );
-        return TRUE;
-    }
-
-    if (dragFormat.GetType() == wxDF_FILENAME)
-    {
-        wxFileDataObject *file_object = (wxFileDataObject*)m_dataObject;
-        file_object->SetData( 0, (const char*)m_dragData->data );
-        return TRUE;
-    }
-
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
     return TRUE;
@@ -503,7 +489,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
-                       GdkDragContext     *context,
+                       GdkDragContext     *WXUNUSED(context),
                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),
@@ -711,9 +697,9 @@ void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
     gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
 }
 
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 {
-    wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
+    wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 
     if (!m_data)
         return (wxDragResult) wxDragNone;
@@ -734,7 +720,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
         GdkAtom atom = array[i];
-        wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
+        wxLogDebug( wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ) );
         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;
@@ -748,7 +734,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     event.x = x;
     event.y = y;
     event.state = state;
-    event.time = GDK_CURRENT_TIME;
+    event.time = (guint32)GDK_CURRENT_TIME;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
@@ -764,9 +750,11 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     /* 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);
         GdkDragContext *context = gtk_drag_begin( m_widget,
                                               target_list,
-                                              (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE),
+					      action,
                                               button_number,  /* number of mouse button which started drag */
                                               (GdkEvent*) &event );
 
@@ -775,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
         PrepareIcon( 0, 0, context );
 
         while (m_waiting) gtk_main_iteration();;
+	
+	if (context->action == GDK_ACTION_COPY)
+            return m_retValue = wxDragCopy;
+	if (context->action == GDK_ACTION_MOVE)
+            return m_retValue = wxDragMove;
     }
 
 #if wxUSE_THREADS