From 1b1a55d80b54e86b42a6546d1fce5ddd191c31b3 Mon Sep 17 00:00:00 2001 From: gcasa Date: Sat, 5 Aug 2006 13:08:53 +0000 Subject: [PATCH] Encode item and title of menu, so that it will show in the nib. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23206 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSMenu.m | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4598444ee..621669d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-05 09:08-EDT Gregory John Casamento + + * Source/NSMenu.m: encodeWithCoder: encode items and title of + menu. + 2006-08-05 08:43-EDT Gregory John Casamento * Headers/Additions/GNUstepGUI/GSNibCompatibility.h diff --git a/Source/NSMenu.m b/Source/NSMenu.m index e877851fd..0cb8c2389 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -1213,9 +1213,17 @@ static NSNotificationCenter *nc; */ - (void) encodeWithCoder: (NSCoder*)encoder { - [encoder encodeObject: _title]; - [encoder encodeObject: _items]; - [encoder encodeValueOfObjCType: @encode(BOOL) at: &_autoenable]; + if([encoder allowsKeyedCoding]) + { + [encoder encodeObject: _title forKey: @"NSTitle"]; + [encoder encodeObject: _items forKey: @"NSMenuItems"]; + } + else + { + [encoder encodeObject: _title]; + [encoder encodeObject: _items]; + [encoder encodeValueOfObjCType: @encode(BOOL) at: &_autoenable]; + } } - (id) initWithCoder: (NSCoder*)aDecoder