# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1299073384 0 # Node ID 5fe12469c1fbc45e53a075070b3b01e91a98d9e7 # Parent db315779a283322de0c26c91fc88a38c42f49b66 Fix for dw_window_set/get_data() on a top-level window. diff -r db315779a283 -r 5fe12469c1fb mac/dw.m --- a/mac/dw.m Wed Mar 02 05:53:27 2011 +0000 +++ b/mac/dw.m Wed Mar 02 13:43:04 2011 +0000 @@ -5653,7 +5653,12 @@ void dw_window_set_data(HWND window, char *dataname, void *data) { id object = window; - if([object isMemberOfClass:[NSScrollView class]]) + if([object isMemberOfClass:[NSWindow class]]) + { + NSWindow *win = window; + object = [win contentView]; + } + else if([object isMemberOfClass:[NSScrollView class]]) { NSScrollView *sv = window; object = [sv documentView]; @@ -5690,7 +5695,12 @@ void *dw_window_get_data(HWND window, char *dataname) { id object = window; - if([object isMemberOfClass:[NSScrollView class]]) + if([object isMemberOfClass:[NSWindow class]]) + { + NSWindow *win = window; + object = [win contentView]; + } + else if([object isMemberOfClass:[NSScrollView class]]) { NSScrollView *sv = window; object = [sv documentView];