Better fix

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 2295ecef460d9e69b9818aa91d5def1105ec7688..47ce58b017564911277f9302a54e17b2a0021595 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -56,10 +56,11 @@ 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)

-static const wxChar *TRACE_DND = _T("dnd");
+#define TRACE_DND _T("dnd")

 
 

+// global variables because GTK+ DnD want to have the
+// mouse event that caused it

 extern GdkEvent *g_lastMouseEvent;
 extern GdkEvent *g_lastMouseEvent;

-

 extern int g_lastButtonNumber;
 
 //----------------------------------------------------------------------------
 extern int g_lastButtonNumber;
 
 //----------------------------------------------------------------------------


@@ -676,7 +677,7 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 extern "C" {
 static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
 
 extern "C" {
 static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),

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

                                      wxDropSource *WXUNUSED(drop_source) )
 {
     if (g_isIdle)
                                      wxDropSource *WXUNUSED(drop_source) )
 {
     if (g_isIdle)


@@ -855,6 +856,14 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     if (g_blockEventsOnDrag)
         return wxDragNone;
 
     if (g_blockEventsOnDrag)
         return wxDragNone;
 

+    // don't start dragging if no button is down
+    if (g_lastButtonNumber == 0)
+        return wxDragNone;
+        
+    // we can only start a drag after a mouse event
+    if (g_lastMouseEvent == NULL)
+        return wxDragNone;
+

     // disabled for now
     g_blockEventsOnDrag = true;
 
     // disabled for now
     g_blockEventsOnDrag = true;
 


@@ -875,9 +884,6 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     }
     delete[] array;
 
     }
     delete[] array;
 

-    /* don't start dragging if no button is down */
-    if (g_lastButtonNumber)
-    {

         int action = GDK_ACTION_COPY;
         if ( flags & wxDrag_AllowMove )
             action |= GDK_ACTION_MOVE;
         int action = GDK_ACTION_COPY;
         if ( flags & wxDrag_AllowMove )
             action |= GDK_ACTION_MOVE;


@@ -903,7 +909,6 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
         m_retValue = ConvertFromGTK(context->action);
         if ( m_retValue == wxDragNone )
             m_retValue = wxDragCancel;
         m_retValue = ConvertFromGTK(context->action);
         if ( m_retValue == wxDragNone )
             m_retValue = wxDragCancel;

-    }

 
     g_blockEventsOnDrag = false;
 
 
     g_blockEventsOnDrag = false;