gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 17:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding improvements.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23285 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2006-08-13 20:21:46 +00:00
parent 3e19866ecf
commit b01bb1a0e1
4 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-08-13 16:18-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSCell.m: Conditionally encode the formatter in
encodeWithCoder:.
* Source/NSMenu.m: Change in encodeWithCoder: to add NSName to the
menu with "_NSMainMenu" as the value so that IB will display the menu
properly when loading.
* Source/NSTableView.m: Conditionally encode datasource, delegate,
target and action in encodeWithCoder:
2006-08-13 13:05-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSControl.m: Rolling back previous change to mouseDown:

6
Source/NSCell.m
View file

@ -2215,7 +2215,11 @@ static NSColor *shadowCol;
// font and formatter.
[aCoder encodeObject: [self font] forKey: @"NSSupport"];
[aCoder encodeObject: [self formatter] forKey: @"NSFormatter"];
if([self formatter])
{
[aCoder encodeObject: [self formatter] forKey: @"NSFormatter"];
}
}
else
{

6
Source/NSMenu.m
View file

@ -1217,6 +1217,12 @@ static NSNotificationCenter *nc;
{
[encoder encodeObject: _title forKey: @"NSTitle"];
[encoder encodeObject: _items forKey: @"NSMenuItems"];
// if there is no supermenu, make it the main menu.
if([self supermenu] == nil)
{
[encoder encodeObject: @"_NSMainMenu" forKey: @"NSName"];
}
}
else
{

33
Source/NSTableView.m
View file

@ -5129,18 +5129,39 @@ static inline float computePeriod(NSPoint mouseLocationWin,
// make sure the corner view is properly encoded...
[super encodeWithCoder: aCoder];
[aCoder encodeObject: [self dataSource] forKey: @"NSDataSource"];
[aCoder encodeObject: [self delegate] forKey: @"NSDelegate"];
[aCoder encodeObject: [self target] forKey: @"NSTarget"];
[aCoder encodeObject: NSStringFromSelector([self action]) forKey: @"NSAction"];
if([self dataSource])
{
[aCoder encodeObject: [self dataSource] forKey: @"NSDataSource"];
}
if([self delegate])
{
[aCoder encodeObject: [self delegate] forKey: @"NSDelegate"];
}
if([self target])
{
[aCoder encodeObject: [self target] forKey: @"NSTarget"];
}
if([self action])
{
[aCoder encodeObject: NSStringFromSelector([self action]) forKey: @"NSAction"];
}
[aCoder encodeObject: [self backgroundColor] forKey: @"NSBackgroundColor"];
[aCoder encodeObject: [self gridColor] forKey: @"NSGridColor"];
[aCoder encodeFloat: intercellSpacing.height forKey: @"NSIntercellSpacingHeight"];
[aCoder encodeFloat: intercellSpacing.width forKey: @"NSIntercellSpacingWidth"];
[aCoder encodeFloat: [self rowHeight] forKey: @"NSRowHeight"];
[aCoder encodeObject: [self tableColumns] forKey: @"NSTableColumns"];
[aCoder encodeObject: _headerView forKey: @"NSHeaderView"];
[aCoder encodeObject: _cornerView forKey: @"NSCornerView"];
if(_headerView)
{
[aCoder encodeObject: _headerView forKey: @"NSHeaderView"];
}
if(_cornerView)
{
[aCoder encodeObject: _cornerView forKey: @"NSCornerView"];
}
tableViewFlags.columnSelection = [self allowsColumnSelection];
tableViewFlags.multipleSelection = [self allowsMultipleSelection];