Merge branch 'master' of github.com:gnustep/libs-gui into NSGridView_NSStackView_branch

This commit is contained in:
Gregory John Casamento 2021-02-14 14:00:47 -05:00
commit d97ab132ac
2 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2021-02-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSSearchFieldCell.m: Correct encoding/decoding that was
broken in last commit of this file.
2021-02-05 Fred Kiefer <FredKiefer@gmx.de>
* Resources/Italian.lproj/Localizable.strings,

View file

@ -495,14 +495,14 @@
}
else
{
NSInteger max = [self maximumRecents];
NSUInteger max = [self maximumRecents];
[aCoder encodeObject: _search_button_cell];
[aCoder encodeObject: _cancel_button_cell];
[aCoder encodeObject: _recents_autosave_name];
[aCoder encodeValueOfObjCType: @encode(BOOL)
at: &_sends_whole_search_string];
encode_NSInteger(aCoder, &max);
encode_NSUInteger(aCoder, &max);
}
}
@ -522,13 +522,13 @@
}
else
{
NSInteger max;
NSUInteger max;
[self setSearchButtonCell: [aDecoder decodeObject]];
[self setCancelButtonCell: [aDecoder decodeObject]];
[self setRecentsAutosaveName: [aDecoder decodeObject]];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_sends_whole_search_string];
decode_NSInteger(aDecoder, &max);
decode_NSUInteger(aDecoder, &max);
[self setMaximumRecents: max];
}