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

Merge branch 'master' of github.com:gnustep/libs-gui

Browse source
This commit is contained in:
Gregory Casamento 2023-09-01 15:51:20 +00:00
commit 983bc7d361
3 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,7 +1,13 @@
2023-08-30 Gregory John Casamento <greg.casamento@gmail.com>
* Source/GSXib5KeyedUnarchive.m: Fix for issue#192. Added code to
-decodeObjectForXib:forClassName:withID: to decode toolTip using
alternative format described in the issue.
2023-08-13 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSSwitch.m (-drawRect:): Correct drawing as suggested by
Austin Clow (dr_clow@me.com).
Austin Clow (dr_clow@me.com).
2023-02-12 Gregory John Casamento <greg.casamento@gmail.com>

36
Source/GSXib5KeyedUnarchiver.m
View file

@ -3169,6 +3169,31 @@ didStartElement: (NSString*)elementName
}
}
- (void) addToolTip: (GSXibElement *)element forObject: (id)object
{
NSString *toolTipString = [element attributeForKey: @"toolTip"];
// Process tooltips...
if (toolTipString == nil)
{
GSXibElement *toolTipElement = [element elementForKey: @"toolTip"];
toolTipString = [toolTipElement value];
}
if (toolTipString != nil)
{
if ([object respondsToSelector: @selector(setToolTip:)])
{
[object setToolTip: toolTipString];
}
else if ([object respondsToSelector: @selector(setHeaderToolTip:)])
{
[object setHeaderToolTip: toolTipString];
}
}
}
- (id) decodeObjectForXib: (GSXibElement*)element
forClassName: (NSString*)classname
withID: (NSString*)objID
@ -3177,15 +3202,8 @@ didStartElement: (NSString*)elementName
id object = [super decodeObjectForXib: element forClassName: classname withID: objID];
[self addOrderedObject: element];
// Process tooltips...
if ([element attributeForKey: @"toolTip"])
{
if ([object respondsToSelector: @selector(setToolTip:)])
[object setToolTip: [element attributeForKey: @"toolTip"]];
else if ([object respondsToSelector: @selector(setHeaderToolTip:)])
[object setHeaderToolTip: [element attributeForKey: @"toolTip"]];
}
[self addToolTip: element forObject: object];
// Process IB runtime attributes for element...
// Ensure we don't process the placeholders...
if ([element elementForKey: @"userDefinedRuntimeAttributes"] &&

4
Source/NSView.m
View file

@ -5231,6 +5231,10 @@ static NSView* findByTag(NSView *view, NSInteger aTag, NSUInteger *level)
return 0;
}
- (void) awakeFromNib
{
}
@end
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)