gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct values for the decoded action mask, as they changed on

Browse source 
2007-08-03.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25419 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-08-28 17:52:18 +00:00
parent b6a8d2b7e3
commit 3406816ab5
2 changed files with 122 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-28 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSCell.m (#initialize): Increase version number.
* Source/NSCell.m (-initWithCoder:): Correct values for the
decoded action mask, as they changed on 2007-08-03.
Fixes bug #20884.
2007-08-24 22:33-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSButtonCell.m: Added code in encodeWithCoder: to allow

138
Source/NSCell.m
View file

@ -100,7 +100,7 @@ static NSColor *shadowCol;
{
if (self == [NSCell class])
{
[self setVersion: 2];
[self setVersion: 3];
colorClass = [NSColor class];
cellClass = [NSCell class];
fontClass = [NSFont class];
@ -2617,6 +2617,98 @@ static NSColor *shadowCol;
[aDecoder decodeValueOfObjCType: @encode(unsigned int)
at: &_mouse_down_flags];
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &_action_mask];
if (version < 3)
{
unsigned int mask = 0;
// Convert old GNUstep mask value to Cocoa values
if ((_action_mask & 0x1) == 0x1)
{
mask |= NSLeftMouseDownMask;
}
if ((_action_mask & 0x2) == 0x2)
{
mask |= NSLeftMouseUpMask;
}
if ((_action_mask & 0x4) == 0x4)
{
mask |= NSOtherMouseDownMask;
}
if ((_action_mask & 0x8) == 0x8)
{
mask |= NSOtherMouseUpMask;
}
if ((_action_mask & 0x10) == 0x10)
{
mask |= NSRightMouseDownMask;
}
if ((_action_mask & 0x20) == 0x20)
{
mask |= NSRightMouseUpMask;
}
if ((_action_mask & 0x40) == 0x40)
{
mask |= NSMouseMovedMask;
}
if ((_action_mask & 0x80) == 0x80)
{
mask |= NSLeftMouseDraggedMask;
}
if ((_action_mask & 0x100) == 0x100)
{
mask |= NSOtherMouseDraggedMask;
}
if ((_action_mask & 0x200) == 0x200)
{
mask |= NSRightMouseDraggedMask;
}
if ((_action_mask & 0x400) == 0x400)
{
mask |= NSMouseEnteredMask;
}
if ((_action_mask & 0x800) == 0x800)
{
mask |= NSMouseExitedMask;
}
if ((_action_mask & 0x1000) == 0x1000)
{
mask |= NSKeyDownMask;
}
if ((_action_mask & 0x2000) == 0x2000)
{
mask |= NSKeyUpMask;
}
if ((_action_mask & 0x4000) == 0x4000)
{
mask |= NSFlagsChangedMask;
}
if ((_action_mask & 0x8000) == 0x8000)
{
mask |= NSAppKitDefinedMask;
}
if ((_action_mask & 0x10000) == 0x10000)
{
mask |= NSSystemDefinedMask;
}
if ((_action_mask & 0x20000) == 0x20000)
{
mask |= NSApplicationDefinedMask;
}
if ((_action_mask & 0x40000) == 0x40000)
{
mask |= NSPeriodicMask;
}
if ((_action_mask & 0x80000) == 0x80000)
{
mask |= NSCursorUpdateMask;
}
if ((_action_mask & 0x100000) == 0x100000)
{
mask |= NSScrollWheelMask;
}
_action_mask = mask;
}
_action_mask = NSLeftMouseUpMask;
[aDecoder decodeValueOfObjCType: @encode(id) at: &formatter];
[self setFormatter: formatter];
[aDecoder decodeValueOfObjCType: @encode(id) at: &menu];
@ -2625,32 +2717,32 @@ static NSColor *shadowCol;
if (_formatter != nil)
{
NSString *contents;
NSString *contents;
contents = [_formatter stringForObjectValue: _object_value];
if (contents != nil)
{
_cell.has_valid_object_value = YES;
ASSIGN (_contents, contents);
_cell.contents_is_attributed_string = NO;
}
}
contents = [_formatter stringForObjectValue: _object_value];
if (contents != nil)
{
_cell.has_valid_object_value = YES;
ASSIGN (_contents, contents);
_cell.contents_is_attributed_string = NO;
}
}
if (version >= 2)
{
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.allows_undo = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.line_break_mode = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.control_tint = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.control_size = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.focus_ring_type = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.base_writing_direction = tmp_int;
}
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.allows_undo = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.line_break_mode = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.control_tint = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.control_size = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.focus_ring_type = tmp_int;
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.base_writing_direction = tmp_int;
}
}
return self;
}