Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index dcb0b56c32686bbcf8db698d3081df4f21a4dfb6..42b4bc790b06821ec323a20a4c2010579261cf4a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.cpp
+// Name:        src/gtk1/dnd.cpp

 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,26 +7,23 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dnd.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.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
 
 #if wxUSE_DRAG_AND_DROP
 

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
+#include "wx/dnd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/gdicmn.h"
+#endif

 
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 #include <gdk/gdkprivate.h>
 
 
 #include <gdk/gdkprivate.h>
 


@@ -40,13 +37,6 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

-//-----------------------------------------------------------------------------
-// thread system
-//-----------------------------------------------------------------------------
-
-#if wxUSE_THREADS
-#endif
-

 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------


@@ -59,7 +49,12 @@ 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 wxT("dnd")
+
+// global variables because GTK+ DnD want to have the
+// mouse event that caused it
+extern GdkEvent *g_lastMouseEvent;
+extern int g_lastButtonNumber;

 
 //----------------------------------------------------------------------------
 // standard icons
 
 //----------------------------------------------------------------------------
 // standard icons


@@ -188,10 +183,10 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
     drop_target->OnLeave();
 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->OnLeave();
 
     /* this has to be done because GDK has no "drag_enter" event */

-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;

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

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->SetDragContext( NULL );

 }
 }
 
 }
 }
 


@@ -284,10 +279,10 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->SetDragContext( NULL );

 
     /* this has to be done because GDK has no "drag_enter" event */
 
     /* this has to be done because GDK has no "drag_enter" event */

-    drop_target->m_firstMotion = FALSE;
+    drop_target->m_firstMotion = false;

 
     return ret;
 }
 
     return ret;
 }


@@ -338,7 +333,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     /* 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 */
     /* 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;
+    g_blockEventsOnDrag = false;

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


@@ -363,7 +358,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111

-        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
+        wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") );

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


@@ -382,13 +377,13 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->SetDragContext( NULL );

 
     /* after this, invalidate the drop_target's drag widget */
 
     /* after this, invalidate the drop_target's drag widget */

-    drop_target->SetDragWidget( (GtkWidget*) NULL );
+    drop_target->SetDragWidget( NULL );

 
     /* this has to be done because GDK has no "drag_enter" event */
 
     /* this has to be done because GDK has no "drag_enter" event */

-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;

 
     return ret;
 }
 
     return ret;
 }


@@ -446,7 +441,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     }
 
     /* after this, invalidate the drop_target's drag data */
     }
 
     /* after this, invalidate the drop_target's drag data */

-    drop_target->SetDragData( (GtkSelectionData*) NULL );
+    drop_target->SetDragData( NULL );

 }
 }
 
 }
 }
 


@@ -457,10 +452,10 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 wxDropTarget::wxDropTarget( wxDataObject *data )
             : wxDropTargetBase( data )
 {
 wxDropTarget::wxDropTarget( wxDataObject *data )
             : wxDropTargetBase( data )
 {

-    m_firstMotion = TRUE;
-    m_dragContext = (GdkDragContext*) NULL;
-    m_dragWidget = (GtkWidget*) NULL;
-    m_dragData = (GtkSelectionData*) NULL;
+    m_firstMotion = true;
+    m_dragContext = NULL;
+    m_dragWidget = NULL;
+    m_dragData = NULL;

     m_dragTime = 0;
 }
 
     m_dragTime = 0;
 }
 


@@ -470,19 +465,14 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
 {
     // 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
-#ifdef __WXDEBUG__
-    wxLogNull noLog;
-#endif // Debug
-
-    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
+    // disable the debug message from GetMatchingPair() by passing true to it
+    return (GetMatchingPair(true) != (GdkAtom) 0) ? def : wxDragNone;

 }
 
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
     if (!m_dataObject)
 }
 
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
     if (!m_dataObject)

-        return FALSE;
+        return false;

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


@@ -499,7 +489,7 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
     return GetData() ? def : wxDragNone;
 }
 
     return GetData() ? def : wxDragNone;
 }
 

-GdkAtom wxDropTarget::GetMatchingPair()
+GdkAtom wxDropTarget::GetMatchingPair(bool quiet)

 {
     if (!m_dataObject)
         return (GdkAtom) 0;
 {
     if (!m_dataObject)
         return (GdkAtom) 0;


@@ -510,13 +500,14 @@ GdkAtom wxDropTarget::GetMatchingPair()
     GList *child = m_dragContext->targets;
     while (child)
     {
     GList *child = m_dragContext->targets;
     while (child)
     {

-        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        GdkAtom formatAtom = GPOINTER_TO_INT(child->data);

         wxDataFormat format( formatAtom );
 
         wxDataFormat format( formatAtom );
 

-#ifdef __WXDEBUG__
-        wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
-                   format.GetId().c_str());
-#endif // Debug
+        if ( !quiet )
+        {
+            wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
+                       format.GetId().c_str());
+        }

 
         if (m_dataObject->IsSupportedFormat( format ))
             return formatAtom;
 
         if (m_dataObject->IsSupportedFormat( format ))
             return formatAtom;


@@ -530,19 +521,19 @@ GdkAtom wxDropTarget::GetMatchingPair()
 bool wxDropTarget::GetData()
 {
     if (!m_dragData)
 bool wxDropTarget::GetData()
 {
     if (!m_dragData)

-        return FALSE;
+        return false;

 
     if (!m_dataObject)
 
     if (!m_dataObject)

-        return FALSE;
+        return false;

 
     wxDataFormat dragFormat( m_dragData->target );
 
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
 
     wxDataFormat dragFormat( m_dragData->target );
 
     if (!m_dataObject->IsSupportedFormat( dragFormat ))

-        return FALSE;
+        return false;

 
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
 
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 

-    return TRUE;
+    return true;

 }
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 }
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )


@@ -580,7 +571,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
     gtk_drag_dest_set( widget,
                        (GtkDestDefaults) 0,         /* no default behaviour */
 
     gtk_drag_dest_set( widget,
                        (GtkDestDefaults) 0,         /* no default behaviour */

-                       (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
+                       NULL,      /* we don't supply any formats here */

                        0,                           /* number of targets = 0 */
                        (GdkDragAction) 0 );         /* we don't supply any actions here */
 
                        0,                           /* number of targets = 0 */
                        (GdkDragAction) 0 );         /* we don't supply any actions here */
 


@@ -655,11 +646,11 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
     /* disable GUI threads */
 #endif
 
     /* disable GUI threads */
 #endif
 

-                gtk_selection_data_set( selection_data,
-                                        selection_data->target,
-                                        8,   // 8-bit
-                                        d,
-                                        size );
+    gtk_selection_data_set( selection_data,
+                            selection_data->target,
+                            8,   // 8-bit
+                            d,
+                            size );

 
 #if wxUSE_THREADS
     /* enable GUI threads */
 
 #if wxUSE_THREADS
     /* enable GUI threads */


@@ -675,7 +666,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)


@@ -714,7 +705,7 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 
     // printf( "Drag source: drag_end.\n" );
 
 
     // printf( "Drag source: drag_end.\n" );
 

-    drop_source->m_waiting = FALSE;
+    drop_source->m_waiting = false;

 }
 }
 
 }
 }
 


@@ -744,9 +735,9 @@ wxDropSource::wxDropSource(wxWindow *win,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {

-    m_waiting = TRUE;
+    m_waiting = true;

 
 

-    m_iconWindow = (GtkWidget*) NULL;
+    m_iconWindow = NULL;

 
     m_window = win;
     m_widget = win->m_widget;
 
     m_window = win;
     m_widget = win->m_widget;


@@ -763,11 +754,11 @@ wxDropSource::wxDropSource(wxDataObject& data,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {

-    m_waiting = TRUE;
+    m_waiting = true;

 
     SetData( data );
 
 
     SetData( data );
 

-    m_iconWindow = (GtkWidget*) NULL;
+    m_iconWindow = NULL;

 
     m_window = win;
     m_widget = win->m_widget;
 
     m_window = win;
     m_widget = win->m_widget;


@@ -786,11 +777,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy,
     m_iconMove = iconMove;
     m_iconNone = iconNone;
 
     m_iconMove = iconMove;
     m_iconNone = iconNone;
 

-    if ( !m_iconCopy.Ok() )
+    if ( !m_iconCopy.IsOk() )

         m_iconCopy = wxIcon(page_xpm);
         m_iconCopy = wxIcon(page_xpm);

-    if ( !m_iconMove.Ok() )
+    if ( !m_iconMove.IsOk() )

         m_iconMove = m_iconCopy;
         m_iconMove = m_iconCopy;

-    if ( !m_iconNone.Ok() )
+    if ( !m_iconNone.IsOk() )

         m_iconNone = m_iconCopy;
 }
 
         m_iconNone = m_iconCopy;
 }
 


@@ -813,7 +804,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     if ( icon->GetMask() )
         mask = icon->GetMask()->GetBitmap();
     else
     if ( icon->GetMask() )
         mask = icon->GetMask()->GetBitmap();
     else

-        mask = (GdkBitmap *)NULL;
+        mask = NULL;

 
     GdkPixmap *pixmap = icon->GetPixmap();
 
 
     GdkPixmap *pixmap = icon->GetPixmap();
 


@@ -821,18 +812,14 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     gdk_window_get_size (pixmap, &width, &height);
 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     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));
     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);
 
     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 ();
     gtk_widget_pop_visual ();

-#endif

     gtk_widget_pop_colormap ();
 
     gtk_widget_set_usize (m_iconWindow, width, height);
     gtk_widget_pop_colormap ();
 
     gtk_widget_set_usize (m_iconWindow, width, height);


@@ -858,14 +845,22 @@ 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
     // disabled for now

-    g_blockEventsOnDrag = TRUE;
+    g_blockEventsOnDrag = true;

 
     RegisterWindow();
 
 
     RegisterWindow();
 

-    m_waiting = TRUE;
+    m_waiting = true;

 
 

-    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+    GtkTargetList *target_list = gtk_target_list_new( NULL, 0 );

 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );


@@ -878,30 +873,6 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     }
     delete[] array;
 
     }
     delete[] array;
 

-    GdkEventMotion event;
-    event.window = m_widget->window;
-    int x = 0;
-    int y = 0;
-    GdkModifierType state;
-    gdk_window_get_pointer( event.window, &x, &y, &state );
-    event.x = x;
-    event.y = y;
-    event.state = state;
-    event.time = (guint32)GDK_CURRENT_TIME;
-
-    /* GTK wants to know which button was pressed which caused the dragging */
-    int button_number = 0;
-    if (event.state & GDK_BUTTON1_MASK) button_number = 1;
-    else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
-    else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
-
-#if wxUSE_THREADS
-    /* disable GUI threads */
-#endif
-
-    /* don't start dragging if no button is down */
-    if (button_number)
-    {

         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;


@@ -914,8 +885,8 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
                 (GdkDragAction)action,
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
                 (GdkDragAction)action,

-                button_number,  /* number of mouse button which started drag */
-                (GdkEvent*) &event );
+                g_lastButtonNumber,  // number of mouse button which started drag
+                (GdkEvent*) g_lastMouseEvent );

 
         m_dragContext = context;
 
 
         m_dragContext = context;
 


@@ -927,13 +898,8 @@ 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;

-    }
-
-#if wxUSE_THREADS
-    /* re-enable GUI threads */
-#endif

 
 

-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = false;

 
     UnregisterWindow();
 
 
     UnregisterWindow();