gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-22 22:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* English.lproj/GormFontView.gorm: Fix problem with popup showing

Browse source 
as Button.
	* GormCore/GormDocument.m: Add the NSMenu as a top level item only
	if it has filesOwner as it's parent.
	* GormCore/GormPalettesManager.m: remove the restriction for having
	just one instance of NSMenu in the document at the top level.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@30547 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2010-06-02 21:38:53 +00:00
parent 87a0e31e32
commit c06e0663ef
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-06-02 17:45-EDT Gregory John Casamento <greg.casamento@gmail.com>
* English.lproj/GormFontView.gorm: Fix problem with popup showing
as Button.
* GormCore/GormDocument.m: Add the NSMenu as a top level item only
if it has filesOwner as it's parent.
* GormCore/GormPalettesManager.m: remove the restriction for having
just one instance of NSMenu in the document at the top level.
2010-05-30 03:07-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormDocument.m: In

BIN
English.lproj/GormFontView.gorm/data.info
View file

Binary file not shown.

BIN
English.lproj/GormFontView.gorm/objects.gorm
View file

Binary file not shown.

7
GormCore/GormDocument.m
View file

@ -715,6 +715,13 @@ static NSImage *fileImage = nil;
{
[self setRecentDocumentsMenu: menu];
}
// if it doesn't have a supermenu and it's owned by the file's owner, then it's a top level menu....
else if([menu supermenu] == nil && aParent == filesOwner)
{
[objectsView addObject: menu];
[topLevelObjects addObject: menu];
isMainMenu = NO;
}
}
// add all of the items in the menu.

3
GormCore/GormPalettesManager.m
View file

@ -118,10 +118,11 @@ static NSImage *dragImage = nil;
if (active != nil)
{
/*
if([active objectForName: @"NSMenu"] != nil &&
[type isEqual: IBMenuPboardType] == YES)
return;
*/
[active pasteType: type fromPasteboard: dragPb parent: nil];
}
}