X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b03b33e2e64ad63f7637dcff9ffc52b9a3fcb9eb..e1f36ff823aa21414b756cbe451853d1f1338fd9:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index ae53201b1b..289765439d 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -28,6 +28,13 @@ #include "gtk/gtkdnd.h" #include "gtk/gtkselection.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //---------------------------------------------------------------------------- // global data //---------------------------------------------------------------------------- @@ -41,9 +48,9 @@ extern bool g_blockEventsOnDrag; /* XPM */ static char * gv_xpm[] = { "40 34 3 1", -" s None c None", -". c black", -"X c white", +" s None c None", +". c black", +"X c white", " ", " ", " ...... ", @@ -78,17 +85,17 @@ static char * gv_xpm[] = { " ", " ", " "}; - + /* 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", +" s None c None", +". c black", +"X c wheat", +"o c tan", +"O c #6699FF", /* pixels */ " ................... ", " .XXXXXXXXXXXXXXXXX.. ", @@ -122,29 +129,31 @@ static char * page_xpm[] = { " .XXXXXXXXXXXXXXXXXXXXXXX. ", " .XXXXXXXXXXXXXXXXXXXXXXX. ", " ......................... "}; - - + + // ---------------------------------------------------------------------------- // "drag_leave" // ---------------------------------------------------------------------------- static void target_drag_leave( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - guint WXUNUSED(time), - wxDropTarget *drop_target ) + GdkDragContext *context, + guint WXUNUSED(time), + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + /* we don't need return values. this event is just for information */ drop_target->OnLeave(); - + /* this has to be done because GDK has no "drag_enter" event */ drop_target->m_firstMotion = TRUE; - + /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); } @@ -154,41 +163,43 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget), // ---------------------------------------------------------------------------- static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "if the coordinates not in a drop zone, return FALSE, otherwise call gtk_drag_status() and return TRUE" */ - + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + if (drop_target->m_firstMotion) { /* the first "drag_motion" event substitutes a "drag_enter" event */ - drop_target->OnEnter(); + drop_target->OnEnter(); } - + /* give program a chance to react (i.e. to say no by returning FALSE) */ bool ret = drop_target->OnMove( x, y ); - + /* we don't yet handle which "actions" (i.e. copy or move) the target accepts. so far we simply accept the suggested action. TODO. */ if (ret) gdk_drag_status( context, context->suggested_action, time ); - + /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); - + /* this has to be done because GDK has no "drag_enter" event */ drop_target->m_firstMotion = FALSE; - + return ret; } @@ -197,55 +208,57 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), // ---------------------------------------------------------------------------- static gboolean target_drag_drop( GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "if the drop is not in a drop zone, return FALSE, otherwise, if you aren't accepting the drop, call gtk_drag_finish() with success == FALSE otherwise call gtk_drag_data_get()" */ // printf( "drop.\n" ); - + /* this seems to make a difference between not accepting due to wrong target area and due to wrong format. let us hope that this is not required.. */ - + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + /* inform the wxDropTarget about the current drag widget. this is only valid for the duration of this call */ drop_target->SetDragWidget( widget ); - + /* inform the wxDropTarget about the current drag time. this is only valid for the duration of this call */ drop_target->SetDragTime( time ); - + bool ret = drop_target->OnDrop( x, y ); - + if (!ret) { /* cancel the whole thing */ gtk_drag_finish( context, - FALSE, /* no success */ - FALSE, /* don't delete data on dropping side */ - time ); + FALSE, /* no success */ + FALSE, /* don't delete data on dropping side */ + time ); } - + /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); - + /* after this, invalidate the drop_target's drag widget */ drop_target->SetDragWidget( (GtkWidget*) NULL ); - + /* this has to be done because GDK has no "drag_enter" event */ drop_target->m_firstMotion = TRUE; - + return ret; } @@ -254,43 +267,47 @@ static gboolean target_drag_drop( GtkWidget *widget, // ---------------------------------------------------------------------------- static void target_drag_data_received( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *data, - guint WXUNUSED(info), - guint time, - wxDropTarget *drop_target ) + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *data, + guint WXUNUSED(info), + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ // printf( "data received.\n" ); - + if ((data->length <= 0) || (data->format != 8)) { /* negative data length and non 8-bit data format qualifies for junk */ gtk_drag_finish (context, FALSE, FALSE, time); - - return; + +// printf( "no data.\n" ); + + return; } - + /* inform the wxDropTarget about the current GtkSelectionData. this is only valid for the duration of this call */ drop_target->SetDragData( data ); - + if (drop_target->OnData( x, y )) { - /* tell GTK that data transfer was successfull */ + /* tell GTK that data transfer was successfull */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { - /* tell GTK that data transfer was not successfull */ + /* tell GTK that data transfer was not successfull */ gtk_drag_finish( context, FALSE, FALSE, time ); } - + /* after this, invalidate the drop_target's drag data */ drop_target->SetDragData( (GtkSelectionData*) NULL ); } @@ -320,17 +337,17 @@ void wxDropTarget::OnLeave() { } -bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return TRUE; } -bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) { return FALSE; } -bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) ) { return FALSE; } @@ -339,139 +356,145 @@ bool wxDropTarget::RequestData( wxDataFormat format ) { if (!m_dragContext) return FALSE; if (!m_dragWidget) return FALSE; - + +/* + wxPrintf( _T("format: %s.\n"), format.GetId().c_str() ); + if (format.GetType() == wxDF_PRIVATE) wxPrintf( _T("private data.\n") ); + if (format.GetType() == wxDF_TEXT) wxPrintf( _T("text data.\n") ); +*/ + /* this should trigger an "drag_data_received" event */ - gtk_drag_get_data( m_dragWidget, - m_dragContext, - format.GetAtom(), - m_dragTime ); - + gtk_drag_get_data( m_dragWidget, + m_dragContext, + format.GetAtom(), + m_dragTime ); + return TRUE; } bool wxDropTarget::IsSupported( wxDataFormat format ) -{ +{ if (!m_dragContext) return FALSE; - + GList *child = m_dragContext->targets; while (child) { GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); - + // char *name = gdk_atom_name( formatAtom ); // if (name) printf( "Format available: %s.\n", name ); - + if (formatAtom == format.GetAtom()) return TRUE; child = child->next; } return FALSE; } - + bool wxDropTarget::GetData( wxDataObject *data_object ) { if (!m_dragData) return FALSE; - + if (m_dragData->target != data_object->GetFormat().GetAtom()) return FALSE; - + if (data_object->GetFormat().GetType() == wxDF_TEXT) { wxTextDataObject *text_object = (wxTextDataObject*)data_object; text_object->SetText( (const char*)m_dragData->data ); } else - + if (data_object->GetFormat().GetType() == wxDF_FILENAME) { } else - + if (data_object->GetFormat().GetType() == wxDF_PRIVATE) { - wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object; - priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length ); + wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object; + priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length ); } - + return TRUE; } - + void wxDropTarget::UnregisterWidget( GtkWidget *widget ) { wxCHECK_RET( widget != NULL, _T("unregister widget is NULL") ); - + gtk_drag_dest_unset( widget ); - + gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + 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_FUNC(target_drag_motion), (gpointer) this ); gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + 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 ); + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } void wxDropTarget::RegisterWidget( GtkWidget *widget ) { wxCHECK_RET( widget != NULL, _T("register widget is NULL") ); - + /* gtk_drag_dest_set() determines what default behaviour we'd like GTK to supply. we don't want to specify out targets (=formats) or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and not GTK_DEST_DEFAULT_DROP). instead we react individually to "drag_motion" and "drag_drop" events. this makes it possible - to allow dropping on only a small area. we should set + to allow dropping on only a small area. we should set GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice highlighting if dragging over standard controls, but this seems to be broken without the other two. */ - + gtk_drag_dest_set( widget, - (GtkDestDefaults) 0, /* no default behaviour */ - (GtkTargetEntry*) NULL, /* we don't supply any formats here */ - 0, /* number of targets = 0 */ - (GdkDragAction) 0 ); /* we don't supply any actions here */ - + (GtkDestDefaults) 0, /* no default behaviour */ + (GtkTargetEntry*) NULL, /* we don't supply any formats 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 ); + GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } //------------------------------------------------------------------------- // wxTextDropTarget //------------------------------------------------------------------------- -bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return IsSupported( wxDF_TEXT ); } -bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) { if (IsSupported( wxDF_TEXT )) { RequestData( wxDF_TEXT ); - return TRUE; + return TRUE; } - + return FALSE; } -bool wxTextDropTarget::OnData( int x, int y ) +bool wxTextDropTarget::OnData( long x, long y ) { wxTextDataObject data; if (!GetData( &data )) return FALSE; - + OnDropText( x, y, data.GetText() ); - + return TRUE; } @@ -489,31 +512,31 @@ wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id ) m_id = id; } -bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return IsSupported( m_id ); } -bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxPrivateDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) { if (!IsSupported( m_id )) - { + { RequestData( m_id ); return FALSE; } - + return FALSE; } -bool wxPrivateDropTarget::OnData( int x, int y ) +bool wxPrivateDropTarget::OnData( long x, long y ) { if (!IsSupported( m_id )) return FALSE; - + wxPrivateDataObject data; if (!GetData( &data )) return FALSE; - + OnDropData( x, y, data.GetData(), data.GetSize() ); - + return TRUE; } @@ -521,23 +544,23 @@ bool wxPrivateDropTarget::OnData( int x, int y ) // A drop target which accepts files (dragged from File Manager or Explorer) //---------------------------------------------------------------------------- -bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return IsSupported( wxDF_FILENAME ); } -bool wxFileDropTarget::OnDrop( int x, int y ) +bool wxFileDropTarget::OnDrop( long x, long y ) { if (IsSupported( wxDF_FILENAME )) { RequestData( wxDF_FILENAME ); - return TRUE; + return TRUE; } - + return FALSE; } -bool wxFileDropTarget::OnData( int x, int y ) +bool wxFileDropTarget::OnData( long x, long y ) { wxFileDataObject data; if (!GetData( &data )) return FALSE; @@ -551,9 +574,9 @@ bool wxFileDropTarget::OnData( int x, int y ) if (text[i] == 0) number++; if (number == 0) return FALSE; - + wxChar **files = new wxChar*[number]; - + text = WXSTRINGCAST data.GetFiles(); for (i = 0; i < number; i++) { @@ -562,10 +585,10 @@ bool wxFileDropTarget::OnData( int x, int y ) text += len+1; } - OnDropFiles( x, y, number, files ); - + OnDropFiles( x, y, number, files ); + free( files ); - + return TRUE; } @@ -573,88 +596,102 @@ bool wxFileDropTarget::OnData( int x, int y ) // "drag_data_get" //---------------------------------------------------------------------------- -static void +static void source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - GtkSelectionData *selection_data, - guint WXUNUSED(info), - guint WXUNUSED(time), - wxDropSource *drop_source ) + GdkDragContext *context, + GtkSelectionData *selection_data, + guint WXUNUSED(info), + guint WXUNUSED(time), + wxDropSource *drop_source ) { + if (g_isIdle) wxapp_install_idle_handler(); + +// printf( "Provide data!\n" ); + // char *name = gdk_atom_name( selection_data->target ); // if (name) printf( "Format requested: %s.\n", name ); - + wxNode *node = drop_source->m_data->m_dataObjects.First(); while (node) { wxDataObject *data_object = (wxDataObject*) node->Data(); - if (data_object->GetFormat().GetAtom() == selection_data->target) - { - size_t data_size = data_object->GetSize(); - - if (data_size > 0) - { - guchar *buffer = new guchar[data_size]; - data_object->WriteData( buffer ); - + if (data_object->GetFormat().GetAtom() == selection_data->target) + { +// printf( "format found.\n" ); + + size_t data_size = data_object->GetSize(); + + if (data_size > 0) + { +// printf( "data size: %d.\n", (int)data_size ); + + guchar *buffer = new guchar[data_size]; + data_object->WriteData( buffer ); + gtk_selection_data_set( selection_data, - selection_data->target, - 8, /* 8-bit */ - buffer, - data_size ); - - free( buffer ); - - /* so far only copy, no moves. TODO. */ + selection_data->target, + 8, // 8-bit + buffer, + data_size ); + + free( buffer ); + + /* so far only copy, no moves. TODO. */ drop_source->m_retValue = wxDragCopy; - - return; - } - } - + + return; + } + } + node = node->Next(); } - + drop_source->m_retValue = wxDragCancel; } - + //---------------------------------------------------------------------------- // "drag_data_delete" //---------------------------------------------------------------------------- static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *drop_source ) + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { + if (g_isIdle) wxapp_install_idle_handler(); + // printf( "Delete the data!\n" ); drop_source->m_retValue = wxDragMove; } - + //---------------------------------------------------------------------------- // "drag_begin" //---------------------------------------------------------------------------- static void source_drag_begin( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *WXUNUSED(drop_source) ) + GdkDragContext *WXUNUSED(context), + wxDropSource *WXUNUSED(drop_source) ) { + if (g_isIdle) wxapp_install_idle_handler(); + // printf( "drag_begin.\n" ); } - + //---------------------------------------------------------------------------- // "drag_end" //---------------------------------------------------------------------------- static void source_drag_end( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *drop_source ) + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { + if (g_isIdle) wxapp_install_idle_handler(); + // printf( "drag_end.\n" ); drop_source->m_waiting = FALSE; } - + //--------------------------------------------------------------------------- // wxDropSource //--------------------------------------------------------------------------- @@ -663,17 +700,17 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop { g_blockEventsOnDrag = TRUE; m_waiting = TRUE; - + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - + m_data = (wxDataBroker*) NULL; m_retValue = wxDragCancel; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_goaheadCursor = wxCursor( wxCURSOR_HAND ); - + m_goIcon = go; if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); m_stopIcon = stop; @@ -683,16 +720,16 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop ) { m_waiting = TRUE; - + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - + if (data) { m_data = new wxDataBroker(); - m_data->Add( data ); + m_data->Add( data ); } else { @@ -701,7 +738,7 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_goaheadCursor = wxCursor( wxCURSOR_HAND ); - + m_goIcon = go; if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); m_stopIcon = stop; @@ -714,7 +751,7 @@ wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - + m_data = data; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); @@ -724,11 +761,11 @@ wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) void wxDropSource::SetData( wxDataObject *data ) { if (m_data) delete m_data; - + if (data) { m_data = new wxDataBroker(); - m_data->Add( data ); + m_data->Add( data ); } else { @@ -739,7 +776,7 @@ void wxDropSource::SetData( wxDataObject *data ) void wxDropSource::SetData( wxDataBroker *data ) { if (m_data) delete m_data; - + m_data = data; } @@ -749,22 +786,25 @@ wxDropSource::~wxDropSource(void) g_blockEventsOnDrag = FALSE; } - + wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { wxASSERT_MSG( m_data, _T("wxDragSource: no data") ); - + if (!m_data) return (wxDragResult) wxDragNone; - + g_blockEventsOnDrag = TRUE; - + RegisterWindow(); - + m_waiting = TRUE; + GdkAtom atom = gdk_atom_intern( "STRING", FALSE ); +// wxPrintf( _T("atom id: %d.\n"), (int)atom ); + GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); - gtk_target_list_add( target_list, gdk_atom_intern( "STRING", FALSE ), 0, 0 ); - + gtk_target_list_add( target_list, atom, 0, 0 ); + GdkEventMotion event; event.window = m_widget->window; int x = 0; @@ -774,7 +814,8 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) event.x = x; event.y = y; event.state = state; - + event.time = 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; @@ -786,29 +827,27 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { GdkDragContext *context = gtk_drag_begin( m_widget, target_list, - GDK_ACTION_COPY, - button_number, /* number of mouse button which started drag */ - (GdkEvent*) &event ); - + GDK_ACTION_COPY, + button_number, /* number of mouse button which started drag */ + (GdkEvent*) &event ); + wxMask *mask = m_goIcon.GetMask(); GdkBitmap *bm = (GdkBitmap *) NULL; if (mask) bm = mask->GetBitmap(); - GdkPixmap *pm = m_goIcon.GetPixmap(); - + GdkPixmap *pm = m_goIcon.GetPixmap(); + gtk_drag_set_icon_pixmap( context, - gtk_widget_get_colormap( m_widget ), - pm, - bm, - 0, - 0 ); - - gdk_flush(); - - while (m_waiting) wxYield(); + gtk_widget_get_colormap( m_widget ), + pm, + bm, + 0, + 0 ); + + while (m_waiting) gtk_main_iteration();; } g_blockEventsOnDrag = FALSE; - + UnregisterWindow(); return m_retValue; @@ -817,30 +856,30 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) 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_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_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_FUNC (source_drag_begin), (gpointer) this ); gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end", - GTK_SIGNAL_FUNC (source_drag_end), (gpointer) this ); + GTK_SIGNAL_FUNC (source_drag_end), (gpointer) this ); } void wxDropSource::UnregisterWindow() { if (!m_widget) return; - + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this ); + 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_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_FUNC(source_drag_begin), (gpointer) this ); gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this ); + GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this ); } #endif