Fixed: <rdar://problem/3791240> WebKit uses the NSTextViewContextMenu nib from insid...
authorcblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Sep 2004 18:17:15 +0000 (18:17 +0000)
committercblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Sep 2004 18:17:15 +0000 (18:17 +0000)
        Reviewed by john.

        * English.lproj/StringsNotToBeLocalized.txt:
        * WebKit.pbproj/project.pbxproj:
        * WebView.subproj/WebDefaultContextMenuDelegate.m:
        (-[WebDefaultUIDelegate editingContextMenuItemsForElement:]): use our copy of the nib

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/English.lproj/StringsNotToBeLocalized.txt
WebKit/WebKit.pbproj/project.pbxproj
WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m

index 8ee38a8dab12e453b0d951a991f6cba2e7a8254a..ba9bdaf9699025363690d70acd1b0c0ba9e7bf57 100644 (file)
@@ -1,3 +1,14 @@
+2004-09-08  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3791240> WebKit uses the NSTextViewContextMenu nib from inside AppKit
+
+        Reviewed by john.
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate editingContextMenuItemsForElement:]): use our copy of the nib
+
 2004-09-07  Darin Adler  <darin@apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
index 0253b50d2159f0002c78a9691db43dc1a1b9db3d..8791dc616b3b9f516452139b5d372009576cb6dc 100644 (file)
 "NSFileModificationDate"
 "NSFileOwnerAccountName"
 "NSFilePosixPermissions"
-"NSTextViewContextMenu"
 "POST"
 "Papyrus"
 "Set-Cookie"
 "WebViewDidChangeSelectionNotification"
 "WebViewDidChangeTypingStyleNotification"
 "WebViewDidEndEditingNotification"
+"WebViewEditingContextMenu"
 "\""
 "\"@?"
 "\"\\"
index b171cf826456a3f476d1b24d7ea2e9aeb27ad595..1abd7d80060c301711ce98f93ab61de5d720ae0f 100644 (file)
                                F5883BDF025E5C6A01000102,
                                F5B67131023EDF8901C1A525,
                                5128F1FA04719A4200CA2D3A,
+                               8476113406EF82DB00AB2914,
                        );
                        isa = PBXResourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                                F5B67130023EDF8901C1A525,
                                F5F732D202FF4D4F01A80180,
                                9345D4E70365C58D008635CE,
+                               8476113206EF82DB00AB2914,
                                5128F1F904719A4200CA2D3A,
                        );
                        isa = PBXGroup;
                        settings = {
                        };
                };
+               8476113206EF82DB00AB2914 = {
+                       children = (
+                               8476113306EF82DB00AB2914,
+                       );
+                       isa = PBXVariantGroup;
+                       name = WebViewEditingContextMenu.nib;
+                       path = "";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               8476113306EF82DB00AB2914 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.nib;
+                       name = English;
+                       path = English.lproj/WebViewEditingContextMenu.nib;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               8476113406EF82DB00AB2914 = {
+                       fileRef = 8476113206EF82DB00AB2914;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                848DFF410365F6FB00CA2ACA = {
                        children = (
                                51863ED9065417DA00E9E8DD,
index 13cc2abd926996f6747eeef298cd039175cf54af..ae32265ed65c4fb6f172d0d609bd64049b64ab29 100644 (file)
         [menuItems addObject:[NSMenuItem separatorItem]];
     }
     
-    // Load the standard NSTextView context menu nib.
+    // Load our NSTextView-like context menu nib.
     if (defaultMenu == nil) {
         static NSNib *textViewMenuNib = nil;
         if (textViewMenuNib == nil) {
-            textViewMenuNib = [[NSNib alloc] initWithNibNamed:@"NSTextViewContextMenu" bundle:[NSBundle bundleForClass:[NSTextView class]]];
+            textViewMenuNib = [[NSNib alloc] initWithNibNamed:@"WebViewEditingContextMenu" bundle:[NSBundle bundleForClass:[self class]]];
         }
         [textViewMenuNib instantiateNibWithOwner:self topLevelObjects:nil];
     }