Mercurial > dwindows

changeset 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
files mac/dw.m
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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];