gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Guard against a nil _layoutManager in a few places.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15761 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-01-29 20:19:20 +00:00
parent 6d9a9c890c
commit 58fb330d35
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/NSTextView.m
View file

@ -1451,6 +1451,10 @@ here. */
return [_textStorage attributedSubstringFromRange: theRange];
}
/*
TODO: make sure this is only called when _layoutManager is known non-nil,
or add guards
*/
-(unsigned int) characterIndexForPoint: (NSPoint)point
{
unsigned index;
@ -1503,7 +1507,7 @@ here. */
-(NSRect) firstRectForCharacterRange: (NSRange)theRange
{
unsigned rectCount;
unsigned int rectCount = 0; /* If there's no layout manager, it'll be 0 after the call too. */
NSRect *rects = [_layoutManager
rectArrayForCharacterRange: theRange
withinSelectedCharacterRange: NSMakeRange(NSNotFound, 0)
@ -2037,7 +2041,7 @@ Returns the ranges to which various kinds of user changes should apply.
-(NSRange) rangeForUserCharacterAttributeChange
{
if (!_tf.is_editable || !_tf.uses_font_panel)
if (!_tf.is_editable || !_tf.uses_font_panel || !_layoutManager)
{
return NSMakeRange(NSNotFound, 0);
}
@ -2054,7 +2058,7 @@ Returns the ranges to which various kinds of user changes should apply.
-(NSRange) rangeForUserParagraphAttributeChange
{
if (!_tf.is_editable || !_tf.uses_ruler)
if (!_tf.is_editable || !_tf.uses_ruler || !_layoutManager)
{
return NSMakeRange(NSNotFound, 0);
}
@ -2072,7 +2076,7 @@ Returns the ranges to which various kinds of user changes should apply.
-(NSRange) rangeForUserTextChange
{
if (!_tf.is_editable)
if (!_tf.is_editable || !_layoutManager)
{
return NSMakeRange(NSNotFound, 0);
}
@ -2287,6 +2291,9 @@ ugly_hack_done:
BOOL sendOK = NO;
BOOL returnOK = NO;
if (!_layoutManager)
return [super validRequestorForSendType: sendType returnType: returnType];
if (sendType == nil)
{
sendOK = YES;
@ -2724,6 +2731,8 @@ Figure out how the additional layout stuff is supposed to work.
- (BOOL) shouldDrawInsertionPoint
{
if (!_layoutManager)
return NO;
return (_layoutManager->_selected_range.length == 0) && _tf.is_editable
&& [_window isKeyWindow] && ([_window firstResponder] == self);
}
@ -2834,9 +2843,16 @@ Figure out how the additional layout stuff is supposed to work.
NSRange gr;
NSRect new;
if (!_layoutManager)
{
_insertionPointRect = NSZeroRect;
return;
}
if (_layoutManager->_selected_range.length > 0 ||
_layoutManager->_selected_range.location == NSNotFound)
{
[self setNeedsDisplayInRect: _insertionPointRect];
_insertionPointRect = NSZeroRect;
return;
}
@ -3888,6 +3904,9 @@ other than copy/paste or dragging. */
return;
}
if (!_layoutManager)
return;
/* Otherwise, NSWindow has already made us first responder (if
possible) */