gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change values for NSTabViewType enumerator.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24806 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-03-07 23:15:07 +00:00
parent a0c83e671f
commit 4df49881f2
3 changed files with 55 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-03-08 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSTabView.h: Correct NSTabViewType enumerator to
match values from Apple.
* Source/NSTabView.m (-encodeWithCoder:, -initWithCoder:): Adopt
to new enum values.
2007-03-07 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSPrintPanel.m: The modal loop which displays the print

6
Headers/AppKit/NSTabView.h
View file

@ -34,12 +34,12 @@
typedef enum {
NSTopTabsBezelBorder,
NSLeftTabsBezelBorder,
NSBottomTabsBezelBorder,
NSRightTabsBezelBorder,
NSNoTabsBezelBorder,
NSNoTabsLineBorder,
NSNoTabsNoBorder,
NSLeftTabsBezelBorder,
NSRightTabsBezelBorder
NSNoTabsNoBorder
} NSTabViewType;
@class NSFont;

103
Source/NSTabView.m
View file

@ -39,6 +39,17 @@
@implementation NSTabView
/*
* Class methods
*/
+ (void) initialize
{
if (self == [NSTabView class])
{
[self setVersion: 2];
}
}
- (id) initWithFrame: (NSRect)rect
{
self = [super initWithFrame: rect];
@ -789,41 +800,14 @@
[super encodeWithCoder: aCoder];
if ([aCoder allowsKeyedCoding])
{
unsigned int type = 0;
// FIXME: We should change the enumerator to match the Apple values
switch(_type)
{
case NSTopTabsBezelBorder:
type = 0;
break;
case NSLeftTabsBezelBorder:
type = 1;
break;
case NSBottomTabsBezelBorder:
type = 2;
break;
case NSRightTabsBezelBorder:
type = 3;
break;
case NSNoTabsBezelBorder:
type = 4;
break;
case NSNoTabsLineBorder:
type = 5;
break;
case NSNoTabsNoBorder:
type = 6;
break;
default:
break;
}
unsigned int type = _type; // no flags set...
[aCoder encodeBool: [self allowsTruncatedLabels] forKey: @"NSAllowTruncatedLabels"];
[aCoder encodeBool: [self drawsBackground] forKey: @"NSDrawsBackground"];
[aCoder encodeObject: [self font] forKey: @"NSFont"];
[aCoder encodeObject: _items forKey: @"NSTabViewItems"];
[aCoder encodeObject: [self selectedTabViewItem] forKey: @"NSSelectedTabViewItem"];
[aCoder encodeInt: type forKey: @"NSTvFlags"]; // no flags set...
[aCoder encodeInt: type forKey: @"NSTvFlags"];
}
else
{
@ -869,45 +853,48 @@
if ([aDecoder containsValueForKey: @"NSTvFlags"])
{
int vFlags = [aDecoder decodeIntForKey: @"NSTvFlags"];
unsigned int type = (vFlags & 0x00000007);
[self setControlTint: ((vFlags & 0x70000000) >> 28)];
[self setControlSize: ((vFlags & 0x0c000000) >> 26)];
// FIXME: We should change the enumerator to match the Apple values
switch(type)
{
case 0:
_type = NSTopTabsBezelBorder;
break;
case 1:
_type = NSLeftTabsBezelBorder;
break;
case 2:
_type = NSBottomTabsBezelBorder;
break;
case 3:
_type = NSRightTabsBezelBorder;
break;
case 4:
_type = NSNoTabsBezelBorder;
break;
case 5:
_type = NSNoTabsLineBorder;
break;
case 6:
_type = NSNoTabsNoBorder;
break;
default:
_type = NSTopTabsBezelBorder;
break;
}
[self setTabViewType: (vFlags & 0x00000007)];
}
}
else
{
int version = [aDecoder versionForClassName: @"NSTabView"];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_items];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_font];
[aDecoder decodeValueOfObjCType: @encode(NSTabViewType) at: &_type];
if (version < 2)
{
switch(_type)
{
case 0:
_type = NSTopTabsBezelBorder;
break;
case 5:
_type = NSLeftTabsBezelBorder;
break;
case 1:
_type = NSBottomTabsBezelBorder;
break;
case 6:
_type = NSRightTabsBezelBorder;
break;
case 2:
_type = NSNoTabsBezelBorder;
break;
case 3:
_type = NSNoTabsLineBorder;
break;
case 4:
_type = NSNoTabsNoBorder;
break;
default:
break;
}
}
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
_delegate = [aDecoder decodeObject];