mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 19:40:38 +00:00
* Source/GSXibLoader.m:
Added NSMenu (XibCompatibility) category with method: _isMainMenu Added NSMenu (XibCompatibility) category implementation. Modified setting main menu in awake:inContainer:withContext: Fixes bug #36427 Committed by: gcasa git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35159 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d8a7f5aafe
commit
6cc61f7173
3 changed files with 28 additions and 4 deletions
|
@ -48,6 +48,10 @@
|
|||
- (void) _setMainMenu: (NSMenu*)aMenu;
|
||||
@end
|
||||
|
||||
@interface NSMenu (XibCompatibility)
|
||||
- (BOOL) _isMainMenu;
|
||||
@end
|
||||
|
||||
@interface NSCustomObject (NibCompatibility)
|
||||
- (void) setRealObject: (id)obj;
|
||||
@end
|
||||
|
@ -56,6 +60,17 @@
|
|||
- (id) nibInstantiate;
|
||||
@end
|
||||
|
||||
@implementation NSMenu (XibCompatibility)
|
||||
|
||||
- (BOOL) _isMainMenu
|
||||
{
|
||||
if (_name)
|
||||
return [_name isEqualToString:@"_NSMainMenu"];
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation FirstResponder
|
||||
|
||||
+ (id) allocWithZone: (NSZone*)zone
|
||||
|
@ -835,7 +850,8 @@
|
|||
RETAIN(obj);
|
||||
}
|
||||
|
||||
if ([obj isKindOfClass: [NSMenu class]])
|
||||
if (([obj isKindOfClass: [NSMenu class]]) &&
|
||||
([obj _isMainMenu]))
|
||||
{
|
||||
// add the menu...
|
||||
[NSApp _setMainMenu: obj];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue