Merge pull request #310 from gnustep/fix-nsnumberformatter-api

Change NSNumberFormatter minimum/maximum properties type
This commit is contained in:
rfm 2023-08-18 11:19:47 +01:00 committed by GitHub
commit 446d168cd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions

View file

@ -1,3 +1,10 @@
2023-08-10 Frederik Seiffert <frederik@algoriddim.com>
* Headers/Foundation/NSNumberFormatter.h:
* Source/NSNumberFormatter.m:
Change NSNumberFormatter minimum/maximum properties from
NSDecimalNumber to NSNumber to match Apple platforms.
2023-07-30 Yavor Doganov <yavor@gnu.org>
* Tools/HTMLLinker.1: Fix a groff warning.

View file

@ -129,8 +129,8 @@ GS_EXPORT_CLASS
unichar _thousandSeparator;
unichar _decimalSeparator;
NSDecimalNumberHandler *_roundingBehavior;
NSDecimalNumber *_maximum;
NSDecimalNumber *_minimum;
NSNumber *_maximum;
NSNumber *_minimum;
NSAttributedString *_attributedStringForNil;
NSAttributedString *_attributedStringForNotANumber;
NSAttributedString *_attributedStringForZero;
@ -337,25 +337,25 @@ GS_NSNumberFormatter_IVARS;
* Returns maximum value that will be accepted as valid in number parsing.
* Default is none.
*/
- (NSDecimalNumber*) maximum;
- (NSNumber*) maximum;
/**
* Sets maximum value that will be accepted as valid in number parsing.
* Default is none.
*/
- (void) setMaximum: (NSDecimalNumber*)aMaximum;
- (void) setMaximum: (NSNumber*)aMaximum;
/**
* Returns minimum value that will be accepted as valid in number parsing.
* Default is none.
*/
- (NSDecimalNumber*) minimum;
- (NSNumber*) minimum;
/**
* Sets minimum value that will be accepted as valid in number parsing.
* Default is none.
*/
- (void) setMinimum: (NSDecimalNumber*)aMinimum;
- (void) setMinimum: (NSNumber*)aMinimum;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
/** Sets the behavior of the formatter.<br />

View file

@ -900,12 +900,12 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
return _localizesFormat;
}
- (NSDecimalNumber*) maximum
- (NSNumber*) maximum
{
return _maximum;
}
- (NSDecimalNumber*) minimum
- (NSNumber*) minimum
{
return _minimum;
}
@ -1002,13 +1002,13 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
_localizesFormat = flag;
}
- (void) setMaximum: (NSDecimalNumber*)aMaximum
- (void) setMaximum: (NSNumber*)aMaximum
{
// FIXME: NSNumberFormatterBehavior10_4
ASSIGN(_maximum, aMaximum);
}
- (void) setMinimum: (NSDecimalNumber*)aMinimum
- (void) setMinimum: (NSNumber*)aMinimum
{
// FIXME: NSNumberFormatterBehavior10_4
ASSIGN(_minimum, aMinimum);