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

Fixed NSComboBoxCell decoding bug

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19423 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Quentin Mathe 2004-05-29 16:35:08 +00:00
parent bf5a656159
commit 88f81b68b5
2 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-05-29 Quentin Mathe <qmathe@lub-internet.fr>
* Source/NSComboBoxCell.m: Fixed problems related to decoding an encoded
combo box previous version (Bug reported by Gregory Casamento).
2004-05-29 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/page_landscape.tiff: Removed the tags in the image

54
Source/NSComboBoxCell.m
View file

@ -106,6 +106,7 @@ static const BOOL ForceArrowIcon = NO;
- (GSComboWindow *) _popUp;
- (NSRect) _textCellFrame;
- (void) _setSelectedItem: (int)index;
- (void) _loadButtonCell;
@end
// ---
@ -719,7 +720,7 @@ numberOfRowsInColumn: (int)column
{
if (self == [NSComboBoxCell class])
{
[self setVersion: 1];
[NSComboBoxCell setVersion: 2];
nc = [NSNotificationCenter defaultCenter];
}
}
@ -740,24 +741,8 @@ numberOfRowsInColumn: (int)column
_intercellSpacing = NSMakeSize(3.0, 2.0);
_itemHeight = 16;
_selectedItem = -1;
if (!ForceArrowIcon)
{
_buttonCell = [[NSButtonCell alloc] initImageCell:
[NSImage imageNamed: @"common_ComboBoxEllipsis"]];
}
else
{
_buttonCell = [[NSButtonCell alloc] initImageCell:
[NSImage imageNamed: @"NSComboArrow"]];
}
[_buttonCell setImagePosition: NSImageOnly];
[_buttonCell setButtonType: NSMomentaryPushButton];
[_buttonCell setHighlightsBy: NSPushInCellMask];
[_buttonCell setBordered: YES];
[_buttonCell setTarget: self];
[_buttonCell setAction: @selector(_didClickWithinButton:)];
[self _loadButtonCell];
return self;
}
@ -1249,7 +1234,6 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
{
[super encodeWithCoder: coder];
[coder encodeValueOfObjCType: @encode(id) at: &_buttonCell];
[coder encodeValueOfObjCType: @encode(id) at: &_popUpList];
[coder encodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
[coder encodeValueOfObjCType: @encode(BOOL) at: &_hasVerticalScroller];
@ -1289,9 +1273,12 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
else
{
BOOL dummy;
id previouslyEncodedButton;
if ([aDecoder versionForClassName: @"NSComboBoxCell"] < 2)
[aDecoder decodeValueOfObjCType: @encode(id) at: &previouslyEncodedButton];
// In previous version we decode _buttonCell, we just discard the decoded value here
[aDecoder decodeValueOfObjCType: @encode(id) at: &_buttonCell];
RETAIN(_buttonCell);
[aDecoder decodeValueOfObjCType: @encode(id) at: &_popUpList];
RETAIN(_popUpList);
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
@ -1306,6 +1293,8 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
if (_usesDataSource == YES)
[self setDataSource: [aDecoder decodeObject]];
}
[self _loadButtonCell];
return self;
}
@ -1513,4 +1502,25 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
_selectedItem = index;
}
- (void) _loadButtonCell
{
if (!ForceArrowIcon)
{
_buttonCell = [[NSButtonCell alloc] initImageCell:
[NSImage imageNamed: @"NSComboBoxEllipsis"]];
}
else
{
_buttonCell = [[NSButtonCell alloc] initImageCell:
[NSImage imageNamed: @"NSComboArrow"]];
}
[_buttonCell setImagePosition: NSImageOnly];
[_buttonCell setButtonType: NSMomentaryPushButton];
[_buttonCell setHighlightsBy: NSPushInCellMask];
[_buttonCell setBordered: YES];
[_buttonCell setTarget: self];
[_buttonCell setAction: @selector(_didClickWithinButton:)];
}
@end