From a09deaeee7ffee81e5cf119b5926fa84ee6cd6b4 Mon Sep 17 00:00:00 2001 From: gcasa Date: Sun, 28 Sep 2003 23:25:16 +0000 Subject: [PATCH] Adding fix for report #5205. Services and Windows menus now should behave correctly. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17741 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/GSNibTemplates.m | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/ChangeLog b/ChangeLog index ea97c4880..32bb63c7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-27 19:29 Gregory John Casamento + + * Source/GSNibContainer.m: [GSNibContainer awakeWithContext:] + Added code to set the services and windows menus as designated in + Gorm. Addresses Report #5205 + 2003-09-27 David Ayers * Source/NSCell.m (-compare:): Compare the stringValue of diff --git a/Source/GSNibTemplates.m b/Source/GSNibTemplates.m index b1b56958f..689834436 100644 --- a/Source/GSNibTemplates.m +++ b/Source/GSNibTemplates.m @@ -136,6 +136,26 @@ static const int currentVersion = 1; // GSNibItem version number... [NSApp setMainMenu: menu]; } + /* + * Set the Services menu. + * Report #5205, Services/Window menu does not behave correctly. + */ + menu = [nameTable objectForKey: @"NSServicesMenu"]; + if (menu != nil && [menu isKindOfClass: [NSMenu class]] == YES) + { + [NSApp setServicesMenu: menu]; + } + + /* + * Set the Services menu. + * Report #5205, Services/Window menu does not behave correctly. + */ + menu = [nameTable objectForKey: @"NSWindowsMenu"]; + if (menu != nil && [menu isKindOfClass: [NSMenu class]] == YES) + { + [NSApp setWindowsMenu: menu]; + } + /* * Now tell all the objects that they have been loaded from * a nib.