From eb388dfcfee7dc137c39595f2e3fe911384a100c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 27 Aug 2004 23:38:06 +0000 Subject: [PATCH] Add drop_failed, like in the X11 backend. Nothing sets it, though. 2004-08-27 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add drop_failed, like in the X11 backend. Nothing sets it, though. (gdk_drag_drop_succeeded): Copy from X11 backend. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/win32/gdkdnd-win32.c | 18 ++++++++++++++++-- 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ff4dd9ba2..2fa429e958 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-08-27 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add + drop_failed, like in the X11 backend. Nothing sets it, though. + (gdk_drag_drop_succeeded): Copy from X11 backend. + Thu Aug 26 23:58:11 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8ff4dd9ba2..2fa429e958 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-08-27 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add + drop_failed, like in the X11 backend. Nothing sets it, though. + (gdk_drag_drop_succeeded): Copy from X11 backend. + Thu Aug 26 23:58:11 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8ff4dd9ba2..2fa429e958 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-08-27 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add + drop_failed, like in the X11 backend. Nothing sets it, though. + (gdk_drag_drop_succeeded): Copy from X11 backend. + Thu Aug 26 23:58:11 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8ff4dd9ba2..2fa429e958 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-08-27 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add + drop_failed, like in the X11 backend. Nothing sets it, though. + (gdk_drag_drop_succeeded): Copy from X11 backend. + Thu Aug 26 23:58:11 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 400dbe68a3..7b8a86c467 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -93,8 +93,9 @@ struct _GdkDragContextPrivateWin32 { #endif guint16 last_x; /* Coordinates from last event */ guint16 last_y; - HWND dest_xid; - guint drag_status; /* Current status of drag */ + HWND dest_xid; + guint drag_status : 4; /* Current status of drag */ + guint drop_failed : 1; /* Whether the drop was unsuccessful */ }; #define GDK_DRAG_CONTEXT_PRIVATE_DATA(context) ((GdkDragContextPrivateWin32 *) GDK_DRAG_CONTEXT (context)->windowing_data) @@ -1731,3 +1732,16 @@ gdk_drag_get_selection (GdkDragContext *context) else return GDK_NONE; } + +gboolean +gdk_drag_drop_succeeded (GdkDragContext *context) +{ + GdkDragContextPrivateWin32 *private; + + g_return_val_if_fail (context != NULL, FALSE); + + private = GDK_DRAG_CONTEXT_PRIVATE_DATA (context); + + /* FIXME: Can we set drop_failed when the drop has failed? */ + return !private->drop_failed; +}