Mercurial > dwindows

changeset 872:13debcad9757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another test fix at reported crash in dw_window_default(). Also committed a change in compat when garbage collection is used.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 04 Apr 2011 22:40:42 +0000
parents b15ad609365e
children fe7a8dc9392c
files compat.c mac/dw.m
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/compat.c	Mon Apr 04 05:49:45 2011 +0000
+++ b/compat.c	Mon Apr 04 22:40:42 2011 +0000
@@ -42,7 +42,7 @@
 	nanosleep(&req, NULL);
 #else
 	usleep(period * 1000);
-#ifdef __MAC__
+#if defined(__MAC__) && !defined(GARBAGE_COLLECT)
     _dw_pool_drain();
 #endif
 #endif
--- a/mac/dw.m	Mon Apr 04 05:49:45 2011 +0000
+++ b/mac/dw.m	Mon Apr 04 22:40:42 2011 +0000
@@ -6577,8 +6577,9 @@
 void API dw_window_default(HWND handle, HWND defaultitem)
 {
     NSWindow *window = handle;
+    id object = defaultitem;
     
-    if([window isKindOfClass:[NSWindow class]] && defaultitem)
+    if([window isKindOfClass:[NSWindow class]] && [object isKindOfClass:[NSControl class]])
     {
         [window setInitialFirstResponder:defaultitem];
     }