* 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
This commit is contained in:
gcasa 2012-10-19 03:20:44 +00:00
parent 89deb27503
commit 02de53bc18
2 changed files with 11 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2012-10-18 23:19-EDT Gregory John Casamento <greg.casamento@gmail.com>
* 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 <greg.casamento@gmail.com> 2012-10-17 08:15-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/GSThemeDrawing.m: Changes per discussion with Fred. * Source/GSThemeDrawing.m: Changes per discussion with Fred.

View file

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