From 9ed59b06a9ab3e33c25cf6bf7b2c1548a5cbdf90 Mon Sep 17 00:00:00 2001 From: ericwa Date: Wed, 26 Oct 2011 20:01:31 +0000 Subject: [PATCH] * Source/NSCell.m: Read/write NSLineBreakMode from the bits masked off by 0xE00 in NSCellFlags2. The previous location they were being read/written from was giving bogus values such as 7. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34073 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSCell.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13089f403..50224306d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-26 Eric Wasylishen + + * Source/NSCell.m: Read/write NSLineBreakMode from the bits masked off + by 0xE00 in NSCellFlags2. The previous location they were being + read/written from was giving bogus values such as 7. + 2011-10-25 Eric Wasylishen * Source/GSThemeDrawing.m: Draw a question mark centered in the bezel diff --git a/Source/NSCell.m b/Source/NSCell.m index d5c35add9..28740b209 100644 --- a/Source/NSCell.m +++ b/Source/NSCell.m @@ -2373,7 +2373,6 @@ static NSColor *dtxtCol; cFlags |= (_action_mask & NSLeftMouseUpMask) ? 0 : 0x20; cFlags |= [self wraps] ? 0x40 : 0; cFlags |= (_action_mask & NSLeftMouseDraggedMask) ? 0x100 : 0; - cFlags |= ([self lineBreakMode] << 12); cFlags |= (_action_mask & NSLeftMouseDownMask) ? 0x40000 : 0; cFlags |= [self isContinuous] ? 0x80000 : 0; cFlags |= [self isScrollable] ? 0x100000 : 0; @@ -2389,6 +2388,7 @@ static NSColor *dtxtCol; // flags part 2 cFlags2 |= ([self controlTint] << 5); + cFlags2 |= ([self lineBreakMode] << 9); cFlags2 |= ([self controlSize] << 17); cFlags2 |= [self sendsActionOnEndEditing] ? 0x400000 : 0; cFlags2 |= [self allowsMixedState] ? 0x1000000 : 0; @@ -2531,7 +2531,6 @@ static NSColor *dtxtCol; [self setWraps: ((cFlags & 0x40) != 0x40)]; if ((cFlags & 0x100) == 0x100) mask |= NSLeftMouseDraggedMask; - [self setLineBreakMode: ((cFlags & 0x7000) >> 12)]; if ((cFlags & 0x40000) == 0x40000) mask |= NSLeftMouseDownMask; if ((cFlags & 0x80000) == 0x80000) @@ -2554,6 +2553,7 @@ static NSColor *dtxtCol; cFlags2 = [aDecoder decodeIntForKey: @"NSCellFlags2"]; [self setControlTint: ((cFlags2 & 0xE0) >> 5)]; + [self setLineBreakMode: ((cFlags2 & 0xE00) >> 9)]; [self setControlSize: ((cFlags2 & 0xE0000) >> 17)]; [self setSendsActionOnEndEditing: ((cFlags2 & 0x400000) == 0x400000)]; [self setAllowsMixedState: ((cFlags2 & 0x1000000) == 0x1000000)];