diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-11-27 00:20:55 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-27 00:20:55 +0000 |
| commit | 575149342be3510c79ce76f67f629dfa930fff0e (patch) | |
| tree | 0b2b0fecbc99e6c92cd845a3cb1918153adc092a | |
| parent | 735d98916ebf9ff312dc2ebfa9322c92bf1d2204 (diff) | |
| download | gdk-pixbuf-575149342be3510c79ce76f67f629dfa930fff0e.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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 11 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,9 @@ +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. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3b9f16617..6a61448aa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +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. diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 6989710c8..19c4060d3 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -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); |