gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-03 17:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSSegmentedCell.m (-initWithCoder:): Protect against

Browse source 
selected segment being -1.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33306 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-06-14 22:51:28 +00:00
parent 5da6d52508
commit 66f70bb169
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-15 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSSegmentedCell.m (-initWithCoder:): Protect against
selected segment being -1.
2011-06-14 Eric Wasylishen <ewasylishen@gmail.com> 2011-06-14 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSImage.m: Implement -bestRepresentationForRect:context:hints:, * Source/NSImage.m: Implement -bestRepresentationForRect:context:hints:,

11
Source/NSSegmentedCell.m
View file

@ -49,8 +49,6 @@
NSRect _frame; NSRect _frame;
} }
- (BOOL) isSelected;
- (void) setSelected: (BOOL)flag;
- (BOOL) isSelected; - (BOOL) isSelected;
- (void) setSelected: (BOOL)flag; - (void) setSelected: (BOOL)flag;
- (NSMenu *) menu; - (NSMenu *) menu;
@ -643,6 +641,7 @@
NSUInteger i; NSUInteger i;
_selected_segment = -1; _selected_segment = -1;
_segmentCellFlags._tracking_mode = NSSegmentSwitchTrackingSelectOne;
if ([aDecoder containsValueForKey: @"NSSegmentImages"]) if ([aDecoder containsValueForKey: @"NSSegmentImages"])
ASSIGN(_items, [aDecoder decodeObjectForKey: @"NSSegmentImages"]); ASSIGN(_items, [aDecoder decodeObjectForKey: @"NSSegmentImages"]);
else else
@ -655,13 +654,19 @@
} }
if ([aDecoder containsValueForKey: @"NSSelectedSegment"]) if ([aDecoder containsValueForKey: @"NSSelectedSegment"])
[self setSelectedSegment: [aDecoder decodeIntForKey: @"NSSelectedSegment"]]; {
_selected_segment = [aDecoder decodeIntForKey: @"NSSelectedSegment"];
if (_selected_segment != -1)
[self setSelectedSegment: _selected_segment];
}
_segmentCellFlags._style = [aDecoder decodeIntForKey: @"NSSegmentStyle"]; _segmentCellFlags._style = [aDecoder decodeIntForKey: @"NSSegmentStyle"];
} }
else else
{ {
int style; int style;
_segmentCellFlags._tracking_mode = NSSegmentSwitchTrackingSelectOne;
ASSIGN(_items,[aDecoder decodeObject]); ASSIGN(_items,[aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(int) at: &_selected_segment]; [aDecoder decodeValueOfObjCType: @encode(int) at: &_selected_segment];
if (_selected_segment != -1) if (_selected_segment != -1)