diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-11-27 00:12:10 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-27 00:12:10 +0000 |
| commit | b4ad37ae1206212eab6f6eea39fbb9d439b8935f (patch) | |
| tree | 37136c8e9845c04b9edc2ba74fb7be8c509cd19c /gdk | |
| parent | 4722decd6e56414d7cd1b6e02e5e4bd22591b4af (diff) | |
| download | gdk-pixbuf-b4ad37ae1206212eab6f6eea39fbb9d439b8935f.tar.gz | |
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.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 0411423d9..153446e0b 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1609,13 +1609,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) { @@ -2472,6 +2468,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); @@ -2481,9 +2478,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); |