mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 19:10:48 +00:00
avoid calls to non-standard method
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@32461 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
de705cc3db
commit
82471b45fc
5 changed files with 21 additions and 5 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2011-03-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||||
|
|
||||||
|
* Source/NSHelpManager.m:
|
||||||
|
* Source/GSServicesManager.m:
|
||||||
|
* Source/NSBundleAdditions.m:
|
||||||
|
* Source/NSSpellChecker.m:
|
||||||
|
Avoid calls to non-standard method.
|
||||||
|
|
||||||
2011-03-05 Fred Kiefer <FredKiefer@gmx.de>
|
2011-03-05 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
* Source/GSNibLoading.m (NSCustomView): Correct implementation of
|
* Source/GSNibLoading.m (NSCustomView): Correct implementation of
|
||||||
|
|
|
@ -927,7 +927,8 @@ static NSString *disabledName = @".GNUstepDisabled";
|
||||||
if (_allServices == nil)
|
if (_allServices == nil)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
newLang = AUTORELEASE([[NSUserDefaults userLanguages] mutableCopy]);
|
newLang = [[[[NSUserDefaults standardUserDefaults]
|
||||||
|
stringArrayForKey: @"NSLanguages"] mutableCopy] autorelease];
|
||||||
if (newLang == nil)
|
if (newLang == nil)
|
||||||
{
|
{
|
||||||
newLang = [NSMutableArray arrayWithCapacity: 1];
|
newLang = [NSMutableArray arrayWithCapacity: 1];
|
||||||
|
|
|
@ -282,12 +282,15 @@
|
||||||
- (NSString *) pathForNibResource: (NSString *)fileName
|
- (NSString *) pathForNibResource: (NSString *)fileName
|
||||||
{
|
{
|
||||||
NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8];
|
NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8];
|
||||||
NSArray *languages = [NSUserDefaults userLanguages];
|
NSArray *languages;
|
||||||
NSString *rootPath = [self bundlePath];
|
NSString *rootPath = [self bundlePath];
|
||||||
NSString *primary;
|
NSString *primary;
|
||||||
NSString *language;
|
NSString *language;
|
||||||
NSEnumerator *enumerator;
|
NSEnumerator *enumerator;
|
||||||
|
|
||||||
|
languages = [[NSUserDefaults standardUserDefaults]
|
||||||
|
stringArrayForKey: @"NSLanguages"];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Build an array of resource paths that differs from the normal order -
|
* Build an array of resource paths that differs from the normal order -
|
||||||
* we want a localized file in preference to a generic one.
|
* we want a localized file in preference to a generic one.
|
||||||
|
|
|
@ -57,12 +57,14 @@
|
||||||
{
|
{
|
||||||
NSFileManager *fm = [NSFileManager defaultManager];
|
NSFileManager *fm = [NSFileManager defaultManager];
|
||||||
NSMutableArray *array = [NSMutableArray array];
|
NSMutableArray *array = [NSMutableArray array];
|
||||||
NSArray *languages = [NSUserDefaults userLanguages];
|
NSArray *languages;
|
||||||
NSString *rootPath = [self bundlePath];
|
NSString *rootPath = [self bundlePath];
|
||||||
NSString *primary;
|
NSString *primary;
|
||||||
NSString *language;
|
NSString *language;
|
||||||
NSEnumerator *enumerator;
|
NSEnumerator *enumerator;
|
||||||
|
|
||||||
|
languages = [[NSUserDefaults standardUserDefaults]
|
||||||
|
stringArrayForKey: @"NSLanguages"];
|
||||||
primary = [rootPath stringByAppendingPathComponent: @"Resources"];
|
primary = [rootPath stringByAppendingPathComponent: @"Resources"];
|
||||||
|
|
||||||
enumerator = [languages objectEnumerator];
|
enumerator = [languages objectEnumerator];
|
||||||
|
|
|
@ -264,14 +264,16 @@ static int __documentTag = 0;
|
||||||
//
|
//
|
||||||
- init
|
- init
|
||||||
{
|
{
|
||||||
NSArray *userLanguages = [NSUserDefaults userLanguages];
|
NSArray *languages;
|
||||||
|
|
||||||
self = [super init];
|
self = [super init];
|
||||||
if (self == nil)
|
if (self == nil)
|
||||||
return nil;
|
return nil;
|
||||||
|
|
||||||
|
languages = [[NSUserDefaults standardUserDefaults]
|
||||||
|
stringArrayForKey: @"NSLanguages"];
|
||||||
// Set the language to the default for the user.
|
// Set the language to the default for the user.
|
||||||
_language = [userLanguages objectAtIndex: 0];
|
_language = [languages objectAtIndex: 0];
|
||||||
_wrapFlag = NO;
|
_wrapFlag = NO;
|
||||||
_position = 0;
|
_position = 0;
|
||||||
_spellPanel = nil;
|
_spellPanel = nil;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue