Build fixes.

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 7c1834bf873532c38122e53152db4876e2f2a01c..02701c7a5408c48ff8befae7b3a87d692c741ec8 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -7,12 +7,17 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dnd.h"
 #endif
 
     #pragma implementation "dnd.h"
 #endif
 

-#include "wx/dnd.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

+#include "wx/dnd.h"
+#include "wx/log.h"
+                                                                              
+                                                                               

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"


@@ -48,6 +53,9 @@ extern bool g_isIdle;
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 

+// the flags used for the last DoDragDrop()
+static long gs_flagsForDrag = 0;
+

 // 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)
 // 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)


@@ -102,6 +110,30 @@ static const char * page_xpm[] = {
 "    .........................   "};
 
 
 "    .........................   "};
 
 

+// ============================================================================
+// private functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// convert between GTK+ and wxWidgets DND constants
+// ----------------------------------------------------------------------------
+
+static wxDragResult ConvertFromGTK(long action)
+{
+    switch ( action )
+    {
+        case GDK_ACTION_COPY:
+            return wxDragCopy;
+
+        case GDK_ACTION_LINK:
+            return wxDragLink;
+
+        case GDK_ACTION_MOVE:
+            return wxDragMove;
+    }
+
+    return wxDragNone;
+}

 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 
 // ----------------------------------------------------------------------------
 // "drag_leave"


@@ -150,13 +182,28 @@ 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 );
 

+    // GTK+ always supposes that we want to copy the data by default while we
+    // might want to move it, so examine not only suggested_action - which is
+    // only good if we don't have our own preferences - but also the actions
+    // field

     wxDragResult result;
     wxDragResult result;

-    if ( context->suggested_action == GDK_ACTION_COPY )
-        result = wxDragCopy;
-    else if ( context->suggested_action == GDK_ACTION_LINK )
-        result = wxDragLink;
-    else
+    if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+            (context->actions & GDK_ACTION_MOVE ) )
+    {
+        // move is requested by the program and allowed by GTK+ - do it, even
+        // though suggested_action may be currently wxDragCopy

         result = wxDragMove;
         result = wxDragMove;

+    }
+    else // use whatever GTK+ says we should
+    {
+        result = ConvertFromGTK(context->suggested_action);
+
+        if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+        {
+            // we're requested to move but we can't
+            result = wxDragCopy;
+        }
+    }

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


@@ -173,7 +220,9 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     if (ret)
     {
         GdkDragAction action;
     if (ret)
     {
         GdkDragAction action;

-        if (result == wxDragCopy)
+        if ((result == wxDragCopy) && (context->actions & GDK_ACTION_COPY) ||
+            (result == wxDragMove) && !(context->actions & GDK_ACTION_MOVE) ||
+            (result == wxDragLink) && !(context->actions & GDK_ACTION_LINK))

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


@@ -259,7 +308,9 @@ static gboolean target_drag_drop( GtkWidget *widget,
 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();
 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();

-        wxASSERT( format );
+
+        // this does happen somehow, see bug 555111
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )

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


@@ -322,13 +373,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
 
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
 

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

 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {


@@ -619,12 +664,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     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 );
+    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );

 
     return 0;
 }
 
     return 0;
 }


@@ -743,19 +783,14 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
 }
 
     gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
 }
 

-wxDragResult wxDropSource::DoDragDrop( bool allowMove )
+wxDragResult wxDropSource::DoDragDrop(int flags)

 {
 {

-    wxASSERT_MSG( m_data, wxT("Drop source: no data") );
-
-    if (!m_data)
-        return (wxDragResult) wxDragNone;
-
-    if (m_data->GetFormatCount() == 0)
-        return (wxDragResult) wxDragNone;
+    wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone,
+                 wxT("Drop source: no data") );

 
     // still in drag
     if (g_blockEventsOnDrag)
 
     // still in drag
     if (g_blockEventsOnDrag)

-        return (wxDragResult) wxDragNone;
+        return wxDragNone;

 
     // disabled for now
     g_blockEventsOnDrag = TRUE;
 
     // disabled for now
     g_blockEventsOnDrag = TRUE;


@@ -768,7 +803,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );

-    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    size_t count = m_data->GetFormatCount();
+    for (size_t i = 0; i < count; i++)

     {
         GdkAtom atom = array[i];
         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
     {
         GdkAtom atom = array[i];
         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));


@@ -801,8 +837,14 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     if (button_number)
     {
         int action = GDK_ACTION_COPY;
     if (button_number)
     {
         int action = GDK_ACTION_COPY;

-        if ( allowMove )
+        if ( flags & wxDrag_AllowMove )

             action |= GDK_ACTION_MOVE;
             action |= GDK_ACTION_MOVE;

+
+        // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
+        //     to use a global to pass the flags to the drop target but I'd
+        //     surely prefer a better way to do it
+        gs_flagsForDrag = flags;
+

         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
                 (GdkDragAction)action,
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
                 (GdkDragAction)action,


@@ -813,14 +855,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
         PrepareIcon( action, context );
 
 
         PrepareIcon( action, 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_LINK)
-            m_retValue = wxDragLink;
-        if (context->action == GDK_ACTION_MOVE)
-            m_retValue = wxDragMove;
+        m_retValue = ConvertFromGTK(context->action);
+        if ( m_retValue == wxDragNone )
+            m_retValue = wxDragCancel;

     }
 
 #if wxUSE_THREADS
     }
 
 #if wxUSE_THREADS