#if wxUSE_CARET guard.

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index d03f079cc84f75b2f033c894fef50393bc3f5ba4..6ef44f891a2bb405b016da6016b844d7de6399b6 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,24 +7,21 @@
 // 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/gtk/private.h"
 


@@ -33,20 +30,6 @@
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkselection.h>
 
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkselection.h>
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// thread system
-//-----------------------------------------------------------------------------
-
-#if wxUSE_THREADS
-#endif
-

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


@@ -354,7 +337,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
     }
     else
     {

-        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") );
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );

 
 #if wxUSE_THREADS
         /* disable GUI threads */
 
 #if wxUSE_THREADS
         /* disable GUI threads */


@@ -363,7 +346,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, _T("no matching GdkAtom for format?") );

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


@@ -432,7 +415,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {

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

 
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
 
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );


@@ -510,7 +493,7 @@ 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 = (GdkAtom)(child->data);

         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__


@@ -551,17 +534,14 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 
     gtk_drag_dest_unset( widget );
 
 
     gtk_drag_dest_unset( widget );
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_leave, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_motion, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_drop, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_data_received, this);

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


@@ -584,17 +564,17 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
                        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 */
 

-    gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
-                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
+    g_signal_connect (widget, "drag_leave",
+                      G_CALLBACK (target_drag_leave), this);

 
 

-    gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
-                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
+    g_signal_connect (widget, "drag_motion",
+                      G_CALLBACK (target_drag_motion), this);

 
 

-    gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
-                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
+    g_signal_connect (widget, "drag_drop",
+                      G_CALLBACK (target_drag_drop), this);

 
 

-    gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
-                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
+    g_signal_connect (widget, "drag_data_received",
+                      G_CALLBACK (target_drag_data_received), this);

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


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


@@ -726,8 +706,7 @@ extern "C" {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal

 
     source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 
 
     source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 


@@ -818,28 +797,22 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;

-    gdk_window_get_size (pixmap, &width, &height);
+    gdk_drawable_get_size (pixmap, &width, &height);

 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
 
     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);
 
     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_pop_colormap ();
 

-    gtk_widget_set_usize (m_iconWindow, width, height);
+    gtk_widget_set_size_request (m_iconWindow, width, height);

     gtk_widget_realize (m_iconWindow);
 
     gtk_widget_realize (m_iconWindow);
 

-    gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
-        GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
+    g_signal_connect (m_iconWindow, "configure_event",
+                      G_CALLBACK (gtk_dnd_window_configure_callback), this);

 
     gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
 
 
     gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
 


@@ -937,6 +910,14 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
 
     UnregisterWindow();
 
 
     UnregisterWindow();
 

+    // this shouldn't be needed but somehow, sometimes, without this the cursor
+    // stays grabbed even when the DND operation ends and the application
+    // becomes unresponsive and has to be killed resulting in loss of all
+    // unsaved data, so while this fix is ugly it's still better than
+    // alternative
+    if ( gdk_pointer_is_grabbed() )
+        gdk_pointer_ungrab(GDK_CURRENT_TIME);
+

     return m_retValue;
 }
 
     return m_retValue;
 }
 


@@ -944,29 +925,34 @@ void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
 
 {
     if (!m_widget) return;
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
-                      GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
-                      GTK_SIGNAL_FUNC (source_drag_data_delete),  (gpointer) this );
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
-                      GTK_SIGNAL_FUNC (source_drag_begin),  (gpointer) this );
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
-                      GTK_SIGNAL_FUNC (source_drag_end),  (gpointer) this );
+    g_signal_connect (m_widget, "drag_data_get",
+                      G_CALLBACK (source_drag_data_get), this);
+    g_signal_connect (m_widget, "drag_data_delete",
+                      G_CALLBACK (source_drag_data_delete), this);
+    g_signal_connect (m_widget, "drag_begin",
+                      G_CALLBACK (source_drag_begin), this);
+    g_signal_connect (m_widget, "drag_end",
+                      G_CALLBACK (source_drag_end), this);

 
 }
 
 void wxDropSource::UnregisterWindow()
 {
 
 }
 
 void wxDropSource::UnregisterWindow()
 {

-    if (!m_widget) return;
+    if (!m_widget)
+        return;

 
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_data_get,
+                                          this);
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_data_delete,
+                                          this);
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_begin,
+                                          this);
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_end,
+                                          this);

 }
 
 #endif
 }
 
 #endif