From 02de53bc180388d2ee9f435faea68ff513994276 Mon Sep 17 00:00:00 2001 From: gcasa Date: Fri, 19 Oct 2012 03:20:44 +0000 Subject: [PATCH] * Source/NSButtonCell.m: Correct issues when decoding a .gorm file with key equivalent. Make sure that the image is properly set. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35717 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSButtonCell.m | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1b747cc6..1b6b15a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-18 23:19-EDT Gregory John Casamento + + * Source/NSButtonCell.m: Correct issues when decoding a .gorm + file with key equivalent. Make sure that the image is properly + set. + 2012-10-17 08:15-EDT Gregory John Casamento * Source/GSThemeDrawing.m: Changes per discussion with Fred. diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index 4f44d15a5..66c0a7428 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -1916,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];