Ignore:
Timestamp:
08/13/07 01:08:40 (13 years ago)
Author:
Nicholas Riley
Message:

VERSION: Starting with 1.4.4b1, should be close to final.

ICeCoffEEServicePrefController.m: Display correct key equivalents, backported from [319].

ICeCoffEEWebKit.m: Fix Safari 3 beta compatibility; better comment WebKit? interfaces.

Info-APE Module.plist: Update version to 1.4.4b1.

ICeCoffEE.xcodeproj: Remove obsolete WebKit? header.

English.lproj/APEInfo.rtfd: Backported updates from [320]; release notes.

English.lproj/InfoPlist.strings: Update version to 1.4.4b1.

English.lproj/Localizable.strings: Fix an "APE Manager" reference I didn't catch before.

ape_install: Updated to APE 2.0.3.

ui.plist: Update version to 1.4.4b1.

Info-APEManagerPrefPane.plist: Update version to 1.4.4b1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEWebKit.m

    r216 r336  
    1010#import <unistd.h>
    1111
    12 // from WebCoreBridge.h
     12// WebCoreBridge, from WebCoreBridge.h (Safari 2)
     13// Web(Core)FrameBridge, from WebCoreFrameBridge.h (Safari 3)
    1314@interface WebCoreBridge : NSObject
    1415
    15 - (NSString *)selectedString;
    16 - (NSRect)selectionRect;
     16- (NSString *)selectedString; // public
    1717
    18 - (void)selectNSRange:(NSRange)range;
    19 - (void)deselectAll;
     18- (void)selectNSRange:(NSRange)range; // private, Safari 2 & 3
    2019
    2120@end
     
    2423@interface WebHTMLView : NSObject
    2524
    26 - (WebCoreBridge *)_bridge;
     25- (WebCoreBridge *)_bridge; // private, in Safari 2 & 3; WebFrameBridge in Safari 3 (see above)
    2726
    28 - (NSRange)selectedRange;
     27- (NSRange)selectedRange; // WebNSTextInputSupport, Safari 2 & 3
    2928
    30 - (NSDictionary *)elementAtPoint:(NSPoint)point;
     29- (NSRect)selectionRect; // Safari 3 only
     30- (NSRect)_selectionRect; // Safari 2, supported in Safari 3 only for use with Mail
     31// (see <http://trac.webkit.org/projects/webkit/browser/trunk/WebKit/WebView/WebHTMLView.mm?rev=25024#L1430>)
     32
     33- (void)drawSingleRect:(NSRect)rect;
     34
     35- (void)deselectAll; // Safari 2 & 3
     36
     37- (NSDictionary *)elementAtPoint:(NSPoint)point; // private, Safari 2 & 3
    3138
    3239@end
     
    9198            if (ICCF_LaunchURL(selectedString, ICCF_KeyboardAction(downEvent)) && ICCF_prefs.textBlinkEnabled && canSetSelection) {
    9299                int i;
    93                 NSRect selectionRect = [bridge selectionRect];
     100                NSRect selectionRect;
     101                if ([self respondsToSelector: @selector(selectionRect)])
     102                    selectionRect = [(WebHTMLView *)self selectionRect];
     103                else if ([self respondsToSelector: @selector(_selectionRect)])
     104                    selectionRect = [(WebHTMLView *)self _selectionRect];
    94105                ICLog(@"selectedRange %@ selectionRect %@ textBlinkCount %d", NSStringFromRange(selectedRange), NSStringFromRect(selectionRect), ICCF_prefs.textBlinkCount);
    95106                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
    96                     [bridge deselectAll];
     107                    [(WebHTMLView *)self deselectAll];
    97108                    [self setNeedsDisplayInRect: selectionRect];
    98109                    [self display];
Note: See TracChangeset for help on using the changeset viewer.