diff options
Diffstat (limited to 'WebCore/platform/ContextMenu.cpp')
| -rw-r--r-- | WebCore/platform/ContextMenu.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/WebCore/platform/ContextMenu.cpp b/WebCore/platform/ContextMenu.cpp index 771798a..236279e 100644 --- a/WebCore/platform/ContextMenu.cpp +++ b/WebCore/platform/ContextMenu.cpp @@ -276,7 +276,9 @@ void ContextMenu::populate() ContextMenuItem LookInDictionaryItem(ActionType, ContextMenuItemTagLookUpInDictionary, contextMenuItemTagLookUpInDictionary()); #endif +#if !PLATFORM(GTK) ContextMenuItem SearchWebItem(ActionType, ContextMenuItemTagSearchWeb, contextMenuItemTagSearchWeb()); +#endif ContextMenuItem CopyItem(ActionType, ContextMenuItemTagCopy, contextMenuItemTagCopy()); ContextMenuItem BackItem(ActionType, ContextMenuItemTagGoBack, contextMenuItemTagGoBack()); ContextMenuItem ForwardItem(ActionType, ContextMenuItemTagGoForward, contextMenuItemTagGoForward()); @@ -341,8 +343,10 @@ void ContextMenu::populate() #if PLATFORM(MAC) appendItem(SearchSpotlightItem); #endif +#if !PLATFORM(GTK) appendItem(SearchWebItem); appendItem(*separatorItem()); +#endif #if PLATFORM(MAC) appendItem(LookInDictionaryItem); appendItem(*separatorItem()); @@ -445,8 +449,10 @@ void ContextMenu::populate() #if PLATFORM(MAC) appendItem(SearchSpotlightItem); #endif +#if !PLATFORM(GTK) appendItem(SearchWebItem); appendItem(*separatorItem()); +#endif #if PLATFORM(MAC) appendItem(LookInDictionaryItem); @@ -466,10 +472,12 @@ void ContextMenu::populate() if (!inPasswordField) { appendItem(*separatorItem()); #ifndef BUILDING_ON_TIGER +#if !PLATFORM(GTK) ContextMenuItem SpellingAndGrammarMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu, contextMenuItemTagSpellingMenu()); createAndAppendSpellingAndGrammarSubMenu(m_hitTestResult, SpellingAndGrammarMenuItem); appendItem(SpellingAndGrammarMenuItem); +#endif #else ContextMenuItem SpellingMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu, contextMenuItemTagSpellingMenu()); @@ -486,10 +494,17 @@ void ContextMenu::populate() createAndAppendTransformationsSubMenu(m_hitTestResult, transformationsMenuItem); appendItem(transformationsMenuItem); #endif - ContextMenuItem FontMenuItem(SubmenuType, ContextMenuItemTagFontMenu, - contextMenuItemTagFontMenu()); - createAndAppendFontSubMenu(m_hitTestResult, FontMenuItem); - appendItem(FontMenuItem); +#if PLATFORM(GTK) + bool shouldShowFontMenu = frame->editor()->canEditRichly(); +#else + bool shouldShowFontMenu = true; +#endif + if (shouldShowFontMenu) { + ContextMenuItem FontMenuItem(SubmenuType, ContextMenuItemTagFontMenu, + contextMenuItemTagFontMenu()); + createAndAppendFontSubMenu(m_hitTestResult, FontMenuItem); + appendItem(FontMenuItem); + } #if PLATFORM(MAC) ContextMenuItem SpeechMenuItem(SubmenuType, ContextMenuItemTagSpeechMenu, contextMenuItemTagSpeechMenu()); createAndAppendSpeechSubMenu(m_hitTestResult, SpeechMenuItem); |