diff --git a/ChangeLog b/ChangeLog index bb05427c8..842145947 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-19 13:49-EST Gregory John Casamento + + * Source/NSMenu.m: Allow menus attached to popups to come up + in Windows95 mode. + 2010-01-19 Fred Kiefer * Source/NSMenu.m (-initWithCoder:): Use YES as default value for diff --git a/Source/NSMenu.m b/Source/NSMenu.m index c21896683..efa3fd2b7 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -155,7 +155,7 @@ static BOOL menuBarVisible = YES; if (style == NSWindows95InterfaceStyle) { // if we're the top level menu in Windows mode, don't show it. - if([_the_menu supermenu] == nil) + if([_the_menu supermenu] == nil && [_the_menu _ownedByPopUp] == NO) { return; }