Build fix.
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Nov 2006 07:14:38 +0000 (07:14 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Nov 2006 07:14:38 +0000 (07:14 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@17807 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/platform/ContextMenu.cpp
WebCore/platform/ContextMenu.h

index 1c78544864ddafd271b3f925caab737b33c5e022..678fe834051d16e6e523524a420b05c6d79f9d08 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         Reviewed by Anders.
index 49897a0f924cac3cad845985ff3a472476189681..4da649bd8f2e88b85b1cc5c31f4acfbb5446ab38 100644 (file)
@@ -23,7 +23,7 @@
 /* Begin PBXBuildFile section */
                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 */; };
-               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 */; };
                0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */; };
                066C772B0AB603B700238CC4 /* FileChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772A0AB603B700238CC4 /* FileChooser.h */; };
index 35d5fbb944a6975a793e49acd6c66374938533fd..20afe3e85f25754d614a7c434ccafcc0057c1c1b 100644 (file)
@@ -37,7 +37,7 @@
 
 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()
 {
@@ -66,7 +66,7 @@ void ContextMenu::populate()
     MENU_ACTION_ITEM(LookUpInDictionary, "Look Up in Dictionary");
     // FIXME: Add PDF action items
 
-    ContextMenuItem SeparatorItem(SeparatorType, WebMenuItemTagNoAction, String());
+    ContextMenuItem SeparatorItem(SeparatorType, ContextMenuItemTagNoAction, String());
     HitTestResult result = hitTestResult();
 
     if (!result.isContentEditable()) {
index 2e6d6a14dce982a62d5fd7c40a5586a5618ade57..c17565f4dbd8270799d104182db2646eec057a66 100644 (file)
@@ -43,39 +43,39 @@ namespace WebCore {
 
 // This enum needs to be in sync with WebMenuItemTag, which is defined in WebUIDelegate.h
 enum ContextMenuAction {
-    WebMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h
-    WebMenuItemTagOpenLinkInNewWindow=1,
-    WebMenuItemTagDownloadLinkToDisk,
-    WebMenuItemTagCopyLinkToClipboard,
-    WebMenuItemTagOpenImageInNewWindow,
-    WebMenuItemTagDownloadImageToDisk,
-    WebMenuItemTagCopyImageToClipboard,
-    WebMenuItemTagOpenFrameInNewWindow,
-    WebMenuItemTagCopy,
-    WebMenuItemTagGoBack,
-    WebMenuItemTagGoForward,
-    WebMenuItemTagStop,
-    WebMenuItemTagReload,
-    WebMenuItemTagCut,
-    WebMenuItemTagPaste,
-    WebMenuItemTagSpellingGuess,
-    WebMenuItemTagNoGuessesFound,
-    WebMenuItemTagIgnoreSpelling,
-    WebMenuItemTagLearnSpelling,
-    WebMenuItemTagOther,
-    WebMenuItemTagSearchInSpotlight,
-    WebMenuItemTagSearchWeb,
-    WebMenuItemTagLookUpInDictionary,
-    WebMenuItemTagOpenWithDefaultApplication,
-    WebMenuItemPDFActualSize,
-    WebMenuItemPDFZoomIn,
-    WebMenuItemPDFZoomOut,
-    WebMenuItemPDFAutoSize,
-    WebMenuItemPDFSinglePage,
-    WebMenuItemPDFFacingPages,
-    WebMenuItemPDFContinuous,
-    WebMenuItemPDFNextPage,
-    WebMenuItemPDFPreviousPage,
+    ContextMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h
+    ContextMenuItemTagOpenLinkInNewWindow=1,
+    ContextMenuItemTagDownloadLinkToDisk,
+    ContextMenuItemTagCopyLinkToClipboard,
+    ContextMenuItemTagOpenImageInNewWindow,
+    ContextMenuItemTagDownloadImageToDisk,
+    ContextMenuItemTagCopyImageToClipboard,
+    ContextMenuItemTagOpenFrameInNewWindow,
+    ContextMenuItemTagCopy,
+    ContextMenuItemTagGoBack,
+    ContextMenuItemTagGoForward,
+    ContextMenuItemTagStop,
+    ContextMenuItemTagReload,
+    ContextMenuItemTagCut,
+    ContextMenuItemTagPaste,
+    ContextMenuItemTagSpellingGuess,
+    ContextMenuItemTagNoGuessesFound,
+    ContextMenuItemTagIgnoreSpelling,
+    ContextMenuItemTagLearnSpelling,
+    ContextMenuItemTagOther,
+    ContextMenuItemTagSearchInSpotlight,
+    ContextMenuItemTagSearchWeb,
+    ContextMenuItemTagLookUpInDictionary,
+    ContextMenuItemTagOpenWithDefaultApplication,
+    ContextMenuItemPDFActualSize,
+    ContextMenuItemPDFZoomIn,
+    ContextMenuItemPDFZoomOut,
+    ContextMenuItemPDFAutoSize,
+    ContextMenuItemPDFSinglePage,
+    ContextMenuItemPDFFacingPages,
+    ContextMenuItemPDFContinuous,
+    ContextMenuItemPDFNextPage,
+    ContextMenuItemPDFPreviousPage,
 };
 
 enum ContextMenuItemType {
@@ -87,7 +87,7 @@ enum ContextMenuItemType {
 struct ContextMenuItem {
     ContextMenuItem()
         : type(SeparatorType)
-        , action(WebMenuItemTagNoAction)
+        , action(ContextMenuItemTagNoAction)
         , title(String())
     {
     }