Commit 85252fc1 authored by aroben's avatar aroben

Build fix.

        Rename the items in the ContextMenuAction enum so that they don't
        conflict with WebKit names.

        * WebCore.xcodeproj/project.pbxproj:
        * platform/ContextMenu.cpp:
        (WebCore::ContextMenu::populate):
        * platform/ContextMenu.h:
        (WebCore::):
        (WebCore::ContextMenuItem::ContextMenuItem):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17807 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d4284311
2006-11-15 Adam Roben <aroben@apple.com>
Build fix.
Rename the items in the ContextMenuAction enum so that they don't
conflict with WebKit names.
* WebCore.xcodeproj/project.pbxproj:
* platform/ContextMenu.cpp:
(WebCore::ContextMenu::populate):
* platform/ContextMenu.h:
(WebCore::):
(WebCore::ContextMenuItem::ContextMenuItem):
2006-11-15 Adam Roben <aroben@apple.com> 2006-11-15 Adam Roben <aroben@apple.com>
Reviewed by Anders. Reviewed by Anders.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */; }; 065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */; };
065AD4F70B0C2EDA005A2B1D /* ContextMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */; }; 065AD4F70B0C2EDA005A2B1D /* ContextMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */; settings = {ATTRIBUTES = (Private, ); }; };
0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 0668E1890ADD9624004128E0 /* PopupMenu.h */; }; 0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 0668E1890ADD9624004128E0 /* PopupMenu.h */; };
0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */; }; 0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */; };
066C772B0AB603B700238CC4 /* FileChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772A0AB603B700238CC4 /* FileChooser.h */; }; 066C772B0AB603B700238CC4 /* FileChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772A0AB603B700238CC4 /* FileChooser.h */; };
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
namespace WebCore { namespace WebCore {
#define MENU_ACTION_ITEM(action, title) static ContextMenuItem action##Item(ActionType, WebMenuItemTag##action, String(title)) #define MENU_ACTION_ITEM(action, title) static ContextMenuItem action##Item(ActionType, ContextMenuItemTag##action, String(title))
void ContextMenu::populate() void ContextMenu::populate()
{ {
...@@ -66,7 +66,7 @@ void ContextMenu::populate() ...@@ -66,7 +66,7 @@ void ContextMenu::populate()
MENU_ACTION_ITEM(LookUpInDictionary, "Look Up in Dictionary"); MENU_ACTION_ITEM(LookUpInDictionary, "Look Up in Dictionary");
// FIXME: Add PDF action items // FIXME: Add PDF action items
ContextMenuItem SeparatorItem(SeparatorType, WebMenuItemTagNoAction, String()); ContextMenuItem SeparatorItem(SeparatorType, ContextMenuItemTagNoAction, String());
HitTestResult result = hitTestResult(); HitTestResult result = hitTestResult();
if (!result.isContentEditable()) { if (!result.isContentEditable()) {
......
...@@ -43,39 +43,39 @@ namespace WebCore { ...@@ -43,39 +43,39 @@ namespace WebCore {
// This enum needs to be in sync with WebMenuItemTag, which is defined in WebUIDelegate.h // This enum needs to be in sync with WebMenuItemTag, which is defined in WebUIDelegate.h
enum ContextMenuAction { enum ContextMenuAction {
WebMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h ContextMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h
WebMenuItemTagOpenLinkInNewWindow=1, ContextMenuItemTagOpenLinkInNewWindow=1,
WebMenuItemTagDownloadLinkToDisk, ContextMenuItemTagDownloadLinkToDisk,
WebMenuItemTagCopyLinkToClipboard, ContextMenuItemTagCopyLinkToClipboard,
WebMenuItemTagOpenImageInNewWindow, ContextMenuItemTagOpenImageInNewWindow,
WebMenuItemTagDownloadImageToDisk, ContextMenuItemTagDownloadImageToDisk,
WebMenuItemTagCopyImageToClipboard, ContextMenuItemTagCopyImageToClipboard,
WebMenuItemTagOpenFrameInNewWindow, ContextMenuItemTagOpenFrameInNewWindow,
WebMenuItemTagCopy, ContextMenuItemTagCopy,
WebMenuItemTagGoBack, ContextMenuItemTagGoBack,
WebMenuItemTagGoForward, ContextMenuItemTagGoForward,
WebMenuItemTagStop, ContextMenuItemTagStop,
WebMenuItemTagReload, ContextMenuItemTagReload,
WebMenuItemTagCut, ContextMenuItemTagCut,
WebMenuItemTagPaste, ContextMenuItemTagPaste,
WebMenuItemTagSpellingGuess, ContextMenuItemTagSpellingGuess,
WebMenuItemTagNoGuessesFound, ContextMenuItemTagNoGuessesFound,
WebMenuItemTagIgnoreSpelling, ContextMenuItemTagIgnoreSpelling,
WebMenuItemTagLearnSpelling, ContextMenuItemTagLearnSpelling,
WebMenuItemTagOther, ContextMenuItemTagOther,
WebMenuItemTagSearchInSpotlight, ContextMenuItemTagSearchInSpotlight,
WebMenuItemTagSearchWeb, ContextMenuItemTagSearchWeb,
WebMenuItemTagLookUpInDictionary, ContextMenuItemTagLookUpInDictionary,
WebMenuItemTagOpenWithDefaultApplication, ContextMenuItemTagOpenWithDefaultApplication,
WebMenuItemPDFActualSize, ContextMenuItemPDFActualSize,
WebMenuItemPDFZoomIn, ContextMenuItemPDFZoomIn,
WebMenuItemPDFZoomOut, ContextMenuItemPDFZoomOut,
WebMenuItemPDFAutoSize, ContextMenuItemPDFAutoSize,
WebMenuItemPDFSinglePage, ContextMenuItemPDFSinglePage,
WebMenuItemPDFFacingPages, ContextMenuItemPDFFacingPages,
WebMenuItemPDFContinuous, ContextMenuItemPDFContinuous,
WebMenuItemPDFNextPage, ContextMenuItemPDFNextPage,
WebMenuItemPDFPreviousPage, ContextMenuItemPDFPreviousPage,
}; };
enum ContextMenuItemType { enum ContextMenuItemType {
...@@ -87,7 +87,7 @@ enum ContextMenuItemType { ...@@ -87,7 +87,7 @@ enum ContextMenuItemType {
struct ContextMenuItem { struct ContextMenuItem {
ContextMenuItem() ContextMenuItem()
: type(SeparatorType) : type(SeparatorType)
, action(WebMenuItemTagNoAction) , action(ContextMenuItemTagNoAction)
, title(String()) , title(String())
{ {
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment