Merge from revision 35723 from main branch plus NSCell allowsUndo flag extract from xib

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@35724 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-10-19 22:51:20 +00:00
parent b155bbdc2d
commit 36e77b95f7
40 changed files with 828 additions and 459 deletions

View file

@ -629,6 +629,8 @@ typedef struct _GSButtonCellFlags
*/
- (void) setKeyEquivalent: (NSString*)key
{
[[GSTheme theme] setKeyEquivalent: key
forButtonCell: self];
ASSIGNCOPY(_keyEquivalent, key);
}
@ -1914,8 +1916,11 @@ typedef struct _GSButtonCellFlags
{
BOOL tmp;
int version = [aDecoder versionForClassName: @"NSButtonCell"];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent];
NSString *key = nil;
[aDecoder decodeValueOfObjCType: @encode(id) at: &key];
[self setKeyEquivalent: key]; // Set the key equivalent...
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalentFont];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_altContents];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_altImage];