Changeset 393 for trunk

Timestamp:

02/23/08 08:46:47 (16 years ago)

Author:

Nicholas Riley

Message:

APEMain.m: Fix exception on menuForEvent: in Xcode 3 rich text editor

File:

• trunk/ICeCoffEE/ICeCoffEE/APEMain.m (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/APEMain.m

@@ -128 +128 @@
     if (bundleID != NULL) {
         if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.xcode"))) {
-            ICCF_PatchMethod("PBXTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
-            ICCF_PatchMethod("XCSourceCodeTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
-            ICCF_PatchMethod("XCTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:");
+            if (ICCF_PatchMethod("XCTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:")) {
+                ICCF_PatchMethod("XCSourceCodeTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
+                ICCF_PatchMethod("XCDiffTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:");
+                ICCF_PatchMethod("XCDiffTextView", "ICeCoffEE", "ICeCoffEESuper", "menuForEvent:"); // subclass of PBXTextView; patching both is bad
+            } else {
+                ICCF_PatchMethod("PBXTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
+            }
             ICapeprintf("ICeCoffEE APE: loaded in PBXTextView / XCTextView for Xcode\n");
             shouldLoadInNSTextView = NO;