dwindows: mac/dw.m comparison

comparison mac/dw.m @ 682:de4aa126fb2f

Fixes for tree packing and a data source issue. Implemented most of the missing tree functions.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 02 Mar 2011 17:29:33 +0000
parents	5fe12469c1fb
children	7385011c3327

comparison

equal deleted inserted replaced

-:5fe12469c1fb
+:de4aa126fb2f
 	return nil;
 }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
+/* Dive into the tree showing all nodes */
+void _free_tree_recurse(NSMutableArray *node, NSPointerArray *item)
+{
+if(node)
+{
+int count = (int)[node count];
+int z;
+for(z=0;z<count;z++)
+{
+NSPointerArray *pnt = [node objectAtIndex:z];
+NSMutableArray *children = (NSMutableArray *)[pnt pointerAtIndex:3];
+if(children)
+{
+if(item == pnt)
+{
+_free_tree_recurse(children, NULL);
+}
+else
+{
+_free_tree_recurse(children, item);
+}
+}
+if(!item || item == pnt)
+{
+[pnt release];
+}
+}
+}
+if(!item)
+{
+[node release];
+}
+}
 /* Subclass for a Tree type */
 @interface DWTree : NSOutlineView <NSOutlineViewDataSource>
 {
 	void *userdata;
 	NSTableColumn *imagecol;
 -(void)addTree:(NSPointerArray *)item and:(NSPointerArray *)parent;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(NSScrollView *)scrollview;
 -(void)setScrollview:(NSScrollView *)input;
+-(void)deleteNode:(NSPointerArray *)item;
+-(void)clear;
 @end
 @implementation DWTree
 -(id)init
 {
 [imagecol setResizingMask:NSTableColumnNoResizing];
 [imagecol setWidth:20];
 [self addTableColumn:imagecol];
 textcol = [[NSTableColumn alloc] init];
 [self addTableColumn:textcol];
+[self setOutlineTableColumn:textcol];
 }
 return self;
 }
 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
 {
-	if (item)
+	if(item)
 {
 NSMutableArray *array = [item pointerAtIndex:3];
 		return array ? [array objectAtIndex:index] : nil;
 	}
 	else
 }
 else
 {
 if(!data)
 {
-data = [[NSMutableArray alloc] init];
+children = data = [[NSMutableArray alloc] init];
 }
 }
 [children addObject:item];
 }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(NSScrollView *)scrollview { return scrollview; }
 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
+-(void)deleteNode:(NSPointerArray *)item { _free_tree_recurse(data, item); }
+-(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
+-(void)dealloc
+{
+UserData *root = userdata;
+_remove_userdata(&root, NULL, TRUE);
+_free_tree_recurse(data, NULL);
+[imagecol release];
+[textcol release];
+[super dealloc];
+}
 @end
 /* Subclass for a Calendar type */
 @interface DWCalendar : NSDatePicker
 {
 	if([ object isKindOfClass:[ DWContainer class ] ])
 	{
 		DWContainer *cont = item;
 		this = item = [cont scrollview];
 	}
+	else if([ object isKindOfClass:[ DWTree class ] ])
+	{
+		DWTree *tree = item;
+		this = item = [tree scrollview];
+	}
 	/* Duplicate the existing data */
 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 for(z=0;z<thisbox->count;z++)
 	/* Query the objects */
 	if([ object isKindOfClass:[ DWContainer class ] ])
 	{
 		DWContainer *cont = item;
 		this = item = [cont scrollview];
+	}
+	else if([ object isKindOfClass:[ DWTree class ] ])
+	{
+		DWTree *tree = item;
+		this = item = [tree scrollview];
 	}
 	/* Duplicate the existing data */
 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 */
 void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon)
 {
-	NSLog(@"dw_tree_item_change() unimplemented\n");
+DWTree *tree = handle;
+NSPointerArray *array = (NSPointerArray *)item;
+if(title)
+{
+NSString *nstr = [NSString stringWithUTF8String:title];
+[array replacePointerAtIndex:1 withPointer:nstr];
+}
+if(icon)
+{
+[array replacePointerAtIndex:0 withPointer:icon];
+}
+[tree reloadData];
 }
 /*
 * Sets the item data of a tree item.
 * Parameters:
 *          item: Handle of the item to be modified.
 *          itemdata: User defined data to be associated with item.
 */
 void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata)
 {
-	NSLog(@"dw_tree_item_set_data() unimplemented\n");
+NSPointerArray *array = (NSPointerArray *)item;
+[array replacePointerAtIndex:2 withPointer:itemdata];
 }
 /*
 * Gets the item data of a tree item.
 * Parameters:
 *          handle: Handle to the tree containing the item.
 *          item: Handle of the item to be modified.
 */
 void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_item_get_data() unimplemented\n");
+NSPointerArray *array = (NSPointerArray *)item;
-	return NULL;
+return [array pointerAtIndex:2];
 }
 /*
 * Sets this item as the active selection.
 * Parameters:
 *       handle: Handle to the tree window (widget) to be selected.
 *       item: Handle to the item to be selected.
 */
 void API dw_tree_item_select(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_item_select() unimplemented\n");
+DWTree *tree = handle;
+NSInteger itemIndex = [tree rowForItem:item];
+if(itemIndex > -1)
+{
+[tree selectRowIndexes:[NSIndexSet indexSetWithIndex:itemIndex] byExtendingSelection:NO];
+}
 }
 /*
 * Removes all nodes from a tree.
 * Parameters:
 *       handle: Handle to the window (widget) to be cleared.
 */
 void API dw_tree_clear(HWND handle)
 {
-	NSLog(@"dw_tree_clear() unimplemented\n");
+DWTree *tree = handle;
+[tree clear];
 }
 /*
 * Expands a node on a tree.
 * Parameters:
 *       handle: Handle to the tree window (widget).
 *       item: Handle to node to be expanded.
 */
 void API dw_tree_item_expand(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_item_expand() unimplemented\n");
+DWTree *tree = handle;
+[tree expandItem:item];
 }
 /*
 * Collapses a node on a tree.
 * Parameters:
 *       handle: Handle to the tree window (widget).
 *       item: Handle to node to be collapsed.
 */
 void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_item_collapse() unimplemented\n");
+DWTree *tree = handle;
+[tree collapseItem:item];
 }
 /*
 * Removes a node from a tree.
 * Parameters:
 *       handle: Handle to the window (widget) to be cleared.
 *       item: Handle to node to be deleted.
 */
 void API dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_item_delete() unimplemented\n");
+DWTree *tree = handle;
+[tree deleteNode:item];
+[tree reloadData];
 }
 /*
 * Create a container object to be packed.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 682:de4aa126fb2f