regenerated from template

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index cd2143caa43602fde447b46f32f9fa2ad6d5c09e..f1b6bf43e616fbdc12ddc583e0cd1d7e74dc9763 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -21,12 +21,12 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -147,8 +147,11 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
 
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
 

-    wxDragResult result = wxDragMove;
-    if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
+    wxDragResult result;
+    if ( context->suggested_action == GDK_ACTION_COPY )
+        result = wxDragCopy;
+    else
+        result = wxDragMove;

 
     if (drop_target->m_firstMotion)
     {
 
     if (drop_target->m_firstMotion)
     {


@@ -161,11 +164,15 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
         result = drop_target->OnDragOver( x, y, result );
     }
 
         result = drop_target->OnDragOver( x, y, result );
     }
 

-    bool ret = result != wxDragNone;
+    bool ret = wxIsDragResultOk( result );

     if (ret)
     {
     if (ret)
     {

-        GdkDragAction action = GDK_ACTION_MOVE;
-       if (result == wxDragCopy) action = GDK_ACTION_COPY;
+        GdkDragAction action;
+        if (result == wxDragCopy)
+            action = GDK_ACTION_COPY;
+        else
+            action = GDK_ACTION_MOVE;
+

         gdk_drag_status( context, action, time );
     }
 
         gdk_drag_status( context, action, time );
     }
 


@@ -223,8 +230,8 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     if (!ret)
     {
 
     if (!ret)
     {

-        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
-        
+        wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") );
+

         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */
         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */


@@ -234,7 +241,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     else
     {
         wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
     else
     {
         wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );

-        
+

 #if wxUSE_THREADS
         /* disable GUI threads */
         wxapp_uninstall_thread_wakeup();
 #if wxUSE_THREADS
         /* disable GUI threads */
         wxapp_uninstall_thread_wakeup();


@@ -242,11 +249,11 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
         GdkAtom format = drop_target->GetMatchingPair();
         wxASSERT( format );
 
         GdkAtom format = drop_target->GetMatchingPair();
         wxASSERT( format );

-        
+

 /*
         GdkDragAction action = GDK_ACTION_MOVE;
 /*
         GdkDragAction action = GDK_ACTION_MOVE;

-       if (result == wxDragCopy) action == GDK_ACTION_COPY;
-       context->action = action;
+        if (result == wxDragCopy) action == GDK_ACTION_COPY;
+        context->action = action;

 */
         /* this should trigger an "drag_data_received" event */
         gtk_drag_get_data( widget,
 */
         /* this should trigger an "drag_data_received" event */
         gtk_drag_get_data( widget,


@@ -290,7 +297,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 

-

     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format
     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format


@@ -301,22 +307,28 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     }
 
     wxLogDebug( wxT( "Drop target: data received event") );
     }
 
     wxLogDebug( wxT( "Drop target: data received event") );

-    
+

     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
 
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
 

-    if (drop_target->OnData( x, y ))
+    wxDragResult result;
+    if ( context->suggested_action == GDK_ACTION_COPY )
+        result = wxDragCopy;
+    else
+        result = wxDragMove;
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )

     {
         wxLogDebug( wxT( "Drop target: OnData returned TRUE") );
     {
         wxLogDebug( wxT( "Drop target: OnData returned TRUE") );

-        
+

         /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         wxLogDebug( wxT( "Drop target: OnData returned FALSE") );
         /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         wxLogDebug( wxT( "Drop target: OnData returned FALSE") );

-        
+

         /* tell GTK that data transfer was not successfull */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
         /* tell GTK that data transfer was not successfull */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }


@@ -329,8 +341,8 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 // wxDropTarget
 //----------------------------------------------------------------------------
 
 // wxDropTarget
 //----------------------------------------------------------------------------
 

-wxDropTarget::wxDropTarget( wxDataObject *data ) 
-  : wxDropTargetBase( data )
+wxDropTarget::wxDropTarget( wxDataObject *data )
+            : wxDropTargetBase( data )

 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;
 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;


@@ -343,7 +355,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
                                        wxCoord WXUNUSED(y),
                                        wxDragResult def )
 {
                                        wxCoord WXUNUSED(y),
                                        wxDragResult def )
 {

-    // GetMatchingPair() checks for m_dataObject too, no need to do it here 
+    // GetMatchingPair() checks for m_dataObject too, no need to do it here

 
     // disable the debug message from GetMatchingPair() - there are too many
     // of them otherwise
 
     // disable the debug message from GetMatchingPair() - there are too many
     // of them otherwise


@@ -358,27 +370,28 @@ bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
     if (!m_dataObject)
         return FALSE;
 {
     if (!m_dataObject)
         return FALSE;

-        
+

     return (GetMatchingPair() != (GdkAtom) 0);
 }
 
     return (GetMatchingPair() != (GdkAtom) 0);
 }
 

-bool wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )

 {
     if (!m_dataObject)
 {
     if (!m_dataObject)

-        return FALSE;
-        
+        return wxDragNone;
+

     if (GetMatchingPair() == (GdkAtom) 0)
     if (GetMatchingPair() == (GdkAtom) 0)

-        return FALSE;
-        
-    return GetData();
+        return wxDragNone;
+
+    return GetData() ? def : wxDragNone;

 }
 
 GdkAtom wxDropTarget::GetMatchingPair()
 {
 }
 
 GdkAtom wxDropTarget::GetMatchingPair()
 {

-    if (!m_dataObject) 
+    if (!m_dataObject)

         return (GdkAtom) 0;
 
         return (GdkAtom) 0;
 

-    if (!m_dragContext) 
+    if (!m_dragContext)

         return (GdkAtom) 0;
 
     GList *child = m_dragContext->targets;
         return (GdkAtom) 0;
 
     GList *child = m_dragContext->targets;


@@ -388,8 +401,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

-        char *name = gdk_atom_name( formatAtom );
-        wxLogDebug("Drop target: drag has format: %s", name ? name : "unnamed");
+        wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() );

 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))
 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))


@@ -403,31 +415,17 @@ GdkAtom wxDropTarget::GetMatchingPair()
 
 bool wxDropTarget::GetData()
 {
 
 bool wxDropTarget::GetData()
 {

-    if (!m_dragData) 
+    if (!m_dragData)

         return FALSE;
 
         return FALSE;
 

-    if (!m_dataObject) 
+    if (!m_dataObject)

         return FALSE;
 
     wxDataFormat dragFormat( m_dragData->target );
         return FALSE;
 
     wxDataFormat dragFormat( m_dragData->target );

-    
+

     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 
     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;
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
     return TRUE;


@@ -485,48 +483,13 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
                       GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 
                       GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 

-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
-
-wxTextDropTarget::wxTextDropTarget()
-                : wxDropTarget(new wxTextDataObject)
-{
-}
-
-bool wxTextDropTarget::OnData(wxCoord x, wxCoord y)
-{
-    if ( !GetData() )
-        return FALSE;
-
-    return OnDropText(x, y, ((wxTextDataObject *)m_dataObject)->GetText());
-}
-
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
-
-wxFileDropTarget::wxFileDropTarget()
-                : wxDropTarget(new wxFileDataObject)
-{
-}
-
-bool wxFileDropTarget::OnData(wxCoord x, wxCoord y)
-{
-    if ( !GetData() )
-        return FALSE;
-
-    return OnDropFiles(x, y,
-                       ((wxFileDataObject *)m_dataObject)->GetFilenames());
-}
-

 //----------------------------------------------------------------------------
 // "drag_data_get"
 //----------------------------------------------------------------------------
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_data_get"
 //----------------------------------------------------------------------------
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),

-                       GdkDragContext     *context,
+                       GdkDragContext     *WXUNUSED(context),

                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),
                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),


@@ -535,11 +498,11 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
     if (g_isIdle) wxapp_install_idle_handler();
 
     wxDataFormat format( selection_data->target );
     if (g_isIdle) wxapp_install_idle_handler();
 
     wxDataFormat format( selection_data->target );

-    
-    wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );

 
 

-    drop_source->m_retValue = wxDragCancel;
+    wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );

     
     

+    drop_source->m_retValue = wxDragCancel;
+

     wxDataObject *data = drop_source->GetDataObject();
     
     if (!data)
     wxDataObject *data = drop_source->GetDataObject();
     
     if (!data)


@@ -559,13 +522,13 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
         wxLogDebug( wxT("Drop source: empty data") );
         return;
     }
         wxLogDebug( wxT("Drop source: empty data") );
         return;
     }

-    
+

     size_t size = data->GetDataSize(format);
 
 //  printf( "data size: %d.\n", (int)data_size );
 
     guchar *d = new guchar[size];
     size_t size = data->GetDataSize(format);
 
 //  printf( "data size: %d.\n", (int)data_size );
 
     guchar *d = new guchar[size];

-    
+

     if (!data->GetDataHere( format, (void*)d ))
     {
         delete[] d;
     if (!data->GetDataHere( format, (void*)d ))
     {
         delete[] d;


@@ -589,9 +552,6 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 #endif
 
     delete[] d;
 #endif
 
     delete[] d;

-    
-    /* so far only copy, no moves. TODO. */
-    drop_source->m_retValue = wxDragCopy;

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -600,13 +560,12 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
                                      GdkDragContext     *WXUNUSED(context),
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
                                      GdkDragContext     *WXUNUSED(context),

-                                     wxDropSource       *drop_source )
+                                     wxDropSource       *WXUNUSED(drop_source) )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-//  printf( "Delete the data!\n" );
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-    drop_source->m_retValue = wxDragMove;
+    // printf( "Drag source: drag_data_delete\n" );

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -617,9 +576,10 @@ static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
                                GdkDragContext     *WXUNUSED(context),
                                wxDropSource       *WXUNUSED(drop_source) )
 {
                                GdkDragContext     *WXUNUSED(context),
                                wxDropSource       *WXUNUSED(drop_source) )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-//  printf( "drag_begin.\n" );
+    // printf( "Drag source: drag_begin.\n" );

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -632,7 +592,7 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//  printf( "drag_end.\n" );
+    // printf( "Drag source: drag_end.\n" );

 
     drop_source->m_waiting = FALSE;
 }
 
     drop_source->m_waiting = FALSE;
 }


@@ -641,18 +601,18 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 // "configure_event" from m_iconWindow
 //-----------------------------------------------------------------------------
 
 // "configure_event" from m_iconWindow
 //-----------------------------------------------------------------------------
 

-static gint 
+static gint

 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     wxDragResult action = wxDragNone;
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
         wxapp_install_idle_handler();
 
     wxDragResult action = wxDragNone;
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 

-    source->GiveFeedback( action, FALSE );
-    
+    source->GiveFeedback( action );
+

     return 0;
 }
 
     return 0;
 }
 


@@ -662,11 +622,10 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
 {
 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
 {

-    g_blockEventsOnDrag = TRUE;

     m_waiting = TRUE;
 
     m_iconWindow = (GtkWidget*) NULL;
     m_waiting = TRUE;
 
     m_iconWindow = (GtkWidget*) NULL;

-    
+

     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;


@@ -680,15 +639,15 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
 wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &icon )
 {
     m_waiting = TRUE;
 wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &icon )
 {
     m_waiting = TRUE;

-    
+

     SetData( data );
 
     m_iconWindow = (GtkWidget*) NULL;
     SetData( data );
 
     m_iconWindow = (GtkWidget*) NULL;

-    
+

     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;

-    
+

     m_retValue = wxDragCancel;
 
     m_icon = icon;
     m_retValue = wxDragCancel;
 
     m_icon = icon;


@@ -697,7 +656,6 @@ wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &ico
 
 wxDropSource::~wxDropSource()
 {
 
 wxDropSource::~wxDropSource()
 {

-    g_blockEventsOnDrag = FALSE;

 }
 
 void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
 }
 
 void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )


@@ -725,25 +683,25 @@ void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
 
     gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );

-       
+

     gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
     gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);

-  
+

     if (mask)
         gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
 
     gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
 }
 
     if (mask)
         gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
 
     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) 
+    if (!m_data)

         return (wxDragResult) wxDragNone;
 
         return (wxDragResult) wxDragNone;
 

-    if (m_data->GetFormatCount() == 0) 
+    if (m_data->GetFormatCount() == 0)

         return (wxDragResult) wxDragNone;
         return (wxDragResult) wxDragNone;

-        
+

     g_blockEventsOnDrag = TRUE;
 
     RegisterWindow();
     g_blockEventsOnDrag = TRUE;
 
     RegisterWindow();


@@ -751,13 +709,13 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     m_waiting = TRUE;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
     m_waiting = TRUE;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );

-    
+

     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
         GdkAtom atom = array[i];
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
     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;
         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;


@@ -771,7 +729,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     event.x = x;
     event.y = y;
     event.state = state;
     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;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;


@@ -787,17 +745,24 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     /* don't start dragging if no button is down */
     if (button_number)
     {
     /* 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,
         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 );
                                               button_number,  /* number of mouse button which started drag */
                                               (GdkEvent*) &event );

-                                             
-       m_dragContext = context;
-       
+
+        m_dragContext = context;
+

         PrepareIcon( 0, 0, context );
 
         PrepareIcon( 0, 0, context );
 

-        while (m_waiting) gtk_main_iteration();;
+        while (m_waiting) gtk_main_iteration();
+       
+       if (context->action == GDK_ACTION_COPY)
+            m_retValue = wxDragCopy;
+       if (context->action == GDK_ACTION_MOVE)
+            m_retValue = wxDragMove;

     }
 
 #if wxUSE_THREADS
     }
 
 #if wxUSE_THREADS


@@ -815,7 +780,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;

-
+    

     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
                       GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
                       GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",


@@ -842,5 +807,4 @@ void wxDropSource::UnregisterWindow()
 }
 
 #endif
 }
 
 #endif

-

       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP