Removed windowsLock variable from NSWindow

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17771 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Benhur Stein 2003-10-03 14:00:28 +00:00
parent f3785d2cea
commit 681ef962f9
2 changed files with 6 additions and 13 deletions

View file

@ -1,3 +1,9 @@
2003-10-03 Benhur Stein <benhur@inf.ufsm.br>
* Source/NSWindow.m (class variables, +initialize,
+removeFrameUsingName:, -dealloc, -saveFrameUsingName:,
-setFrameAutosaveName:): removed variable windowsLock
2003-10-02 David Ayers <d.ayers@inode.at>
* Source/NSBrowser.m (-[NSBrowser setDelegate]):

View file

@ -499,7 +499,6 @@ static IMP ctImp;
static Class responderClass;
static Class viewClass;
static NSMutableSet *autosaveNames;
static NSRecursiveLock *windowsLock;
static NSMapTable* windowmaps = NULL;
static NSNotificationCenter *nc = nil;
@ -519,7 +518,6 @@ static NSNotificationCenter *nc = nil;
responderClass = [NSResponder class];
viewClass = [NSView class];
autosaveNames = [NSMutableSet new];
windowsLock = [NSRecursiveLock new];
nc = [NSNotificationCenter defaultCenter];
}
}
@ -531,9 +529,7 @@ static NSNotificationCenter *nc = nil;
NSString *key;
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
[windowsLock lock];
[[NSUserDefaults standardUserDefaults] removeObjectForKey: key];
[windowsLock unlock];
}
}
@ -650,13 +646,11 @@ many times.
argument: nil];
[NSApp removeWindowsItem: self];
[windowsLock lock];
if (_autosaveName != nil)
{
[autosaveNames removeObject: _autosaveName];
_autosaveName = nil;
}
[windowsLock unlock];
if (_counterpart != 0 && (_styleMask & NSMiniWindowMask) == 0)
{
@ -3508,12 +3502,10 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
NSString *key;
id obj;
[windowsLock lock];
defs = [NSUserDefaults standardUserDefaults];
obj = [self stringWithSavedFrame];
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
[defs setObject: obj forKey: key];
[windowsLock unlock];
}
- (BOOL) setFrameAutosaveName: (NSString*)name
@ -3525,10 +3517,8 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
return YES; /* That's our name already. */
}
[windowsLock lock];
if ([autosaveNames member: name] != nil)
{
[windowsLock unlock];
return NO; /* Name in use elsewhere. */
}
if (_autosaveName != nil)
@ -3560,7 +3550,6 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
[defs removeObjectForKey: key];
RELEASE(nameToRemove);
}
[windowsLock unlock];
return YES;
}
@ -3678,11 +3667,9 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
id obj;
NSString *key;
[windowsLock lock];
defs = [NSUserDefaults standardUserDefaults];
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
obj = [defs objectForKey: key];
[windowsLock unlock];
if (obj == nil)
return NO;
[self setFrameFromString: obj];