cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction to DnD code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-11-27 12:03:05 +00:00
parent 72a7edf007
commit 13fb7b7a1f
2 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/dnd.cpp
View File

@ -500,11 +500,11 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
wxDataFormat format( selection_data->target ); wxDataFormat format( selection_data->target );
wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() ); wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );
drop_source->m_retValue = wxDragCancel; drop_source->m_retValue = wxDragCancel;
wxDataObject *data = drop_source->GetDataObject(); wxDataObject *data = drop_source->GetDataObject();
if (!data) if (!data)
{ {
wxLogDebug( wxT("Drop source: no data object") ); wxLogDebug( wxT("Drop source: no data object") );
@ -552,9 +552,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
#endif #endif
delete[] d; delete[] d;
/* so far only copy, no moves. TODO. */
drop_source->m_retValue = wxDragCopy;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -563,13 +560,12 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle)
wxapp_install_idle_handler();
// printf( "Delete the data!\n" ); // printf( "Drag source: drag_data_delete\n" );
drop_source->m_retValue = wxDragMove;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -580,9 +576,10 @@ static void source_drag_begin( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *WXUNUSED(context),
wxDropSource *WXUNUSED(drop_source) ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle)
wxapp_install_idle_handler();
// printf( "drag_begin.\n" ); // printf( "Drag source: drag_begin.\n" );
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -595,7 +592,7 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget),
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
// printf( "drag_end.\n" ); // printf( "Drag source: drag_end.\n" );
drop_source->m_waiting = FALSE; drop_source->m_waiting = FALSE;
} }
@ -625,7 +622,6 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon ) wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
{ {
g_blockEventsOnDrag = TRUE;
m_waiting = TRUE; m_waiting = TRUE;
m_iconWindow = (GtkWidget*) NULL; m_iconWindow = (GtkWidget*) NULL;
@ -660,7 +656,6 @@ wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &ico
wxDropSource::~wxDropSource() wxDropSource::~wxDropSource()
{ {
g_blockEventsOnDrag = FALSE;
} }
void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
@ -762,12 +757,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
PrepareIcon( 0, 0, context ); PrepareIcon( 0, 0, context );
while (m_waiting) gtk_main_iteration();; while (m_waiting) gtk_main_iteration();
if (context->action == GDK_ACTION_COPY) if (context->action == GDK_ACTION_COPY)
return m_retValue = wxDragCopy; m_retValue = wxDragCopy;
if (context->action == GDK_ACTION_MOVE) if (context->action == GDK_ACTION_MOVE)
return m_retValue = wxDragMove; m_retValue = wxDragMove;
} }
#if wxUSE_THREADS #if wxUSE_THREADS
@ -785,7 +780,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
void wxDropSource::RegisterWindow() void wxDropSource::RegisterWindow()
{ {
if (!m_widget) return; if (!m_widget) return;
gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get", 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_connect (GTK_OBJECT(m_widget), "drag_data_delete",
@ -812,5 +807,4 @@ void wxDropSource::UnregisterWindow()
} }
#endif #endif
// wxUSE_DRAG_AND_DROP // wxUSE_DRAG_AND_DROP

34
src/gtk1/dnd.cpp
View File

@ -500,11 +500,11 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
wxDataFormat format( selection_data->target ); wxDataFormat format( selection_data->target );
wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() ); wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );
drop_source->m_retValue = wxDragCancel; drop_source->m_retValue = wxDragCancel;
wxDataObject *data = drop_source->GetDataObject(); wxDataObject *data = drop_source->GetDataObject();
if (!data) if (!data)
{ {
wxLogDebug( wxT("Drop source: no data object") ); wxLogDebug( wxT("Drop source: no data object") );
@ -552,9 +552,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
#endif #endif
delete[] d; delete[] d;
/* so far only copy, no moves. TODO. */
drop_source->m_retValue = wxDragCopy;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -563,13 +560,12 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle)
wxapp_install_idle_handler();
// printf( "Delete the data!\n" ); // printf( "Drag source: drag_data_delete\n" );
drop_source->m_retValue = wxDragMove;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -580,9 +576,10 @@ static void source_drag_begin( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *WXUNUSED(context),
wxDropSource *WXUNUSED(drop_source) ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle)
wxapp_install_idle_handler();
// printf( "drag_begin.\n" ); // printf( "Drag source: drag_begin.\n" );
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -595,7 +592,7 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget),
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
// printf( "drag_end.\n" ); // printf( "Drag source: drag_end.\n" );
drop_source->m_waiting = FALSE; drop_source->m_waiting = FALSE;
} }
@ -625,7 +622,6 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon ) wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
{ {
g_blockEventsOnDrag = TRUE;
m_waiting = TRUE; m_waiting = TRUE;
m_iconWindow = (GtkWidget*) NULL; m_iconWindow = (GtkWidget*) NULL;
@ -660,7 +656,6 @@ wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &ico
wxDropSource::~wxDropSource() wxDropSource::~wxDropSource()
{ {
g_blockEventsOnDrag = FALSE;
} }
void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
@ -762,12 +757,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
PrepareIcon( 0, 0, context ); PrepareIcon( 0, 0, context );
while (m_waiting) gtk_main_iteration();; while (m_waiting) gtk_main_iteration();
if (context->action == GDK_ACTION_COPY) if (context->action == GDK_ACTION_COPY)
return m_retValue = wxDragCopy; m_retValue = wxDragCopy;
if (context->action == GDK_ACTION_MOVE) if (context->action == GDK_ACTION_MOVE)
return m_retValue = wxDragMove; m_retValue = wxDragMove;
} }
#if wxUSE_THREADS #if wxUSE_THREADS
@ -785,7 +780,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
void wxDropSource::RegisterWindow() void wxDropSource::RegisterWindow()
{ {
if (!m_widget) return; if (!m_widget) return;
gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get", 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_connect (GTK_OBJECT(m_widget), "drag_data_delete",
@ -812,5 +807,4 @@ void wxDropSource::UnregisterWindow()
} }
#endif #endif
// wxUSE_DRAG_AND_DROP // wxUSE_DRAG_AND_DROP