|
Lines 646-651
Link Here
|
| 646 |
|
646 |
|
| 647 |
} |
647 |
} |
| 648 |
mbKeyHandled = true; |
648 |
mbKeyHandled = true; |
|
|
649 |
[self unmarkText]; |
| 649 |
} |
650 |
} |
| 650 |
} |
651 |
} |
| 651 |
|
652 |
|
|
Lines 778-788
Link Here
|
| 778 |
if( ![aString isKindOfClass:[NSAttributedString class]] ) |
779 |
if( ![aString isKindOfClass:[NSAttributedString class]] ) |
| 779 |
aString = [[[NSAttributedString alloc] initWithString:aString] autorelease]; |
780 |
aString = [[[NSAttributedString alloc] initWithString:aString] autorelease]; |
| 780 |
NSRange rangeToReplace = [self hasMarkedText] ? [self markedRange] : [self selectedRange]; |
781 |
NSRange rangeToReplace = [self hasMarkedText] ? [self markedRange] : [self selectedRange]; |
| 781 |
mMarkedRange = NSMakeRange( rangeToReplace.location, [aString length] ); |
|
|
| 782 |
if( rangeToReplace.location == NSNotFound ) |
782 |
if( rangeToReplace.location == NSNotFound ) |
| 783 |
mSelectedRange = NSMakeRange( NSNotFound, selRange.length ); |
783 |
{ |
|
|
784 |
mMarkedRange = NSMakeRange( selRange.location, [aString length] ); |
| 785 |
mSelectedRange = NSMakeRange( selRange.location, selRange.length ); |
| 786 |
} |
| 784 |
else |
787 |
else |
|
|
788 |
{ |
| 789 |
mMarkedRange = NSMakeRange( rangeToReplace.location, [aString length] ); |
| 785 |
mSelectedRange = NSMakeRange( rangeToReplace.location + selRange.location, selRange.length ); |
790 |
mSelectedRange = NSMakeRange( rangeToReplace.location + selRange.location, selRange.length ); |
|
|
791 |
} |
| 786 |
|
792 |
|
| 787 |
int len = [aString length]; |
793 |
int len = [aString length]; |
| 788 |
SalExtTextInputEvent aInputEvent; |
794 |
SalExtTextInputEvent aInputEvent; |