gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 00:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge original in-window menu branch.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33924 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-10-01 11:17:16 +00:00
parent 92b44ffa68
commit 0de761d88e
4 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Source/GSThemeMenu.m
View file

@ -61,52 +61,29 @@
forWindow: (NSWindow *)window
{
GSWindowDecorationView *wv = [window windowView];
if ([window menu] == nil && menu != nil)
{
// NSData *data = [NSArchiver archivedDataWithRootObject: menu]; //
NSMenu *newMenu = [menu copy];
NSMenuView *menuView = nil;
/*
* Set the new menu
*/
[window _setMenu: newMenu];
// protect against stupid calls from updateAllWindowsWithMenu:
if ([window menu] == menu)
return;
/*
* And transfer the new menu representation to the window decoration view.
*/
menuView = [newMenu menuRepresentation];
if (menuView != nil)
{
[menu close];
[menuView setHorizontal: YES];
[wv addMenuView: menuView];
[menuView sizeToFit];
}
}
else
{
/* We copy "Windows" menu, since this can't be updated
* with calling -update:. However, with this way if the
* menus have a different name this will not work (for
* example "Window" instead "Windows"). So the programmer
* must be careful here.
*/
NSMenuItem *windowsItem, *oldWindowsItem;
NSMenu *newWindowsMenu;
windowsItem = [menu itemWithTitle: _(@"Windows")];
if (windowsItem != nil && [windowsItem hasSubmenu])
{
//Get the new "Windows" menu
newWindowsMenu = [[windowsItem submenu] copy];
//Set this menu into the menu in this window
oldWindowsItem = [[window menu] itemWithTitle: _(@"Windows")];
[oldWindowsItem setSubmenu: newWindowsMenu];
}
}
// Prevent recursion
[window _setMenu: menu];
// Remove any possible old menu view
[wv removeMenuView];
//NSLog(@"Adding menu %@ to window %@", menu, window);
if (menu != nil)
{
NSMenuView *menuView = [[NSMenuView alloc] initWithFrame: NSZeroRect];
[menuView setMenu: menu];
[menuView setHorizontal: YES];
[menuView setInterfaceStyle: NSWindows95InterfaceStyle];
[wv addMenuView: menuView];
[menuView sizeToFit];
RELEASE(menuView);
}
}
- (void) rightMouseDisplay: (NSMenu *)menu