From 8a41c27cf0a3ad4a9ba00aba2be2e551dad2484a Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Sun, 23 Dec 2007 21:18:14 +0000 Subject: [PATCH] Merged from trunk: 2007-12-23 Cody Russell Merged from trunk: * gdk/win32/gdkevents-win32.c (show_window_recurse): Check that the window is mapped before setting SW_RESTORE or SW_MINIMIZE. Fixes a regression caused by #164537 patch where transient windows that are hidden get shown (incorrectly) when their parents are minimized. (#504984) svn path=/branches/gtk-2-12/; revision=19232 --- ChangeLog | 10 ++++++++++ gdk/win32/gdkevents-win32.c | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c9a446f80..b0998d158f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-12-23 Cody Russell + + Merged from trunk: + + * gdk/win32/gdkevents-win32.c (show_window_recurse): Check that + the window is mapped before setting SW_RESTORE or SW_MINIMIZE. + Fixes a regression caused by #164537 patch where transient + windows that are hidden get shown (incorrectly) when their + parents are minimized. (#504984) + 2007-12-23 Xan Lopez * gtk/gtktreeview.c (gtk_tree_view_build_tree): pass correct argument diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 3bf526da15..a916228418 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1288,10 +1288,13 @@ show_window_recurse (GdkWindow *window, gboolean hide_window) } } - if (!hide_window) - ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); - else - ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE); + if (GDK_WINDOW_IS_MAPPED (window)) + { + if (!hide_window) + ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); + else + ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE); + } impl->changing_state = FALSE; }