///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.cpp
+// Name: src/gtk/dnd.cpp
// Purpose: wxDropTarget class
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "dnd.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
-#if wxUSE_DRAG_AND_DROP
+#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/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
+#include "wx/gtk/private.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
#include <gdk/gdkprivate.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
-extern void wxapp_install_thread_wakeup();
-extern void wxapp_uninstall_thread_wakeup();
-#endif
-
//----------------------------------------------------------------------------
// global data
//----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
+// the flags used for the last DoDragDrop()
+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)
// standard icons
//----------------------------------------------------------------------------
-/* XPM */
-static 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",
+/* Copyright (c) Julian Smart */
+static const char * page_xpm[] = {
+/* 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 ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
+
+
+// ============================================================================
+// private functions
+// ============================================================================
+// ----------------------------------------------------------------------------
+// convert between GTK+ and wxWidgets DND constants
+// ----------------------------------------------------------------------------
+
+static wxDragResult ConvertFromGTK(long action)
+{
+ switch ( action )
+ {
+ case GDK_ACTION_COPY:
+ return wxDragCopy;
+ case GDK_ACTION_LINK:
+ return wxDragLink;
+
+ case GDK_ACTION_MOVE:
+ return wxDragMove;
+ }
+
+ return wxDragNone;
+}
// ----------------------------------------------------------------------------
// "drag_leave"
// ----------------------------------------------------------------------------
+extern "C" {
static void target_drag_leave( GtkWidget *WXUNUSED(widget),
GdkDragContext *context,
guint WXUNUSED(time),
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,
this is only valid for the duration of this call */
drop_target->SetDragContext( context );
+ // GTK+ always supposes that we want to copy the data by default while we
+ // might want to move it, so examine not only suggested_action - which is
+ // only good if we don't have our own preferences - but also the actions
+ // field
wxDragResult result;
- if ( context->suggested_action == GDK_ACTION_COPY )
- result = wxDragCopy;
- else
+ if (drop_target->GetDefaultAction() == wxDragNone)
+ {
+ // use default action set by wxDropSource::DoDragDrop()
+ if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+ (context->actions & GDK_ACTION_MOVE ) )
+ {
+ // move is requested by the program and allowed by GTK+ - do it, even
+ // though suggested_action may be currently wxDragCopy
result = wxDragMove;
+ }
+ else // use whatever GTK+ says we should
+ {
+ result = ConvertFromGTK(context->suggested_action);
+
+ if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+ {
+ // we're requested to move but we can't
+ 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)
{
GdkDragAction action;
if (result == wxDragCopy)
action = GDK_ACTION_COPY;
+ else if (result == wxDragLink)
+ action = GDK_ACTION_LINK;
else
action = GDK_ACTION_MOVE;
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,
/* 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 );
}
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 */
- wxapp_uninstall_thread_wakeup();
#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;
#if wxUSE_THREADS
/* re-enable GUI threads */
- wxapp_install_thread_wakeup();
#endif
}
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,
this is only valid for the duration of this call */
drop_target->SetDragData( data );
- wxDragResult result;
- if ( context->suggested_action == GDK_ACTION_COPY )
- result = wxDragCopy;
- else
- result = wxDragMove;
+ 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
wxDropTarget::wxDropTarget( wxDataObject *data )
: wxDropTargetBase( data )
{
- m_firstMotion = TRUE;
+ m_firstMotion = true;
m_dragContext = (GdkDragContext*) NULL;
m_dragWidget = (GtkWidget*) NULL;
m_dragData = (GtkSelectionData*) NULL;
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
- return FALSE;
+ return false;
return (GetMatchingPair() != (GdkAtom) 0);
}
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__
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 )
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 )
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),
#if wxUSE_THREADS
/* disable GUI threads */
- wxapp_uninstall_thread_wakeup();
#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 */
- wxapp_install_thread_wakeup();
#endif
delete[] d;
}
+}
//----------------------------------------------------------------------------
// "drag_data_delete"
//----------------------------------------------------------------------------
-static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
- GdkDragContext *WXUNUSED(context),
- wxDropSource *WXUNUSED(drop_source) )
+extern "C" {
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+ GdkDragContext *context,
+ wxDropSource *WXUNUSED(drop_source) )
{
if (g_isIdle)
wxapp_install_idle_handler();
// 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) )
// printf( "Drag source: drag_begin.\n" );
}
+}
//----------------------------------------------------------------------------
// "drag_end"
//----------------------------------------------------------------------------
+extern "C" {
static void source_drag_end( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source )
// 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 )
{
if (g_isIdle)
wxapp_install_idle_handler();
- wxDragResult action = wxDragNone;
- if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
- if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
-
- source->GiveFeedback( action );
+ source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
return 0;
}
+}
//---------------------------------------------------------------------------
// wxDropSource
const wxIcon &iconMove,
const wxIcon &iconNone)
{
- m_waiting = TRUE;
+ m_waiting = true;
m_iconWindow = (GtkWidget*) NULL;
const wxIcon &iconMove,
const wxIcon &iconNone)
{
- m_waiting = TRUE;
+ m_waiting = true;
SetData( data );
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);
gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
}
-wxDragResult wxDropSource::DoDragDrop( bool allowMove )
+wxDragResult wxDropSource::DoDragDrop(int flags)
{
- wxASSERT_MSG( m_data, wxT("Drop source: no data") );
-
- if (!m_data)
- return (wxDragResult) wxDragNone;
-
- if (m_data->GetFormatCount() == 0)
- return (wxDragResult) wxDragNone;
+ wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone,
+ wxT("Drop source: no data") );
// still in drag
if (g_blockEventsOnDrag)
- return (wxDragResult) wxDragNone;
+ 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 );
wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
m_data->GetAllFormats( array );
- for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+ size_t count = m_data->GetFormatCount();
+ for (size_t i = 0; i < count; i++)
{
GdkAtom atom = array[i];
wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
#if wxUSE_THREADS
/* disable GUI threads */
- wxapp_uninstall_thread_wakeup();
#endif
/* don't start dragging if no button is down */
if (button_number)
{
- GdkDragAction action = GDK_ACTION_COPY;
- if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);
+ int action = GDK_ACTION_COPY;
+ if ( flags & wxDrag_AllowMove )
+ action |= GDK_ACTION_MOVE;
+
+ // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
+ // to use a global to pass the flags to the drop target but I'd
+ // surely prefer a better way to do it
+ gs_flagsForDrag = flags;
+
GdkDragContext *context = gtk_drag_begin( m_widget,
target_list,
- action,
+ (GdkDragAction)action,
button_number, /* number of mouse button which started drag */
(GdkEvent*) &event );
PrepareIcon( action, context );
- while (m_waiting) gtk_main_iteration();
+ while (m_waiting)
+ gtk_main_iteration();
- if (context->action == GDK_ACTION_COPY)
- m_retValue = wxDragCopy;
- if (context->action == GDK_ACTION_MOVE)
- m_retValue = wxDragMove;
+ m_retValue = ConvertFromGTK(context->action);
+ if ( m_retValue == wxDragNone )
+ m_retValue = wxDragCancel;
}
#if wxUSE_THREADS
/* re-enable GUI threads */
- wxapp_install_thread_wakeup();
#endif
- g_blockEventsOnDrag = FALSE;
+ g_blockEventsOnDrag = false;
UnregisterWindow();
{
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
projects / wxWidgets.git / blobdiff