From 55d785a3a156f916514764fa826cf854a4ad655e Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Mon, 6 May 2002 21:18:23 +0000 Subject: [PATCH] unset user_data before destroying the window. (fixes #80065). Mon May 6 23:17:42 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): unset user_data before destroying the window. (fixes #80065). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 19 +++++++++++++++---- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f04136d2e..844be8385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f04136d2e..844be8385 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f04136d2e..844be8385 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f04136d2e..844be8385 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f04136d2e..844be8385 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f04136d2e..844be8385 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon May 6 23:17:42 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_motion_draw_column_motion_arrow): + unset user_data before destroying the window. (fixes #80065). + Mon May 6 12:17:14 2002 Owen Taylor * configure.in: Fix versioning to avoid changing the diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e1bcaa31d..45270af6c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2280,9 +2280,12 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view) if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ORIGINAL) { - if (tree_view->priv->drag_highlight_window) - gdk_window_destroy (tree_view->priv->drag_highlight_window); + { + gdk_window_set_user_data (tree_view->priv->drag_highlight_window, + NULL); + gdk_window_destroy (tree_view->priv->drag_highlight_window); + } attributes.window_type = GDK_WINDOW_CHILD; attributes.wclass = GDK_INPUT_OUTPUT; @@ -2341,7 +2344,11 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view) if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW) { if (tree_view->priv->drag_highlight_window) - gdk_window_destroy (tree_view->priv->drag_highlight_window); + { + gdk_window_set_user_data (tree_view->priv->drag_highlight_window, + NULL); + gdk_window_destroy (tree_view->priv->drag_highlight_window); + } attributes.window_type = GDK_WINDOW_TEMP; attributes.wclass = GDK_INPUT_OUTPUT; @@ -2411,7 +2418,11 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view) tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT) { if (tree_view->priv->drag_highlight_window) - gdk_window_destroy (tree_view->priv->drag_highlight_window); + { + gdk_window_set_user_data (tree_view->priv->drag_highlight_window, + NULL); + gdk_window_destroy (tree_view->priv->drag_highlight_window); + } attributes.window_type = GDK_WINDOW_TEMP; attributes.wclass = GDK_INPUT_OUTPUT; -- 2.43.2