Commit 57514934 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

Revert to the correct semantics. (#322516)

2005-11-27  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.c (set_or_clear_style_bits): Revert to
	the correct semantics. (#322516)
	(gdk_window_set_geometry_hints): Adjust call correspondingly.
parent 735d9891
2005-11-27 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (set_or_clear_style_bits): Revert to
the correct semantics. (#322516)
(gdk_window_set_geometry_hints): Adjust call correspondingly.
2005-11-25 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/*.[ch]: Merge with gtk-wimp's CVS.
......
2005-11-27 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (set_or_clear_style_bits): Revert to
the correct semantics. (#322516)
(gdk_window_set_geometry_hints): Adjust call correspondingly.
2005-11-25 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/*.[ch]: Merge with gtk-wimp's CVS.
......
......@@ -1638,13 +1638,9 @@ gdk_window_set_geometry_hints (GdkWindow *window,
gdk_window_set_decorations (window,
GDK_DECOR_ALL |
GDK_DECOR_MAXIMIZE);
gdk_window_set_decorations (window,
GDK_DECOR_RESIZEH);
}
else
gdk_window_set_decorations (window,
GDK_DECOR_RESIZEH |
GDK_DECOR_MAXIMIZE);
gdk_window_set_decorations (window, GDK_DECOR_ALL);
if (geom_mask & GDK_HINT_BASE_SIZE)
{
......@@ -2501,6 +2497,7 @@ set_or_clear_style_bits (GdkWindow *window,
{
LONG style, exstyle;
RECT rect, before, after;
const LONG settable_bits = WS_BORDER|WS_THICKFRAME|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
......@@ -2510,9 +2507,9 @@ set_or_clear_style_bits (GdkWindow *window,
AdjustWindowRectEx (&before, style, FALSE, exstyle);
if (clear_bits)
style &= ~bits;
style |= settable_bits, style &= ~bits;
else
style |= bits;
style &= ~settable_bits, style |= bits;
SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, style);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment