ignore clicks on a toolbar but outside any button

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index a95bf1c889202e58aa569d587fc9a8c9d0b41bb1..0be1c854adf73ce56a6681903e7aaa0b530fb78f 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -40,8 +40,6 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS

-extern void wxapp_install_thread_wakeup();
-extern void wxapp_uninstall_thread_wakeup();

 #endif
 
 //----------------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------------


@@ -60,7 +58,7 @@ static const wxChar *TRACE_DND = _T("dnd");
 //----------------------------------------------------------------------------
 
 /* XPM */
 //----------------------------------------------------------------------------
 
 /* 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 */


@@ -155,6 +153,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     wxDragResult result;
     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;
 
     else
         result = wxDragMove;
 


@@ -175,6 +175,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
         GdkDragAction action;
         if (result == wxDragCopy)
             action = GDK_ACTION_COPY;
         GdkDragAction action;
         if (result == wxDragCopy)
             action = GDK_ACTION_COPY;

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

         else
             action = GDK_ACTION_MOVE;
 
         else
             action = GDK_ACTION_MOVE;
 


@@ -254,7 +256,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
 #if wxUSE_THREADS
         /* disable GUI threads */
 
 #if wxUSE_THREADS
         /* disable GUI threads */

-        wxapp_uninstall_thread_wakeup();

 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();
 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();


@@ -273,7 +274,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */

-        wxapp_install_thread_wakeup();

 #endif
     }
 
 #endif
     }
 


@@ -325,6 +325,8 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     wxDragResult result;
     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;
 
     else
         result = wxDragMove;
 


@@ -549,7 +551,6 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */

-    wxapp_uninstall_thread_wakeup();

 #endif
 
                 gtk_selection_data_set( selection_data,
 #endif
 
                 gtk_selection_data_set( selection_data,


@@ -560,7 +561,6 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 #if wxUSE_THREADS
     /* enable GUI threads */
 
 #if wxUSE_THREADS
     /* enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
     delete[] d;
 #endif
 
     delete[] d;


@@ -621,6 +621,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
 
     wxDragResult action = wxDragNone;
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
 
     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 );
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
     source->GiveFeedback( action );


@@ -794,7 +795,6 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */

-    wxapp_uninstall_thread_wakeup();

 #endif
 
     /* don't start dragging if no button is down */
 #endif
 
     /* don't start dragging if no button is down */


@@ -817,13 +817,14 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 
         if (context->action == GDK_ACTION_COPY)
             m_retValue = wxDragCopy;
 
         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
     /* re-enable GUI threads */
         if (context->action == GDK_ACTION_MOVE)
             m_retValue = wxDragMove;
     }
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
     g_blockEventsOnDrag = FALSE;
 #endif
 
     g_blockEventsOnDrag = FALSE;