mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-25 06:41:12 +00:00
Fixed decoding
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7376 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
93a9b4e1ad
commit
35fb163728
1 changed files with 23 additions and 8 deletions
|
@ -974,18 +974,24 @@ static Class rulerViewClass = nil;
|
||||||
[aCoder encodeValueOfObjCType: @encode(float) at: &_hPageScroll];
|
[aCoder encodeValueOfObjCType: @encode(float) at: &_hPageScroll];
|
||||||
[aCoder encodeValueOfObjCType: @encode(float) at: &_vLineScroll];
|
[aCoder encodeValueOfObjCType: @encode(float) at: &_vLineScroll];
|
||||||
[aCoder encodeValueOfObjCType: @encode(float) at: &_vPageScroll];
|
[aCoder encodeValueOfObjCType: @encode(float) at: &_vPageScroll];
|
||||||
|
|
||||||
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasHorizScroller];
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasHorizScroller];
|
||||||
if (_hasHorizScroller)
|
if (_hasHorizScroller)
|
||||||
[aCoder encodeObject: _horizScroller];
|
[aCoder encodeObject: _horizScroller];
|
||||||
|
|
||||||
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasVertScroller];
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasVertScroller];
|
||||||
if (_hasVertScroller)
|
if (_hasVertScroller)
|
||||||
[aCoder encodeObject: _vertScroller];
|
[aCoder encodeObject: _vertScroller];
|
||||||
|
|
||||||
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasHorizRuler];
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasHorizRuler];
|
||||||
if (_hasHorizRuler)
|
if (_hasHorizRuler)
|
||||||
[aCoder encodeObject: _horizRuler];
|
[aCoder encodeObject: _horizRuler];
|
||||||
|
|
||||||
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasVertRuler];
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_hasVertRuler];
|
||||||
if (_hasVertRuler)
|
if (_hasVertRuler)
|
||||||
[aCoder encodeObject: _vertRuler];
|
[aCoder encodeObject: _vertRuler];
|
||||||
|
|
||||||
|
/* We do not need to encode headerview, cornerview stuff */
|
||||||
NSDebugLLog(@"NSScrollView", @"NSScrollView: finish encoding\n");
|
NSDebugLLog(@"NSScrollView", @"NSScrollView: finish encoding\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1002,18 +1008,27 @@ static Class rulerViewClass = nil;
|
||||||
[aDecoder decodeValueOfObjCType: @encode(float) at: &_hPageScroll];
|
[aDecoder decodeValueOfObjCType: @encode(float) at: &_hPageScroll];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(float) at: &_vLineScroll];
|
[aDecoder decodeValueOfObjCType: @encode(float) at: &_vLineScroll];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(float) at: &_vPageScroll];
|
[aDecoder decodeValueOfObjCType: @encode(float) at: &_vPageScroll];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_horizScroller];
|
|
||||||
if (_horizScroller)
|
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_hasHorizScroller];
|
||||||
|
if (_hasHorizScroller)
|
||||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_horizScroller];
|
[aDecoder decodeValueOfObjCType: @encode(id) at: &_horizScroller];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_vertScroller];
|
|
||||||
if (_vertScroller)
|
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_hasVertScroller];
|
||||||
|
if (_hasVertScroller)
|
||||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_vertScroller];
|
[aDecoder decodeValueOfObjCType: @encode(id) at: &_vertScroller];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_horizRuler];
|
|
||||||
if (_horizRuler)
|
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_hasHorizRuler];
|
||||||
|
if (_hasHorizRuler)
|
||||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_horizRuler];
|
[aDecoder decodeValueOfObjCType: @encode(id) at: &_horizRuler];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_vertRuler];
|
|
||||||
if (_vertRuler)
|
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_hasVertRuler];
|
||||||
|
if (_hasVertRuler)
|
||||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_vertRuler];
|
[aDecoder decodeValueOfObjCType: @encode(id) at: &_vertRuler];
|
||||||
|
|
||||||
|
/* This recreates all the info about headerView, cornerView, etc */
|
||||||
|
[self setDocumentView: [_contentView documentView]];
|
||||||
|
[self tile];
|
||||||
|
|
||||||
NSDebugLLog(@"NSScrollView", @"NSScrollView: finish decoding\n");
|
NSDebugLLog(@"NSScrollView", @"NSScrollView: finish decoding\n");
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
|
Loading…
Reference in a new issue