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

failed attempt to change the default action for GTK dnd (nothing changed finally)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-08-03 13:24:23 +00:00
parent a467ac36a5
commit 9f39393d9e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/dnd.cpp
View File

@@ -570,9 +570,9 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
// "drag_data_delete" // "drag_data_delete"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *context,
wxDropSource *WXUNUSED(drop_source) ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
@@ -800,8 +800,9 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
/* don't start dragging if no button is down */ /* don't start dragging if no button is down */
if (button_number) if (button_number)
{ {
GdkDragAction action = GDK_ACTION_COPY; int action = GDK_ACTION_COPY;
if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY); if ( allowMove )
action |= GDK_ACTION_MOVE;
GdkDragContext *context = gtk_drag_begin( m_widget, GdkDragContext *context = gtk_drag_begin( m_widget,
target_list, target_list,
action, action,

11
src/gtk1/dnd.cpp
View File

@@ -570,9 +570,9 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
// "drag_data_delete" // "drag_data_delete"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *context,
wxDropSource *WXUNUSED(drop_source) ) wxDropSource *WXUNUSED(drop_source) )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
@@ -800,8 +800,9 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
/* don't start dragging if no button is down */ /* don't start dragging if no button is down */
if (button_number) if (button_number)
{ {
GdkDragAction action = GDK_ACTION_COPY; int action = GDK_ACTION_COPY;
if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY); if ( allowMove )
action |= GDK_ACTION_MOVE;
GdkDragContext *context = gtk_drag_begin( m_widget, GdkDragContext *context = gtk_drag_begin( m_widget,
target_list, target_list,
action, action,