fixup for consistency with X11 backend

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@28978 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-11-09 09:34:09 +00:00
parent ca51d23b97
commit 5286906961

View file

@ -247,48 +247,50 @@ NSLog(@"Callback");
self = [super initWithAttributes: info];
if(self)
{
[self _initWin32Context];
[super initWithAttributes: info];
if (self)
{
[self _initWin32Context];
[super initWithAttributes: info];
[self setupRunLoopInputSourcesForMode: NSDefaultRunLoopMode];
[self setupRunLoopInputSourcesForMode: NSConnectionReplyMode];
[self setupRunLoopInputSourcesForMode: NSModalPanelRunLoopMode];
[self setupRunLoopInputSourcesForMode: NSEventTrackingRunLoopMode];
[self setupRunLoopInputSourcesForMode: NSDefaultRunLoopMode];
[self setupRunLoopInputSourcesForMode: NSConnectionReplyMode];
[self setupRunLoopInputSourcesForMode: NSModalPanelRunLoopMode];
[self setupRunLoopInputSourcesForMode: NSEventTrackingRunLoopMode];
[self setHandlesWindowDecorations: NO];
[self setUsesNativeTaskbar: YES];
[self setHandlesWindowDecorations: YES];
[self setUsesNativeTaskbar: YES];
{ // Check user defaults
NSUserDefaults *defs;
defs = [NSUserDefaults standardUserDefaults];
if ([defs objectForKey: @"GSUseWMStyles"])
{
NSWarnLog(@"Usage of 'GSUseWMStyles' as user default option is deprecated. "
@"This option will be ignored in future versions. "
@"You should use 'GSBackHandlesWindowDecorations' option.");
[self setHandlesWindowDecorations: ![defs boolForKey: @"GSUseWMStyles"]];
}
if ([defs objectForKey: @"GSUsesWMTaskbar"])
{
NSWarnLog(@"Usage of 'GSUseWMTaskbar' as user default option is deprecated. "
@"This option will be ignored in future versions. "
@"You should use 'GSBackUsesNativeTaskbar' option.");
[self setUsesNativeTaskbar: [defs boolForKey: @"GSUseWMTaskbar"]];
}
{ // Check user defaults
NSUserDefaults *defs;
defs = [NSUserDefaults standardUserDefaults];
if ([defs objectForKey: @"GSUseWMStyles"])
{
NSWarnLog(@"Usage of 'GSUseWMStyles' as user default option is deprecated. "
@"This option will be ignored in future versions. "
@"You should use 'GSBackHandlesWindowDecorations' option.");
[self setHandlesWindowDecorations: ![defs boolForKey: @"GSUseWMStyles"]];
}
if ([defs objectForKey: @"GSUsesWMTaskbar"])
{
NSWarnLog(@"Usage of 'GSUseWMTaskbar' as user default option is deprecated. "
@"This option will be ignored in future versions. "
@"You should use 'GSBackUsesNativeTaskbar' option.");
[self setUsesNativeTaskbar: [defs boolForKey: @"GSUseWMTaskbar"]];
}
if ([defs objectForKey: @"GSBackHandlesWindowDecorations"])
{
[self setHandlesWindowDecorations: [defs boolForKey: @"GSBackHandlesWindowDecorations"]];
}
if ([defs objectForKey: @"GSBackUsesNativeTaskbar"])
{
[self setUsesNativeTaskbar: [defs boolForKey: @"GSUseNativeTaskbar"]];
}
if ([defs objectForKey: @"GSBackHandlesWindowDecorations"])
{
[self setHandlesWindowDecorations:
[defs boolForKey: @"GSBackHandlesWindowDecorations"]];
}
if ([defs objectForKey: @"GSBackUsesNativeTaskbar"])
{
[self setUsesNativeTaskbar:
[defs boolForKey: @"GSUseNativeTaskbar"]];
}
}
}
}
return self;
}