dwindows: mac/dw.m comparison

comparison mac/dw.m @ 675:48f8efba898f

Filled in most of the remaining MLE and container functions... the remaining few may not be possible. A few of the functions still don't work perfectly.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 28 Feb 2011 08:27:53 +0000
parents	78f9aa6d6d89
children	9861d264925d

comparison

equal deleted inserted replaced

-:78f9aa6d6d89
+:48f8efba898f
 	void *userdata;
 	NSMutableArray *tvcols;
 	NSMutableArray *data;
 	NSMutableArray *types;
 	NSPointerArray *titles;
-	int lastAddPoint;
+	int lastAddPoint, lastQueryPoint;
 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 *)userdata;
 -(void)setUserdata:(void *)input;
 -(id)scrollview;
 -(void)setScrollview:(id)input;
 -(void)addColumn:(NSTableColumn *)input andType:(int)type;
+-(NSTableColumn *)getColumn:(int)col;
 -(int)addRow:(NSArray *)input;
 -(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;
+-(int)lastQueryPoint;
+-(void)setLastQueryPoint:(int)input;
 -(void)clear;
 -(void)setup;
 -(void)selectionChanged:(id)sender;
 -(NSMenu *)menuForEvent:(NSEvent *)event;
 @end
 -(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]]; } }
+-(NSTableColumn *)getColumn:(int)col { if(tvcols) { return [tvcols objectAtIndex:col]; } return nil; }
 -(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];
+		int count = (int)(number * [tvcols count]);
 		int z;
 		lastAddPoint = (int)[titles count];
 		for(z=0;z<count;z++)
 -(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; }
+-(int)lastQueryPoint { return lastQueryPoint; }
+-(void)setLastQueryPoint:(int)input { lastQueryPoint = input; }
 -(void)clear { if(data) { [data removeAllObjects]; while([titles count]) { [titles removePointerAtIndex:0]; } } lastAddPoint = 0; }
 -(void)setup
 {
 	tvcols = [[NSMutableArray alloc] init];
 	data = [[NSMutableArray alloc] init];
 *          startpoint: Point to start entering text.
 */
 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
 {
 	DWMLE *mle = handle;
-	[mle insertText:[ NSString stringWithUTF8String:buffer ]];
+NSTextStorage *ts = [mle textStorage];
+NSString *nstr = [NSString stringWithUTF8String:buffer];
+NSMutableString *ms = [ts mutableString];
+[ms insertString:nstr atIndex:(startpoint+1)];
 	return (unsigned int)strlen(buffer) + startpoint;
 }
 /*
 * Grabs text from an MLE box.
 *          startpoint: Point to start grabbing text.
 *          length: Amount of text to be grabbed.
 */
 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
 {
-	NSLog(@"dw_mle_export() unimplemented\n");
+	DWMLE *mle = handle;
+NSTextStorage *ts = [mle textStorage];
+NSMutableString *ms = [ts mutableString];
+strncpy(buffer, [ms UTF8String], length);
 }
 /*
 * Obtains information about an MLE box.
 * Parameters:
 *          bytes: A pointer to a variable to return the total bytes.
 *          lines: A pointer to a variable to return the number of lines.
 */
 void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
-	NSLog(@"dw_mle_get_size() unimplemented\n");
+	DWMLE *mle = handle;
+NSTextStorage *ts = [mle textStorage];
+NSMutableString *ms = [ts mutableString];
+*bytes = [ms length];
+*lines = 0; /* TODO: Line count */
 }
 /*
 * Deletes text from an MLE box.
 * Parameters:
 *          startpoint: Point to start deleting text.
 *          length: Amount of text to be deleted.
 */
 void API dw_mle_delete(HWND handle, int startpoint, int length)
 {
-	NSLog(@"dw_mle_delete() unimplemented\n");
+	DWMLE *mle = handle;
+NSTextStorage *ts = [mle textStorage];
+NSMutableString *ms = [ts mutableString];
+[ms deleteCharactersInRange:NSMakeRange(startpoint+1, length)];
 }
 /*
 * Clears all text from an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to be cleared.
 */
 void API dw_mle_clear(HWND handle)
 {
-	NSLog(@"dw_mle_clear() unimplemented\n");
+	DWMLE *mle = handle;
+NSTextStorage *ts = [mle textStorage];
+NSMutableString *ms = [ts mutableString];
+NSUInteger length = [ms length];
+[ms deleteCharactersInRange:NSMakeRange(0, length)];
 }
 /*
 * Sets the visible line of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to be positioned.
 *          line: Line to be visible.
 */
 void API dw_mle_set_visible(HWND handle, int line)
 {
-	NSLog(@"dw_mle_clear() unimplemented\n");
+	NSLog(@"dw_mle_set_visible() unimplemented\n");
 }
 /*
 * Sets the editablity of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE.
 *          state: TRUE if it wraps, FALSE if it doesn't.
 */
 void API dw_mle_set_word_wrap(HWND handle, int state)
 {
-	NSLog(@"dw_mle_set_word_wrap() unimplemented\n");
+DWMLE *mle = handle;
+if(state)
+{
+[mle setHorizontallyResizable:NO];
+}
+else
+{
+[mle setHorizontallyResizable:YES];
+}
 }
 /*
 * Sets the current cursor position of an MLE box.
 * Parameters:
 * Parameters:
 *          handle: Handle to the MLE to freeze.
 */
 void API dw_mle_freeze(HWND handle)
 {
-	NSLog(@"dw_mle_freeze() unimplemented\n");
+	/* Don't think this is necessary */
 }
 /*
 * Resumes redrawing of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to thaw.
 */
 void API dw_mle_thaw(HWND handle)
 {
-	NSLog(@"dw_mle_thaw() unimplemented\n");
+	/* Don't think this is necessary */
 }
 /*
 * Create a new status text window (widget) to be packed.
 * Parameters:
 		[[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
 if(flags[z] & DW_CFA_BITMAPORICON)
 {
 NSImageCell *imagecell = [[[NSImageCell alloc] init] autorelease];
 [column setDataCell:imagecell];
+if(z == 0 && titles[z] && strcmp(titles[z], "Icon") == 0)
+{
+[column setResizingMask:NSTableColumnNoResizing];
+[column setWidth:20];
+}
 }
 		[cont addTableColumn:column];
 		[cont addColumn:column andType:(int)flags[z]];
 	}
 *          column: Zero based column of width being set.
 *          width: Width of column in pixels.
 */
 void API dw_container_set_column_width(HWND handle, int column, int width)
 {
-	NSLog(@"dw_container_set_column_width() unimplemented\n");
+DWContainer *cont = handle;
+NSTableColumn *col = [cont getColumn:column];
+[col setWidth:width];
 }
 /*
 * Sets the title of a row in the container.
 * Parameters:
 *       handle: Handle to the window (widget) to be deleted from.
 *       rowcount: The number of rows to be deleted.
 */
 void API dw_container_delete(HWND handle, int rowcount)
 {
-	NSLog(@"dw_container_delete() unimplemented\n");
+DWContainer *cont = handle;
+int x;
+for(x=0;x<rowcount;x++)
+{
+[cont removeRow:0];
+}
 }
 /*
 * Scrolls container up or down.
 * Parameters:
 *              return items that are currently selected.  Otherwise
 *              it will return all records in the container.
 */
 char * API dw_container_query_start(HWND handle, unsigned long flags)
 {
-	NSLog(@"dw_container_query_start() unimplemented\n");
+DWContainer *cont = handle;
-	return NULL;
+NSIndexSet *selected = [cont selectedRowIndexes];
+NSUInteger result = [selected indexGreaterThanOrEqualToIndex:0];
+char *retval = NULL;
+if(result != NSNotFound)
+{
+retval = [cont getRowTitle:(int)result];
+[cont setLastQueryPoint:(int)result];
+}
+[selected release];
+	return retval;
 }
 /*
 * Continues an existing query of a container.
 * Parameters:
 *              return items that are currently selected.  Otherwise
 *              it will return all records in the container.
 */
 char * API dw_container_query_next(HWND handle, unsigned long flags)
 {
-	NSLog(@"dw_container_query_next() unimplemented\n");
+DWContainer *cont = handle;
-	return NULL;
+int lastQueryPoint = [cont lastQueryPoint];
+NSIndexSet *selected = [cont selectedRowIndexes];
+NSUInteger result = [selected indexGreaterThanIndex:lastQueryPoint];
+char *retval = NULL;
+if(result != NSNotFound)
+{
+retval = [cont getRowTitle:(int)result];
+[cont setLastQueryPoint:(int)result];
+}
+[selected release];
+	return retval;
 }
 /*
 * Cursors the item with the text speficied, and scrolls to that item.
 * Parameters:
 *       handle: Handle to the window (widget) to be queried.
 *       text:  Text usually returned by dw_container_query().
 */
 void API dw_container_cursor(HWND handle, char *text)
 {
-	NSLog(@"dw_container_cursor() unimplemented\n");
+DWContainer *cont = handle;
+char *thistext;
+int x, count = (int)[cont numberOfRowsInTableView:cont];
+for(x=0;x<count;x++)
+{
+thistext = [cont getRowTitle:x];
+if(thistext == text)
+{
+NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
+[cont selectRowIndexes:selected byExtendingSelection:YES];
+[selected release];
+}
+}
 }
 /*
 * Deletes the item with the text speficied.
 * Parameters:
 *       handle: Handle to the window (widget).
 *       text:  Text usually returned by dw_container_query().
 */
 void API dw_container_delete_row(HWND handle, char *text)
 {
-	NSLog(@"dw_container_delete_row() unimplemented\n");
+DWContainer *cont = handle;
+char *thistext;
+int x, count = (int)[cont numberOfRowsInTableView:cont];
+for(x=0;x<count;x++)
+{
+thistext = [cont getRowTitle:x];
+if(thistext == text)
+{
+[cont removeRow:x];
+return;
+}
+}
 }
 /*
 * Optimizes the column widths so that all data is visible.
 * Parameters:
 		tmp ^= mask;
 		tmp |= style;
 		[window setStyleMask:tmp];
 	}
+else if([object isMemberOfClass:[NSTextView class]])
+{
+NSTextView *tv = handle;
+[tv setAlignment:(style & mask)];
+}
 }
 /*
 * Sets the default focus item for a window/dialog.
 * Parameters:
 	{
 		NSImageView *iv = handle;
 		NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
 		NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
-		[iv setImage:pixmap];
+if(pixmap)
+{
+[iv setImage:pixmap];
+}
 	}
 }
 /*
 * Sets the bitmap used for a given static window.
 *           (pass 0 if you use the filename param)
 *       filename: a path to a file (Bitmap on OS/2 or
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 */
-void API dw_window_set_bitmap(HWND handle, unsigned long id, char *filename)
+void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename)
 {
 	NSObject *object = handle;
 	if([ object isKindOfClass:[ NSImageView class ] ])
 	{
 		NSImageView *iv = handle;
-		NSImage *pixmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
+NSImage *bitmap = NULL;
+if(filename)
+{
+bitmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
+}
+else if(resid > 0 && resid < 65536)
+{
+bitmap = dw_icon_load(0, resid);
+}
-		[iv setImage:pixmap];
+if(bitmap)
+{
+[iv setImage:bitmap];
+}
 	}
 }
 /*
 * Sets the icon used for a given window.

Mercurial > dwindows

comparison mac/dw.m @ 675:48f8efba898f