Merged from trunk:

2007-12-23  Cody Russell  <bratsche@gnome.org>

	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
This commit is contained in:
Cody Russell
2007-12-23 21:18:14 +00:00
committed by Cody Russell
parent 555fe02158
commit 8a41c27cf0
2 changed files with 17 additions and 4 deletions

View File

@@ -1,3 +1,13 @@
2007-12-23 Cody Russell <bratsche@gnome.org>
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 <xan@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_build_tree): pass correct argument

View File

@@ -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;
}