]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dnd.cpp
[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.
[wxWidgets.git] / src / gtk / dnd.cpp
index ca8a96f4b620c6c7ef9ff146ab1f9f721b99cfa4..2d234e0f9217644224ead3c9aaf4fe19e44fd064 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.cpp
+// Name:        src/gtk/dnd.cpp
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,19 +7,21 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "dnd.h"
-#endif
-
-#include "wx/dnd.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #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 <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
 //----------------------------------------------------------------------------
@@ -60,49 +48,81 @@ static const wxChar *TRACE_DND = _T("dnd");
 // standard icons
 //----------------------------------------------------------------------------
 
-/* XPM */
+/* Copyright (c) Julian Smart */
 static const char * page_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 5 1",
-/* colors */
-"         s None        c None",
-".        c black",
-"X        c wheat",
-"o        c tan",
-"O        c #6699FF",
+/* columns rows colors chars-per-pixel */
+"32 32 37 1",
+"5 c #7198D9",
+", c #769CDA",
+"2 c #DCE6F6",
+"i c #FFFFFF",
+"e c #779DDB",
+": c #9AB6E4",
+"9 c #EAF0FA",
+"- c #B1C7EB",
+"$ c #6992D7",
+"y c #F7F9FD",
+"= c #BED0EE",
+"q c #F0F5FC",
+"; c #A8C0E8",
+"@ c #366BC2",
+"  c None",
+"u c #FDFEFF",
+"8 c #5987D3",
+"* c #C4D5F0",
+"7 c #7CA0DC",
+"O c #487BCE",
+"< c #6B94D7",
+"& c #CCDAF2",
+"> c #89A9DF",
+"3 c #5584D1",
+"w c #82A5DE",
+"1 c #3F74CB",
+"+ c #3A70CA",
+". c #3569BF",
+"% c #D2DFF4",
+"# c #3366BB",
+"r c #F5F8FD",
+"0 c #FAFCFE",
+"4 c #DFE8F7",
+"X c #5E8AD4",
+"o c #5282D0",
+"t c #B8CCEC",
+"6 c #E5EDF9",
 /* pixels */
-"    ...................         ",
-"    .XXXXXXXXXXXXXXXXX..        ",
-"    .XXXXXXXXXXXXXXXXX.o.       ",
-"    .XXXXXXXXXXXXXXXXX.oo.      ",
-"    .XXXXXXXXXXXXXXXXX.ooo.     ",
-"    .XXXXXXXXXXXXXXXXX.oooo.    ",
-"    .XXXXXXXXXXXXXXXXX.......   ",
-"    .XXXXXOOOOOOOOOOXXXooooo.   ",
-"    .XXXXXXXXXXXXXXXXXXooooo.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .........................   "};
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"       .XXXooOO++@#             ",
+"       $%&*=-;::>,<1            ",
+"       $2%&*=-;::><:3           ",
+"       $42%&*=-;::<&:3          ",
+"       56477<<<<8<<9&:X         ",
+"       59642%&*=-;<09&:5        ",
+"       5q9642%&*=-<<<<<#        ",
+"       5qqw777<<<<<88:>+        ",
+"       erqq9642%&*=t;::+        ",
+"       eyrqq9642%&*=t;:O        ",
+"       eyywwww777<<<<t;O        ",
+"       e0yyrqq9642%&*=to        ",
+"       e00yyrqq9642%&*=o        ",
+"       eu0wwwwwww777<&*X        ",
+"       euu00yyrqq9642%&X        ",
+"       eiuu00yyrqq9642%X        ",
+"       eiiwwwwwwwwww742$        ",
+"       eiiiuu00yyrqq964$        ",
+"       eiiiiuu00yyrqq96$        ",
+"       eiiiiiuu00yyrqq95        ",
+"       eiiiiiiuu00yyrqq5        ",
+"       eeeeeeeeeeeeee55e        ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};
 
 
 // ============================================================================
@@ -110,7 +130,7 @@ static const char * page_xpm[] = {
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// convert between GTK+ and wxWindows DND constants
+// convert between GTK+ and wxWidgets DND constants
 // ----------------------------------------------------------------------------
 
 static wxDragResult ConvertFromGTK(long action)
@@ -134,6 +154,7 @@ static wxDragResult ConvertFromGTK(long action)
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                                GdkDragContext *context,
                                guint WXUNUSED(time),
@@ -150,16 +171,18 @@ 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->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;
 
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_motion"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                     GdkDragContext *context,
                                     gint x,
@@ -182,6 +205,9 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     // only good if we don't have our own preferences - but also the actions
     // field
     wxDragResult result;
+    if (drop_target->GetDefaultAction() == wxDragNone)
+    {
+        // use default action set by wxDropSource::DoDragDrop()
     if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
             (context->actions & GDK_ACTION_MOVE ) )
     {
@@ -199,6 +225,21 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
             result = wxDragCopy;
         }
     }
+    }
+    else if (drop_target->GetDefaultAction() == wxDragMove &&
+                (context->actions & GDK_ACTION_MOVE))
+    {
+       result = wxDragMove;
+    }
+    else
+    {
+        if (context->actions & GDK_ACTION_COPY)
+            result = wxDragCopy;
+        else if (context->actions & GDK_ACTION_MOVE)
+            result = wxDragMove;
+        else
+            result = wxDragNone;
+    }
 
     if (drop_target->m_firstMotion)
     {
@@ -229,15 +270,17 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = FALSE;
+    drop_target->m_firstMotion = false;
 
     return ret;
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_drop"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_drop( GtkWidget *widget,
                                   GdkDragContext *context,
                                   gint x,
@@ -278,7 +321,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 */
-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = false;
 
     bool ret = drop_target->OnDrop( x, y );
 
@@ -294,14 +337,16 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     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 */
 #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;
@@ -326,15 +371,17 @@ static gboolean target_drag_drop( GtkWidget *widget,
     drop_target->SetDragWidget( (GtkWidget*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;
 
     return ret;
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_data_received"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                        GdkDragContext *context,
                                        gint x,
@@ -364,26 +411,27 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
 
-    wxDragResult result = ConvertFromGTK(context->suggested_action);
+    wxDragResult result = ConvertFromGTK(context->action);
 
     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 successfull */
+        /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
 
-        /* tell GTK that data transfer was not successfull */
+        /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
 
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
+}
 
 //----------------------------------------------------------------------------
 // wxDropTarget
@@ -392,7 +440,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 wxDropTarget::wxDropTarget( wxDataObject *data )
             : wxDropTargetBase( data )
 {
-    m_firstMotion = TRUE;
+    m_firstMotion = true;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
@@ -417,7 +465,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
     if (!m_dataObject)
-        return FALSE;
+        return false;
 
     return (GetMatchingPair() != (GdkAtom) 0);
 }
@@ -445,7 +493,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
     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__
@@ -465,19 +513,19 @@ GdkAtom wxDropTarget::GetMatchingPair()
 bool wxDropTarget::GetData()
 {
     if (!m_dragData)
-        return FALSE;
+        return false;
 
     if (!m_dataObject)
-        return FALSE;
+        return false;
 
     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 );
 
-    return TRUE;
+    return true;
 }
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
@@ -486,17 +534,14 @@ void wxDropTarget::UnregisterWidget( GtkWidget *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 )
@@ -519,23 +564,24 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
                        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);
 }
 
 //----------------------------------------------------------------------------
 // "drag_data_get"
 //----------------------------------------------------------------------------
 
+extern "C" {
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
                        GdkDragContext     *WXUNUSED(context),
@@ -589,11 +635,11 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
     /* 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 */
@@ -601,11 +647,13 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
     delete[] d;
 }
+}
 
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
+extern "C" {
 static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
                                      GdkDragContext *context,
                                      wxDropSource *WXUNUSED(drop_source) )
@@ -615,11 +663,13 @@ static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
 
     // printf( "Drag source: drag_data_delete\n" );
 }
+}
 
 //----------------------------------------------------------------------------
 // "drag_begin"
 //----------------------------------------------------------------------------
 
+extern "C" {
 static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
                                GdkDragContext     *WXUNUSED(context),
                                wxDropSource       *WXUNUSED(drop_source) )
@@ -629,11 +679,13 @@ static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
 
     // printf( "Drag source: drag_begin.\n" );
 }
+}
 
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
+extern "C" {
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
                              GdkDragContext     *WXUNUSED(context),
                              wxDropSource       *drop_source )
@@ -642,13 +694,15 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 
     // printf( "Drag source: drag_end.\n" );
 
-    drop_source->m_waiting = FALSE;
+    drop_source->m_waiting = false;
+}
 }
 
 //-----------------------------------------------------------------------------
 // "configure_event" from m_iconWindow
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
@@ -659,6 +713,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
 
     return 0;
 }
+}
 
 //---------------------------------------------------------------------------
 // wxDropSource
@@ -669,7 +724,7 @@ wxDropSource::wxDropSource(wxWindow *win,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
-    m_waiting = TRUE;
+    m_waiting = true;
 
     m_iconWindow = (GtkWidget*) NULL;
 
@@ -688,7 +743,7 @@ wxDropSource::wxDropSource(wxDataObject& data,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
-    m_waiting = TRUE;
+    m_waiting = true;
 
     SetData( data );
 
@@ -743,28 +798,22 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     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 );
-#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);
 
-#ifndef __WXGTK20__
-    gtk_widget_pop_visual ();
-#endif
     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_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);
 
@@ -784,11 +833,11 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
         return wxDragNone;
 
     // disabled for now
-    g_blockEventsOnDrag = TRUE;
+    g_blockEventsOnDrag = true;
 
     RegisterWindow();
 
-    m_waiting = TRUE;
+    m_waiting = true;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
 
@@ -858,7 +907,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     /* re-enable GUI threads */
 #endif
 
-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = false;
 
     UnregisterWindow();
 
@@ -869,29 +918,34 @@ void wxDropSource::RegisterWindow()
 {
     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()
 {
-    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