gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 13:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

View coding fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11553 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2001-11-27 21:40:05 +00:00
parent e793f94121
commit 46cd34f22b
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSClipView.m
View file

@ -77,7 +77,11 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
}
/* Note that the ivar _documentView is really just a convienience
variable. The actual document view is stored in NSClipView's
subview array. Deallocation, coding, etc of the view is then
handled by NSView
*/
@implementation NSClipView
- (id) init
@ -102,7 +106,7 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
[nc removeObserver: _documentView name:nil object:self];
}
RELEASE(_documentView);
/* Don't RELEASE(_documentView), since it's already in our subviews. */
}
RELEASE(_cursor);
RELEASE(_backgroundColor);
@ -133,7 +137,8 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
[_documentView removeFromSuperview];
}
ASSIGN (_documentView, aView);
/* Don't retain this since it's stored in our subviews. */
_documentView = aView;
/* Call this before doing anything else ! */
_rFlags.flipped_view = [self isFlipped];
@ -656,7 +661,6 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_copiesOnScroll];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_drawsBackground];
[aCoder encodeObject: _cursor];
[aCoder encodeObject: _documentView];
}
- (id) initWithCoder: (NSCoder*)aDecoder
@ -671,8 +675,12 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_drawsBackground];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_cursor];
document = [aDecoder decodeObject];
[self setDocumentView: document];
if ([[self subviews] count] > 0)
{
document = AUTORELEASE(RETAIN([[self subviews] objectAtIndex: 0]));
[self removeSubview: document];
[self setDocumentView: document];
}
return self;
}