dwindows: mac/dw.m comparison

comparison mac/dw.m @ 669:62aae18e7b7d

Implemented most of the listbox functions for the actual listbox control... previously it was just for comboboxes. Also added pointer/cursor support.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 27 Feb 2011 06:00:49 +0000
parents	7b99731c6484
children	0b920d0dc13e

comparison

equal deleted inserted replaced

-:7b99731c6484
+:62aae18e7b7d
 			{
 				int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
 				return clickfunc(object, handler->data);
 			}
+case 9:
+{
+int (*containerselectfunc)(HWND, char *, void *) = handler->signalfunction;
+return containerselectfunc(handler->window, (char *)event, handler->data);
+}
 			case 10:
 			{
 				int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction;
 				char *text = (char *)event;
 				void *user = NULL;
 	int lastAddPoint;
 id scrollview;
 }
 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable;
 -(id)tableView:(NSTableView *)aTable objectValueForTableColumn:(NSTableColumn *)aCol row:(NSInteger)aRow;
--(void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
+/*-(void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;*/
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(id)scrollview;
 -(void)setScrollview:(id)input;
 -(void)addColumn:(NSTableColumn *)input andType:(int)type;
 -(int)addRows:(int)number;
 -(void)editCell:(id)input at:(int)row and:(int)col;
 -(void)removeRow:(int)row;
 -(void)setRow:(int)row title:(void *)input;
 -(void *)getRowTitle:(int)row;
+-(id)getRow:(int)row and:(int)col;
 -(int)cellType:(int)col;
 -(int)lastAddPoint;
 -(void)clear;
 -(void)setup;
 -(void)selectionChanged:(id)sender;
 			return ([this isKindOfClass:[NSNull class]]) ? nil : this;
 		}
 	}
 	return nil;
 }
--(void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+/*-(void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
 {
 	if(tvcols)
 	{
 		int z, col = -1;
 		int count = (int)[tvcols count];
 		{
 			int index = (int)(rowIndex * count) + col;
 			[data replaceObjectAtIndex:index withObject:anObject];
 		}
 	}
-}
+}*/
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(NSScrollView *)scrollview { return scrollview; }
 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
 -(void)addColumn:(NSTableColumn *)input andType:(int)type { if(tvcols) { [tvcols addObject:input]; [types addObject:[NSNumber numberWithInt:type]]; } }
--(int)addRow:(NSArray *)input { if(data) { [data addObjectsFromArray:input]; [titles addPointer:NULL]; return (int)[titles count]; } return 0; }
+-(int)addRow:(NSArray *)input { if(data) { lastAddPoint = (int)[titles count]; [data addObjectsFromArray:input]; [titles addPointer:NULL]; return (int)[titles count]; } return 0; }
 -(int)addRows:(int)number
 {
 	if(tvcols)
 	{
 		int count = (int)number * [tvcols count];
 		}
 	}
 }
 -(void)setRow:(int)row title:(void *)input { if(titles && input) { [titles replacePointerAtIndex:row withPointer:input]; } }
 -(void *)getRowTitle:(int)row { if(titles) { return [titles pointerAtIndex:row]; } return NULL; }
+-(id)getRow:(int)row and:(int)col { if(data) { int index = (int)(row * [tvcols count]) + col; return [data objectAtIndex:index]; } return nil; }
 -(int)cellType:(int)col { return [[types objectAtIndex:col] intValue]; }
 -(int)lastAddPoint { return lastAddPoint; }
 -(void)clear { if(data) { [data removeAllObjects]; while([titles count]) { [titles removePointerAtIndex:0]; } } lastAddPoint = 0; }
 -(void)setup
 {
 	titles = [NSPointerArray pointerArrayWithWeakObjects];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectionChanged:) name:NSTableViewSelectionDidChangeNotification object:[self window]];
 }
 -(void)selectionChanged:(id)sender
 {
-	_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 12);
+	_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 9);
 }
 -(NSMenu *)menuForEvent:(NSEvent *)event
 {
 	int row;
 	NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
 	/* Free the old data */
 if(thisbox->count)
 free(thisitem);
 }
+HWND _button_new(char *text, ULONG id)
+{
+	DWButton *button = [[DWButton alloc] init];
+	if(text && *text)
+	{
+		[button setTitle:[ NSString stringWithUTF8String:text ]];
+	}
+	[button setTarget:button];
+	[button setAction:@selector(buttonClicked:)];
+	[button setTag:id];
+	[button setButtonType:NSMomentaryPushInButton];
+	[button setBezelStyle:NSThickerSquareBezelStyle];
+return button;
+}
 /*
 * Create a new button window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_button_new(char *text, ULONG id)
 {
-	DWButton *button = [[DWButton alloc] init];
+DWButton *button = _button_new(text, id);
-	if(text && *text)
+[button setButtonType:NSMomentaryPushInButton];
-	{
+[button setBezelStyle:NSRoundedBezelStyle];
-		[button setTitle:[ NSString stringWithUTF8String:text ]];
+[button setImagePosition:NSNoImage];
-	}
+[button setAlignment:NSCenterTextAlignment];
-	[button setButtonType:NSMomentaryPushInButton];
+[[button cell] setControlTint:NSBlueControlTint];
-	[button setBezelStyle:NSThickerSquareBezelStyle];
-	[button setTarget:button];
-	[button setAction:@selector(buttonClicked:)];
-	/*[button setGradientType:NSGradientConvexWeak];*/
-	[button setTag:id];
 	return button;
 }
 /*
 * Create a new Entryfield window (widget) to be packed.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 */
 HWND API dw_bitmapbutton_new_from_file(char *text, unsigned long id, char *filename)
 {
 	NSImage *image = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
-	DWButton *button = dw_button_new("", id);
+	DWButton *button = _button_new("", id);
 	[button setImage:image];
 	return button;
 }
 /*
 */
 HWND API dw_bitmapbutton_new_from_data(char *text, unsigned long id, char *data, int len)
 {
 	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
 	NSImage *image = [[NSImage alloc] initWithData:thisdata];
-	DWButton *button = dw_button_new("", id);
+	DWButton *button = _button_new("", id);
 	[button setImage:image];
 	return button;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_radiobutton_new(char *text, ULONG id)
 {
-	DWButton *button = dw_button_new(text, id);
+	DWButton *button = _button_new(text, id);
 	[button setButtonType:NSRadioButton];
 	return button;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_checkbox_new(char *text, ULONG id)
 {
-	DWButton *button = dw_button_new(text, id);
+	DWButton *button = _button_new(text, id);
 	[button setButtonType:NSSwitchButton];
 	[button setBezelStyle:NSRegularSquareBezelStyle];
 	return button;
 }
 	{
 		DWComboBox *combo = handle;
 		[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+NSString *nstr = [ NSString stringWithUTF8String:text ];
+NSArray *newrow = [NSArray arrayWithObject:nstr];
+[cont addRow:newrow];
+[newrow release];
+}
 }
 /*
 * Inserts the specified text into the listbox's (or combobox) entry list.
 * Parameters:
 	{
 		DWComboBox *combo = handle;
 		[combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+NSLog(@"dw_listbox_insert() unimplemented\n");
+}
 }
 /*
 * Appends the specified text items to the listbox's (or combobox) entry list.
 * Parameters:
 		for(z=0;z<count;z++)
 		{
 			[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
 		}
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+		int z;
+		for(z=0;z<count;z++)
+		{
+NSString *nstr = [ NSString stringWithUTF8String:text[z] ];
+NSArray *newrow = [[NSArray alloc] arrayWithObject:nstr];
+[cont addRow:newrow];
+[newrow release];
+}
+}
 }
 /*
 * Clears the listbox's (or combobox) list of all entries.
 * Parameters:
 	{
 		DWComboBox *combo = handle;
 		[combo removeAllItems];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+[cont clear];
+}
 }
 /*
 * Returns the listbox's item count.
 * Parameters:
 	{
 		DWComboBox *combo = handle;
 		return (int)[combo numberOfItems];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+return (int)[cont numberOfRowsInTableView:cont];
+}
 	return 0;
 }
 /*
 * Sets the topmost item in the viewport.
 	{
 		DWComboBox *combo = handle;
 		[combo scrollItemAtIndexToTop:top];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+[cont scrollRowToVisible:top];
+}
 }
 /*
 * Copies the given index item's text into buffer.
 * Parameters:
 	{
 		DWComboBox *combo = handle;
 		NSString *nstr = [combo itemObjectValueAtIndex:index];
 		strncpy(buffer, [ nstr UTF8String ], length - 1);
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+NSString *nstr = [cont getRow:index and:0];
+strncpy(buffer, [ nstr UTF8String ], length - 1);
+}
 }
 /*
 * Sets the text of a given listbox entry.
 * Parameters:
 		DWComboBox *combo = handle;
 		[combo removeItemAtIndex:index];
 		[combo insertItemWithObjectValue:[ NSString stringWithUTF8String:buffer ] atIndex:index];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+NSString *nstr = [ NSString stringWithUTF8String:buffer ];
+[cont editCell:nstr at:index and:0];
+}
 }
 /*
 * Returns the index to the item in the list currently selected.
 * Parameters:
 	if([object isMemberOfClass:[DWComboBox class]])
 	{
 		DWComboBox *combo = handle;
 		return (int)[combo indexOfSelectedItem];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+return (int)[cont selectedRow];
+}
 	return -1;
 }
 /*
 * Returns the index to the current selected item or -1 when done.
 *          handle: Handle to the listbox to be queried.
 *          where: Either the previous return or -1 to restart.
 */
 int API dw_listbox_selected_multi(HWND handle, int where)
 {
-	NSLog(@"dw_listbox_selected_multi() unimplemented\n");
+	id object = handle;
-	return 0;
+int retval = -1;
+if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+NSIndexSet *selected = [cont selectedRowIndexes];
+NSUInteger result = [selected indexGreaterThanIndex:where];
+if(result != NSNotFound)
+{
+retval = (int)result;
+}
+[selected release];
+}
+	return retval;
 }
 /*
 * Sets the selection state of a given index.
 * Parameters:
 		if(state)
 			[combo selectItemAtIndex:index];
 		else
 			[combo deselectItemAtIndex:index];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
+[cont selectRowIndexes:selected byExtendingSelection:YES];
+[selected release];
+}
 }
 /*
 * Deletes the item with given index from the list.
 * Parameters:
 	{
 		DWComboBox *combo = handle;
 		[combo removeItemAtIndex:index];
 	}
+else if([object isMemberOfClass:[DWContainer class]])
+{
+DWContainer *cont = handle;
+[cont removeRow:index];
+}
 }
 /*
 * Create a new Combobox window (widget) to be packed.
 * Parameters:
 */
 unsigned long API dw_color_choose(unsigned long value)
 {
 	/* Create the File Save Dialog class. */
 	DWColorChoose *colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel];
-	NSColor *color = [[[NSColor alloc] init] autorelease];
+NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
 	DWDialog *dialog = dw_dialog_new(colorDlg);
 	/* Set defaults for the dialog. */
 	[colorDlg setColor:color];
 	[colorDlg setDialog:dialog];
 *       handle: Handle to widget for which to change.
 *       cursortype: ID of the pointer you want.
 */
 void API dw_window_set_pointer(HWND handle, int pointertype)
 {
-	NSLog(@"dw_window_set_pointer() unimplemented\n");
+id object = handle;
+	if([ object isKindOfClass:[ NSView class ] ])
+	{
+		NSView *view = handle;
+if(pointertype == DW_POINTER_DEFAULT)
+{
+[view discardCursorRects];
+}
+else if(pointertype == DW_POINTER_ARROW)
+{
+NSRect rect = [view frame];
+NSCursor *cursor = [NSCursor arrowCursor];
+[view addCursorRect:rect cursor:cursor];
+}
+/* No cursor for DW_POINTER_CLOCK? */
+}
 }
 /*
 * Makes the window visible.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 669:62aae18e7b7d