NSPopUpButton now works. NSTabView taking shape.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4436 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Michael Silva 1999-06-20 10:13:34 +00:00
parent 24883840fc
commit 37753e0ffa
7 changed files with 101 additions and 11 deletions

View file

@ -34,6 +34,7 @@
#include <AppKit/NSPopUpButtonCell.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSMenu.h>
#include <AppKit/NSFont.h>
@implementation NSPopUpButtonMatrix
- (id) initWithFrame: (NSRect)rect
@ -57,8 +58,6 @@
{
id menuCell = [[NSPopUpButtonCell new] autorelease];
NSLog(@"insertItem.\n");
[menuCell setFont:[NSFont systemFontOfSize:12]];
[menuCell setTitle: aString];
// [menuCell setAction: aSelector];
@ -78,6 +77,11 @@
{
return [[cells objectAtIndex:selected_cell] title];
}
- (void)setPopUpButton:(NSPopUpButton *)popb
{
ASSIGN(popup_button, popb);
}
@end
//
@ -116,6 +120,7 @@
{
[super initWithFrame:frameRect];
list_items = [[NSPopUpButtonMatrix alloc] initWithFrame:frameRect];
[list_items setPopUpButton:self];
is_up = NO;
pulls_down = flag;
selected_item = 0;
@ -152,6 +157,19 @@
pub_target = anObject;
}
- (void)buttonSelected:(id)sender
{
selected_item = [self indexOfItemWithTitle:[sender title]];
[self synchronizeTitleAndSelectedItem];
[self drawRect:[self frame]];
[self setNeedsDisplay:YES];
if (pub_target && pub_action)
[pub_target performSelector:pub_action withObject:self];
}
//
// Adding Items
//
@ -350,12 +368,10 @@
//
- (void)mouseDown:(NSEvent *)theEvent
{
NSLog(@"mouseDown:");
}
- (void)mouseUp:(NSEvent *)theEvent
{
NSLog(@"mouseUp:");
}
- (void)mouseMoved:(NSEvent *)theEvent
@ -364,8 +380,6 @@
- (NSView *)hitTest:(NSPoint)aPoint
{
NSLog(@"hitTest:");
// First check ourselves
// if ([self mouse:aPoint inRect:bounds]) return self;
if ([self mouse:aPoint inRect:[self frame]]) return self;