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

Initialise _selected_item. Patch by Wolfgang Lux

Browse source 
<wolfgang.lux@gmail.com>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24698 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-02-27 10:47:52 +00:00
parent 701853d407
commit f6edff004f
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-02-27 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTabViewItem.m (-initWithFrame:): Set _selected_item to NSNotFound.
* Source/NSTabViewItem.m (-selectNextTabViewItem:,
-selectPreviousTabViewItem:): Handle _selected_item being
NSNotFound correctly. Patch by Wolfgang Lux <wolfgang.lux@gmail.com>.
2007-02-26 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLayoutManager.m: ([drawGlyphsForGlyphRange:atPoint:])

24
Source/NSTabView.m
View file

@ -48,6 +48,7 @@
// setup variables
ASSIGN(_items, [NSMutableArray array]);
ASSIGN(_font, [NSFont systemFontOfSize: 0]);
_selected_item = NSNotFound;
//_selected = nil;
//_truncated_label = NO;
}
@ -171,19 +172,23 @@
- (void) selectNextTabViewItem: (id)sender
{
if ((unsigned)(_selected_item + 1) < [_items count])
[self selectTabViewItemAtIndex: _selected_item+1];
if ((_selected_item != NSNotFound) && ((unsigned)(_selected_item + 1) < [_items count]))
{
[self selectTabViewItemAtIndex: _selected_item + 1];
}
}
- (void) selectPreviousTabViewItem: (id)sender
{
if (_selected_item > 0)
[self selectTabViewItemAtIndex: _selected_item-1];
if ((_selected_item != NSNotFound) && (_selected_item > 0))
{
[self selectTabViewItemAtIndex: _selected_item - 1];
}
}
- (NSTabViewItem*) selectedTabViewItem
{
// FIXME: Why not return _selected?
// FIXME: Why not just return _selected?
if (_selected_item == NSNotFound || [_items count] == 0)
return nil;
return [_items objectAtIndex: _selected_item];
@ -251,9 +256,10 @@
[self selectTabViewItem: [_items objectAtIndex: index]];
}
- (void) selectTabViewItemWithIdentifier:(id)identifier
- (void) selectTabViewItemWithIdentifier: (id)identifier
{
int index = [self indexOfTabViewItemWithIdentifier: identifier];
[self selectTabViewItemAtIndex: index];
}
@ -862,7 +868,11 @@
}
if ([aDecoder containsValueForKey: @"NSTvFlags"])
{
unsigned int type = [aDecoder decodeIntForKey: @"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)
{