mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-20 19:16:30 +00:00
Added NSPSMatrix private class, added GS specific keys to NSProgressIndicator for info that GS encodes, but Cocoa doesn't. All GS specific keys shall have GS* as the prefix. Implemented encodeWithCoder: in NSTableColumn and corrected NSTable encoding to correct problems during IB loading.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23265 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f2beece4f3
commit
74049ce6bc
7 changed files with 152 additions and 47 deletions
|
@ -5123,11 +5123,11 @@ static inline float computePeriod(NSPoint mouseLocationWin,
|
|||
{
|
||||
if ([aCoder allowsKeyedCoding])
|
||||
{
|
||||
unsigned int vFlags = 0; // (raw >> 26); // filter out settings not pertinent to us.
|
||||
unsigned long vFlags = 0;
|
||||
NSSize intercellSpacing = [self intercellSpacing];
|
||||
GSTableViewFlags tableViewFlags;
|
||||
|
||||
// make sure the corner view is properly encoded...
|
||||
[(NSKeyedArchiver *)aCoder setClassName: @"_NSCornerView" forClass: [GSTableCornerView class]];
|
||||
[super encodeWithCoder: aCoder];
|
||||
[aCoder encodeObject: [self dataSource] forKey: @"NSDataSource"];
|
||||
[aCoder encodeObject: [self delegate] forKey: @"NSDelegate"];
|
||||
|
@ -5139,25 +5139,17 @@ static inline float computePeriod(NSPoint mouseLocationWin,
|
|||
[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"];
|
||||
|
||||
tableViewFlags.columnSelection = [self allowsColumnSelection];
|
||||
tableViewFlags.multipleSelection = [self allowsMultipleSelection];
|
||||
tableViewFlags.emptySelection = [self allowsEmptySelection];
|
||||
tableViewFlags.drawsGrid = [self drawsGrid];
|
||||
tableViewFlags.columnResizing = [self allowsColumnResizing];
|
||||
tableViewFlags.columnOrdering = [self allowsColumnReordering];
|
||||
|
||||
if([self allowsColumnSelection])
|
||||
vFlags |= 1;
|
||||
|
||||
if([self allowsMultipleSelection])
|
||||
vFlags |= 2;
|
||||
|
||||
if([self allowsEmptySelection])
|
||||
vFlags |= 4;
|
||||
|
||||
if([self allowsColumnResizing])
|
||||
vFlags |= 16;
|
||||
|
||||
if([self allowsColumnReordering])
|
||||
vFlags |= 32;
|
||||
|
||||
// shift...
|
||||
vFlags = vFlags << 26;
|
||||
vFlags |= 0x2400000; // add the constant...
|
||||
memcpy((void *)&vFlags,(void *)&tableViewFlags,sizeof(unsigned long));
|
||||
|
||||
// encode..
|
||||
[aCoder encodeInt: vFlags forKey: @"NSTvFlags"];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue