gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-21 03:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct coding/decoding after type changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36160 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-17 16:53:48 +00:00
parent 4d953a5122
commit b1fc7cb066
15 changed files with 266 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/NSWindow.m
View file

@ -5283,8 +5283,9 @@ current key view.<br />
[super encodeWithCoder: aCoder];
[aCoder encodeRect: [[self contentView] frame]];
[aCoder encodeValueOfObjCType: @encode(unsigned) at: &_styleMask];
[aCoder encodeValueOfObjCType: @encode(int) at: &_backingType];
[aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &_styleMask];
// This used to be int, we need to stay compatible
[aCoder encodeValueOfObjCType: @encode(NSInteger) at: &_backingType];
[aCoder encodePoint: NSMakePoint(NSMinX([self frame]), NSMaxY([self frame]))];
[aCoder encodeObject: _contentView];
@ -5296,7 +5297,7 @@ current key view.<br />
[aCoder encodeSize: _minimumSize];
[aCoder encodeSize: _maximumSize];
[aCoder encodeValueOfObjCType: @encode(int) at: &_windowLevel];
[aCoder encodeValueOfObjCType: @encode(NSInteger) at: &_windowLevel];
flag = _f.menu_exclude;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
@ -5345,13 +5346,14 @@ current key view.<br />
NSPoint p;
NSUInteger aStyle;
NSBackingStoreType aBacking;
int anInt;
NSInteger level;
id obj;
aRect = [aDecoder decodeRect];
[aDecoder decodeValueOfObjCType: @encode(unsigned)
[aDecoder decodeValueOfObjCType: @encode(NSUInteger)
at: &aStyle];
[aDecoder decodeValueOfObjCType: @encode(int)
// This used to be int, we need to stay compatible
[aDecoder decodeValueOfObjCType: @encode(NSInteger)
at: &aBacking];
// call the designated initializer....
@ -5378,8 +5380,8 @@ current key view.<br />
[self setMaxSize: aSize];
[aDecoder decodeValueOfObjCType: @encode(int)
at: &anInt];
[self setLevel: anInt];
at: &level];
[self setLevel: level];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
[self setExcludedFromWindowsMenu: flag];