Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't look up key node for menu items that don't have a key attribute. Check for empty string return from GetAttribute. Cocoa widgets only. No bug.

Browse Source
This commit is contained in:
joshmoz%gmail.com 2006-02-13 20:12:36 +00:00
parent 1e868102bd
commit c44a04a390
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
widget/src/cocoa/nsMenuBarX.mm
View File

@ -561,27 +561,29 @@ NSMenuItem* nsMenuBarX::CreateNativeAppMenuItem(nsIMenu* inMenu, const nsAString
// Get more information about the key equivalent. Start by
// finding the key node we need.
NSString* keyEquiv = [@"" retain];
unsigned int macKeyModifiers;
nsCOMPtr<nsIDOMElement> keyElement;
domdoc->GetElementById(key, getter_AddRefs(keyElement));
if (keyElement) {
nsCOMPtr<nsIContent> keyContent (do_QueryInterface(keyElement));
// first grab the key equivalent character
nsAutoString keyChar(NS_LITERAL_STRING(" "));
keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::key, keyChar);
if (!keyChar.EqualsLiteral(" ")) {
keyEquiv = (NSString*)::CFStringCreateWithCharacters(kCFAllocatorDefault, (UniChar*)keyChar.get(),
keyChar.Length());
[keyEquiv autorelease];
keyEquiv = [[keyEquiv lowercaseString] retain];
unsigned int macKeyModifiers = 0;
if (!key.IsEmpty()) {
nsCOMPtr<nsIDOMElement> keyElement;
domdoc->GetElementById(key, getter_AddRefs(keyElement));
if (keyElement) {
nsCOMPtr<nsIContent> keyContent (do_QueryInterface(keyElement));
// first grab the key equivalent character
nsAutoString keyChar(NS_LITERAL_STRING(" "));
keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::key, keyChar);
if (!keyChar.EqualsLiteral(" ")) {
keyEquiv = (NSString*)::CFStringCreateWithCharacters(kCFAllocatorDefault, (UniChar*)keyChar.get(),
keyChar.Length());
[keyEquiv autorelease];
keyEquiv = [[keyEquiv lowercaseString] retain];
}
// now grab the key equivalent modifiers
nsAutoString modifiersStr;
keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::modifiers, modifiersStr);
char* str = ToNewCString(modifiersStr);
PRUint8 geckoModifiers = MenuHelpersX::GeckoModifiersForNodeAttribute(str);
nsMemory::Free(str);
macKeyModifiers = MenuHelpersX::MacModifiersForGeckoModifiers(geckoModifiers);
}
// now grab the key equivalent modifiers
nsAutoString modifiersStr;
keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::modifiers, modifiersStr);
char* str = ToNewCString(modifiersStr);
PRUint8 geckoModifiers = MenuHelpersX::GeckoModifiersForNodeAttribute(str);
nsMemory::Free(str);
macKeyModifiers = MenuHelpersX::MacModifiersForGeckoModifiers(geckoModifiers);
}
// put together the actual NSMenuItem