Mercurial > dwindows

comparison mac/dw.m @ 681:5fe12469c1fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for dw_window_set/get_data() on a top-level window.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 02 Mar 2011 13:43:04 +0000
parents db315779a283
children de4aa126fb2f
comparison
equal deleted inserted replaced
680:db315779a283 681:5fe12469c1fb
5651 * data: User data to be passed to the handler function. 5651 * data: User data to be passed to the handler function.
5652 */ 5652 */
5653 void dw_window_set_data(HWND window, char *dataname, void *data) 5653 void dw_window_set_data(HWND window, char *dataname, void *data)
5654 { 5654 {
5655 id object = window; 5655 id object = window;
5656 if([object isMemberOfClass:[NSScrollView class]]) 5656 if([object isMemberOfClass:[NSWindow class]])
5657 {
5658 NSWindow *win = window;
5659 object = [win contentView];
5660 }
5661 else if([object isMemberOfClass:[NSScrollView class]])
5657 { 5662 {
5658 NSScrollView *sv = window; 5663 NSScrollView *sv = window;
5659 object = [sv documentView]; 5664 object = [sv documentView];
5660 } 5665 }
5661 WindowData *blah = (WindowData *)[object userdata]; 5666 WindowData *blah = (WindowData *)[object userdata];
5688 * data: User data to be passed to the handler function. 5693 * data: User data to be passed to the handler function.
5689 */ 5694 */
5690 void *dw_window_get_data(HWND window, char *dataname) 5695 void *dw_window_get_data(HWND window, char *dataname)
5691 { 5696 {
5692 id object = window; 5697 id object = window;
5693 if([object isMemberOfClass:[NSScrollView class]]) 5698 if([object isMemberOfClass:[NSWindow class]])
5699 {
5700 NSWindow *win = window;
5701 object = [win contentView];
5702 }
5703 else if([object isMemberOfClass:[NSScrollView class]])
5694 { 5704 {
5695 NSScrollView *sv = window; 5705 NSScrollView *sv = window;
5696 object = [sv documentView]; 5706 object = [sv documentView];
5697 } 5707 }
5698 WindowData *blah = (WindowData *)[object userdata]; 5708 WindowData *blah = (WindowData *)[object userdata];