Ken Thomases : winemac: Don' t accidentally clear Cocoa window style mask bits.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bdcb8138fe5549071eb3339ced67180b00bafb5f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bdcb8138fe5549071eb3339ced67180b00bafb5f

Author: Ken Thomases <ken at codeweavers.com>
Date:   Tue Oct  8 02:21:27 2013 -0500

winemac: Don't accidentally clear Cocoa window style mask bits.

---

 dlls/winemac.drv/cocoa_window.m |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index ede86d5..9b3fa9d 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -569,8 +569,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
 
     - (void) setWindowFeatures:(const struct macdrv_window_features*)wf
     {
+        static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask |
+                                             NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask;
         NSUInteger currentStyle = [self styleMask];
-        NSUInteger newStyle = style_mask_for_features(wf);
+        NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles);
 
         if (newStyle != currentStyle)
         {