# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1307239058 0 # Node ID d91e09dc3865429d58c01ecd0b4f01c2a004ae3a # Parent efa7d527adea0a42a40bdb5f486abb0533566cfb Fix for the item data field of the context event always being NULL even for tree items on Mac. diff -r efa7d527adea -r d91e09dc3865 mac/dw.m --- a/mac/dw.m Thu Jun 02 23:55:38 2011 +0000 +++ b/mac/dw.m Sun Jun 05 01:57:38 2011 +0000 @@ -334,6 +334,15 @@ char *text = (char *)event; void *user = NULL; LONG x,y; + + /* Fill in both items for the tree */ + if([object isKindOfClass:[NSOutlineView class]]) + { + id item = event; + NSString *nstr = [item pointerAtIndex:1]; + text = (char *)[nstr UTF8String]; + user = [item pointerAtIndex:2]; + } dw_pointer_query_pos(&x, &y); @@ -1792,8 +1801,7 @@ NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil]; row = (int)[self rowAtPoint:where]; id item = [self itemAtRow:row]; - NSString *nstr = [item pointerAtIndex:1]; - _event_handler(self, (NSEvent *)[nstr UTF8String], 10); + _event_handler(self, (NSEvent *)item, 10); return nil; } -(NSScrollView *)scrollview { return scrollview; }