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:
Richard Frith-MacDonald 2011-03-05 16:18:04 +00:00
parent 1e34733d4a
commit 2a5554ea97
5 changed files with 21 additions and 5 deletions

View file

@ -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>
* Source/GSNibLoading.m (NSCustomView): Correct implementation of

View file

@ -927,7 +927,8 @@ static NSString *disabledName = @".GNUstepDisabled";
if (_allServices == nil)
return;
newLang = AUTORELEASE([[NSUserDefaults userLanguages] mutableCopy]);
newLang = [[[[NSUserDefaults standardUserDefaults]
stringArrayForKey: @"NSLanguages"] mutableCopy] autorelease];
if (newLang == nil)
{
newLang = [NSMutableArray arrayWithCapacity: 1];

View file

@ -282,12 +282,15 @@
- (NSString *) pathForNibResource: (NSString *)fileName
{
NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8];
NSArray *languages = [NSUserDefaults userLanguages];
NSArray *languages;
NSString *rootPath = [self bundlePath];
NSString *primary;
NSString *language;
NSEnumerator *enumerator;
languages = [[NSUserDefaults standardUserDefaults]
stringArrayForKey: @"NSLanguages"];
/*
* Build an array of resource paths that differs from the normal order -
* we want a localized file in preference to a generic one.

View file

@ -57,12 +57,14 @@
{
NSFileManager *fm = [NSFileManager defaultManager];
NSMutableArray *array = [NSMutableArray array];
NSArray *languages = [NSUserDefaults userLanguages];
NSArray *languages;
NSString *rootPath = [self bundlePath];
NSString *primary;
NSString *language;
NSEnumerator *enumerator;
languages = [[NSUserDefaults standardUserDefaults]
stringArrayForKey: @"NSLanguages"];
primary = [rootPath stringByAppendingPathComponent: @"Resources"];
enumerator = [languages objectEnumerator];

View file

@ -264,14 +264,16 @@ static int __documentTag = 0;
//
- init
{
NSArray *userLanguages = [NSUserDefaults userLanguages];
NSArray *languages;
self = [super init];
if (self == nil)
return nil;
languages = [[NSUserDefaults standardUserDefaults]
stringArrayForKey: @"NSLanguages"];
// Set the language to the default for the user.
_language = [userLanguages objectAtIndex: 0];
_language = [languages objectAtIndex: 0];
_wrapFlag = NO;
_position = 0;
_spellPanel = nil;