gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix segmented control/cell loading for labels/images

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40378 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2017-03-10 18:14:37 +00:00
parent de5ca5d2fb
commit 5853fa821a
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Source/GSXib5KeyedUnarchiver.m
View file

@ -325,6 +325,8 @@ static NSArray *XmlConnectionRecordTags = nil;
@"tabStops" : @"NSMutableArray",
@"userDefinedRuntimeAttributes" : @"NSMutableArray",
@"resources" : @"NSMutableArray",
@"segments" : @"NSMutableArray",
@"segment" : @"NSSegmentItem",
@"customObject" : @"NSCustomObject5",
@"userDefinedRuntimeAttribute" : @"IBUserDefinedRuntimeAttribute5",
//@"outlet" : @"IBOutletConnection5",
@ -389,7 +391,10 @@ static NSArray *XmlConnectionRecordTags = nil;
@"NSInsertionColor" : @"insertionPointColor",
@"NSIsVertical" : @"vertical",
@"NSSelectedTabViewItem" : @"initialItem",
@"NSControlAllowsExpansionToolTips" : @"allowsExpansionToolTips" };
@"NSControlAllowsExpansionToolTips" : @"allowsExpansionToolTips",
@"NSSegmentImages" : @"segments",
@"NSSegmentItemLabel" : @"label",
@"NSSegmentItemImage" : @"image" };
RETAIN(XmlKeyMapTable);
// These define keys that are alwasy "CONTAINED" since they typically are a combination of key values
@ -491,7 +496,8 @@ static NSArray *XmlConnectionRecordTags = nil;
@"NSWhite" : @"decodeColorWhiteForElement:",
@"NSRGB" : @"decodeColorRGBForElement:",
@"NSColorSpace" : @"decodeColorSpaceForElement:",
@"NSCYMK" : @"decodeColorCYMKForElement:" };
@"NSCYMK" : @"decodeColorCYMKForElement:",
@"NSSegmentItemImage" : @"decodeSegmentItemImageForElement:"};
RETAIN(XmlKeyToDecoderSelectorMap);
}
}
@ -2479,6 +2485,22 @@ didStartElement: (NSString*)elementName
return object;
}
#pragma mark - NSegmentedControl/NSSegmentedCell...
- (id) decodeSegmentItemImageForElement: (GSXib5Element*)element
{
id object = nil;
if ([element attributeForKey: @"image"])
{
object = [NSImage imageNamed: [element attributeForKey: @"image"]];
}
#if defined(DEBUG_XIB5)
NSWarnMLog(@"object: %@", object);
#endif
return object;
}
#pragma mark - NSButton...
- (id) decodeButtonFlags1ForElement: (GSXib5Element*)element
{