Add drop_failed, like in the X11 backend. Nothing sets it, though.

2004-08-27  Tor Lillqvist  <tml@iki.fi>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 8ff4dd9ba2d3188f1e6397baa80b1f570b5f9b9f..2fa429e958908a77e23294e7e8f90888116d1feb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8ff4dd9ba2d3188f1e6397baa80b1f570b5f9b9f..2fa429e958908a77e23294e7e8f90888116d1feb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8ff4dd9ba2d3188f1e6397baa80b1f570b5f9b9f..2fa429e958908a77e23294e7e8f90888116d1feb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't crash

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8ff4dd9ba2d3188f1e6397baa80b1f570b5f9b9f..2fa429e958908a77e23294e7e8f90888116d1feb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * 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 400dbe68a387043bb01ddab0d4e12edac623f0a7..7b8a86c46781ee15ce52647dececc0030377db04 100644 (file)
--- 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;
+}