зеркало из https://github.com/mozilla/gecko-dev.git
Backout ee828e9096c7 (bug 1328604) for causing some custom shortcuts to stop working on OSX. r=backout
This commit is contained in:
Родитель
75847f1a75
Коммит
b3738b6163
|
@ -48,10 +48,6 @@ NS_IMETHODIMP nsNativeMenuServiceX::CreateNativeMenuBar(nsIWidget* aParent, nsIC
|
|||
{
|
||||
NS_ASSERTION(NS_IsMainThread(), "Attempting to create native menu bar on wrong thread!");
|
||||
|
||||
// We currently don't support custom shortcuts (bug 429824), so we need to
|
||||
// avoid displaying them next to menu items.
|
||||
[NSMenuItem setUsesUserKeyEquivalents:NO];
|
||||
|
||||
RefPtr<nsMenuBarX> mb = new nsMenuBarX();
|
||||
if (!mb)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
Загрузка…
Ссылка в новой задаче