more Sun C++ compiler warning fixes: in particular, added an ugly but

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 8618f4de2d5afea57f35422288749dca7aa06f13..59a3c3a9478a289eb64f9f9c7e0d86a0f9cd5b85 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "dnd.h"
+    #pragma implementation "dnd.h"

 #endif
 
 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"


@@ -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


@@ -50,53 +50,17 @@ extern void wxapp_uninstall_thread_wakeup();
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 

+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
+// (there are quite a few of them, so don't enable this by default)
+static const wxChar *TRACE_DND = _T("dnd");
+

 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 /* XPM */
 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 /* XPM */

-static char * gv_xpm[] = {
-"40 34 3 1",
-"         s None c None",
-".        c black",
-"X        c white",
-"                                        ",
-"                                        ",
-"                  ......                ",
-"                ..XXXXXX..              ",
-"               .XXXXXXXXXX.             ",
-"              .XXXXXXXXXXXX.            ",
-"              .XXXXXXXXXXXX.            ",
-"             .XXXXXXXXXXXXXX.           ",
-"             .XXX..XXXX..XXX.           ",
-"          ....XX....XX....XX.           ",
-"         .XXX.XXX..XXXX..XXX....        ",
-"        .XXXXXXXXXXXXXXXXXXX.XXX.       ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"         ..XXXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXXXXXX...       ",
-"           ..XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXXX.        ",
-"            .XXXXXXXXXXXXXXXXXXX.       ",
-"           .XXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXX.XXXXXXX.     ",
-"          .XXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXX...XXXXX...XXXXX.      ",
-"         .XXXXXXX.  .....   .....       ",
-"         ..XXXX..                       ",
-"           ....                         ",
-"                                        ",
-"                                        ",
-"                                        "};
-
-/* XPM */
-static char * page_xpm[] = {
+static const char * page_xpm[] = {

 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */


@@ -188,8 +152,13 @@ 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 if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;
+    else
+        result = wxDragMove;

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


@@ -202,12 +171,18 @@ 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;
-        gdk_drag_status( context, context->suggested_action, time );
+        GdkDragAction action;
+        if (result == wxDragCopy)
+            action = GDK_ACTION_COPY;
+        else if (result == wxDragLink)
+            action = GDK_ACTION_LINK;
+        else
+            action = GDK_ACTION_MOVE;
+
+        gdk_drag_status( context, action, time );

     }
 
     /* after this, invalidate the drop_target's GdkDragContext */
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */


@@ -260,12 +235,17 @@ static gboolean target_drag_drop( GtkWidget *widget,
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 

+    /* reset the block here as someone might very well
+       show a dialog as a reaction to a drop and this
+       wouldn't work without events */
+    g_blockEventsOnDrag = FALSE;
+

     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)
     {
     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)
     {

-        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
-        
+        wxLogTrace(TRACE_DND, 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 */


@@ -274,8 +254,8 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
     }
     else
     {

-        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
-        
+        wxLogTrace(TRACE_DND, 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();


@@ -283,11 +263,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,


@@ -331,7 +311,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


@@ -341,23 +320,31 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
         return;
     }
 
         return;
     }
 

-    wxLogDebug( wxT( "Drop target: data received event") );
-    
+    wxLogTrace(TRACE_DND, 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 if ( context->suggested_action == GDK_ACTION_LINK )
+        result = wxDragLink;
+    else
+        result = wxDragMove;
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )

     {
     {

-        wxLogDebug( wxT( "Drop target: OnData returned TRUE") );
-        
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );
+

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

-        wxLogDebug( wxT( "Drop target: OnData returned FALSE") );
-        
+        wxLogTrace(TRACE_DND, 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 );
     }


@@ -370,8 +357,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;


@@ -384,7 +371,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


@@ -399,27 +386,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;


@@ -429,8 +417,8 @@ 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");
+        wxLogTrace(TRACE_DND, 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 ))


@@ -444,31 +432,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;


@@ -526,48 +500,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),


@@ -576,37 +515,38 @@ 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() );
+
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());

 
     drop_source->m_retValue = wxDragCancel;
 
     drop_source->m_retValue = wxDragCancel;

-    
+

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

-    
+

     if (!data)
     {
     if (!data)
     {

-        wxLogDebug( wxT("Drop source: no data object") );
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );

         return;
     }
 
     if (!data->IsSupportedFormat(format))
     {
         return;
     }
 
     if (!data->IsSupportedFormat(format))
     {

-        wxLogDebug( wxT("Drop source: unsupported format") );
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );

         return;
     }
 
     if (data->GetDataSize(format) == 0)
     {
         return;
     }
 
     if (data->GetDataSize(format) == 0)
     {

-        wxLogDebug( wxT("Drop source: empty data") );
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );

         return;
     }
         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;


@@ -630,24 +570,20 @@ 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;

 }
 
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 

-static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                     GdkDragContext     *WXUNUSED(context),
-                                     wxDropSource       *drop_source )
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+                                     GdkDragContext *context,
+                                     wxDropSource *WXUNUSED(drop_source) )

 {
 {

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

 
 

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

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


@@ -658,9 +594,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" );

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


@@ -673,71 +610,160 @@ 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;
 }
 

+//-----------------------------------------------------------------------------
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
+{
+    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_LINK) action = wxDragLink;
+    if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
+
+    source->GiveFeedback( action );
+
+    return 0;
+}
+

 //---------------------------------------------------------------------------
 // wxDropSource
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 // wxDropSource
 //---------------------------------------------------------------------------
 

-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)

 {
 {

-    g_blockEventsOnDrag = TRUE;

     m_waiting = TRUE;
 
     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_retValue = wxDragCancel;
 
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
 
     m_retValue = wxDragCancel;
 

-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-
-    m_goIcon = go;
-    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
-    m_stopIcon = stop;
-    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+    SetIcons(iconCopy, iconMove, iconNone);

 }
 
 }
 

-wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win,
-                            const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)

 {
     m_waiting = TRUE;
 {
     m_waiting = TRUE;

-    
+

     SetData( data );
 
     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_retValue = wxDragCancel;
 

-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    SetIcons(iconCopy, iconMove, iconNone);
+}

 
 

-    m_goIcon = go;
-    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
-    m_stopIcon = stop;
-    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)
+{
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;
+
+    if ( !m_iconCopy.Ok() )
+        m_iconCopy = wxIcon(page_xpm);
+    if ( !m_iconMove.Ok() )
+        m_iconMove = m_iconCopy;
+    if ( !m_iconNone.Ok() )
+        m_iconNone = m_iconCopy;

 }
 
 wxDropSource::~wxDropSource()
 {
 }
 
 wxDropSource::~wxDropSource()
 {

-    g_blockEventsOnDrag = FALSE;

 }
 
 }
 

-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )

 {
 {

-    wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
+    // get the right icon to display
+    wxIcon *icon = NULL;
+    if ( action & GDK_ACTION_MOVE )
+        icon = &m_iconMove;
+    else if ( action & GDK_ACTION_COPY )
+        icon = &m_iconCopy;
+    else
+        icon = &m_iconNone;
+
+    GdkBitmap *mask;
+    if ( icon->GetMask() )
+        mask = icon->GetMask()->GetBitmap();
+    else
+        mask = (GdkBitmap *)NULL;
+
+    GdkPixmap *pixmap = icon->GetPixmap();
+
+    gint width,height;
+    gdk_window_get_size (pixmap, &width, &height);
+
+    GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+#ifndef __WXGTK20__
+    gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
+#endif
+    gtk_widget_push_colormap (colormap);
+
+    m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
+    gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+    gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
+
+#ifndef __WXGTK20__
+    gtk_widget_pop_visual ();
+#endif
+    gtk_widget_pop_colormap ();
+
+    gtk_widget_set_usize (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
+
+    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);
+
+    if (mask)
+        gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);

 
 

-    if (!m_data) 
+    gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
+}
+
+wxDragResult wxDropSource::DoDragDrop( bool allowMove )
+{
+    wxASSERT_MSG( m_data, wxT("Drop source: no 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;

-        
+
+    // still in drag
+    if (g_blockEventsOnDrag)
+        return (wxDragResult) wxDragNone;
+
+    // disabled for now

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


@@ -745,13 +771,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 ) );
+        wxLogTrace(TRACE_DND, 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;


@@ -765,7 +791,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;


@@ -781,25 +807,27 @@ 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)
     {

+        int action = GDK_ACTION_COPY;
+        if ( allowMove )
+            action |= GDK_ACTION_MOVE;

         GdkDragContext *context = gtk_drag_begin( m_widget,
         GdkDragContext *context = gtk_drag_begin( m_widget,

-                                              target_list,
-                                              GDK_ACTION_COPY,
-                                              button_number,  /* number of mouse button which started drag */
-                                              (GdkEvent*) &event );
-
-        wxMask *mask = m_goIcon.GetMask();
-        GdkBitmap *bm = (GdkBitmap *) NULL;
-        if (mask) bm = mask->GetBitmap();
-        GdkPixmap *pm = m_goIcon.GetPixmap();
-
-        gtk_drag_set_icon_pixmap( context,
-                                  gtk_widget_get_colormap( m_widget ),
-                                  pm,
-                                  bm,
-                                  0,
-                                  0 );
-
-        while (m_waiting) gtk_main_iteration();;
+                target_list,
+                (GdkDragAction)action,
+                button_number,  /* number of mouse button which started drag */
+                (GdkEvent*) &event );
+
+        m_dragContext = context;
+
+        PrepareIcon( action, context );
+
+        while (m_waiting) gtk_main_iteration();
+
+        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 wxUSE_THREADS
     }
 
 #if wxUSE_THREADS


@@ -844,5 +872,4 @@ void wxDropSource::UnregisterWindow()
 }
 
 #endif
 }
 
 #endif

-

       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP