diff --git a/ChangeLog b/ChangeLog index 9b40223ee..bb05427c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-19 Fred Kiefer + + * Source/NSMenu.m (-initWithCoder:): Use YES as default value for + AutoenablesItems. + 2010-01-18 Riccardo Mottola * Source/NSImage.m: _useFromFile: make extension checking case diff --git a/Source/NSMenu.m b/Source/NSMenu.m index d29fb634b..c21896683 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -612,7 +612,9 @@ static BOOL menuBarVisible = YES; { NSMenuView *menuRep; - [super init]; + self = [super init]; + if (!self) + return nil; // Keep the title. ASSIGN(_title, aTitle); @@ -1567,11 +1569,11 @@ static BOOL menuBarVisible = YES; // if ([aDecoder containsValueForKey: @"NSNoAutoenable"]) { - dAuto = ([aDecoder decodeBoolForKey: @"NSNoAutoenable"] == NO) ? YES : NO; + dAuto = ![aDecoder decodeBoolForKey: @"NSNoAutoenable"]; } else { - dAuto = NO; + dAuto = YES; } dTitle = [aDecoder decodeObjectForKey: @"NSTitle"]; dItems = [aDecoder decodeObjectForKey: @"NSMenuItems"];