From a5eec70325519364a3de4fe7b6db1ee4fb41278c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 19 Mar 2002 23:16:08 +0000 Subject: [PATCH] Use gdk_window_get_toplevel(), as it is the top-level windows that are 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use gdk_window_get_toplevel(), as it is the top-level windows that are registered for DND. * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/win32/gdkdnd-win32.c | 5 ++++- gdk/win32/gdkwin32.h | 1 - 8 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e0bc047e3..632697786b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e0bc047e3..632697786b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e0bc047e3..632697786b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e0bc047e3..632697786b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e0bc047e3..632697786b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e0bc047e3..632697786b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-03-20 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use + gdk_window_get_toplevel(), as it is the top-level windows that are + registered for DND. + + * gdk/win32/gdkwin32.h: Don't include gdkinternals.h. + 2002-03-19 jacob berkman * gtk/gtkcombo.c (gtk_combo_find): fix infinite loop when diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index b1b7125832..f440baf6b8 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -1336,7 +1336,10 @@ gdk_drag_find_window (GdkDragContext *context, { *dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT(recipient)); if (*dest_window) - gdk_drawable_ref (*dest_window); + { + *dest_window = gdk_window_get_toplevel (*dest_window); + gdk_drawable_ref (*dest_window); + } if (context->source_window) *protocol = GDK_DRAG_PROTO_LOCAL; diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h index ee11e58952..bae4708adb 100644 --- a/gdk/win32/gdkwin32.h +++ b/gdk/win32/gdkwin32.h @@ -28,7 +28,6 @@ #define __GDK_WIN32_H__ #include -#include #include #ifndef STRICT