mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 10:01:14 +00:00
Merge branch 'master' of github.com:gnustep/libs-gui into NSGridView_NSStackView_branch
This commit is contained in:
commit
c561e4f2d5
4 changed files with 14 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2021-03-12 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSMenu.m (-_setOwnedByPopUp:): Only update the menu if
|
||||
there is a new popup.
|
||||
|
||||
2021-02-21 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSPasteboard.m (-_pasteboardWithTarget:name:): Correct
|
||||
|
|
|
@ -106,8 +106,10 @@ enum {
|
|||
@interface NSWorkspace (NSWorkspaceRunningApplications)
|
||||
#if GS_HAS_DECLARED_PROPERTIES
|
||||
@property (readonly, copy) NSArray *runningApplications;
|
||||
@property (readonly, retain) NSRunningApplication *frontmostApplication;
|
||||
#else
|
||||
- (NSArray *)runningApplications;
|
||||
- (NSRunningApplication *)frontmostApplication;
|
||||
#endif
|
||||
@end
|
||||
|
||||
|
|
|
@ -1257,7 +1257,7 @@ static BOOL menuBarVisible = YES;
|
|||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
NSLog(@"Error Occurred While Updating Menu %@: %@", [self title], localException);
|
||||
NSLog(@"Error occurred While Updating Menu %@: %@", [self title], localException);
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
// Reenable displaying of menus
|
||||
|
@ -2350,9 +2350,9 @@ static BOOL menuBarVisible = YES;
|
|||
{
|
||||
[_aWindow setLevel: NSPopUpMenuWindowLevel];
|
||||
[_bWindow setLevel: NSPopUpMenuWindowLevel];
|
||||
[self update];
|
||||
}
|
||||
}
|
||||
[self update];
|
||||
}
|
||||
|
||||
- (NSString*) description
|
||||
|
|
|
@ -155,4 +155,9 @@
|
|||
{
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSRunningApplication *)frontmostApplication
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
@end
|
||||
|
|
Loading…
Reference in a new issue