diff options
| author | forsyth <forsyth@vitanuova.com> | 2010-08-21 19:20:57 +0100 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2010-08-21 19:20:57 +0100 |
| commit | 43d5f895e7e089a8ca755eca0a19386de5f59f61 (patch) | |
| tree | ff4c557101257ee4b4d09f468adef388c30d126e | |
| parent | 5849851a19380dbb62a47d9c4d868a81e42fa79b (diff) | |
20100821-1920
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | libtk/NOTICE | 3 | ||||
| -rw-r--r-- | libtk/canvu.c | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,8 @@ +20100821 + correct handling of mouse focus in sub-widgets of widget windowed in canvas (soon, text widget) [issue 241] 20100819 failed to push Solaris/sparc/include/lib9.h with u64int change [issue 151] + appl/cmd/ar.b eliminate false error return 20100810 initial introduction of crypt-*(2) and ipints(2) replace keyring.m in module/runt.m by ipints.m and crypt.m; compensate in libinterp and libkeyring by using keyringif.m to generate Keyring's interface diff --git a/libtk/NOTICE b/libtk/NOTICE index a9a7616f..2b1c542d 100644 --- a/libtk/NOTICE +++ b/libtk/NOTICE @@ -8,7 +8,8 @@ file such as NOTICE, LICENCE or COPYING. Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited -Portions Copyright © 2000-2007 Vita Nuova Holdings Limited +Portions Copyright © 2000-2008 Vita Nuova Holdings Limited +Portions Copyright © 2010 Vita Nuova Holdings Limited This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License (`LGPL') as published by diff --git a/libtk/canvu.c b/libtk/canvu.c index f7e65a21..8671a11a 100644 --- a/libtk/canvu.c +++ b/libtk/canvu.c @@ -426,18 +426,14 @@ tkcvsdeliver(Tk *tk, TkCitem *i, int event, void *data) if(!(event & TkKey) && (event & TkEmouse)) { ftk = tkcvsmouseinsub(w, *(TkMouse*)data); if(ftk != w->focus) { -{TkCitem *si; if(w->focus != nil && (si = tkcvsfindwin(w->focus)) != i)print("focus botch 4: i=%p si=%p\n", i, si);} tkdeliver(w->focus, TkLeave, data); -{TkCitem *si; if(ftk != nil && (si = tkcvsfindwin(ftk)) != i)print("focus botch: i=%p si=%p\n", i, si);} if(0)print("focus %p %q %p %q\n", w->sub, tkname(w->sub), ftk, tkname(ftk)); tkdeliver(ftk, TkEnter, data); w->focus = ftk; } -else{TkCitem *si; if(ftk != nil && (si = tkcvsfindwin(ftk)) != i)print("focus botch 2: i=%p si=%p\n", i, si);} if(ftk != nil) dest = tkdeliver(ftk, event, data); } else { -{TkCitem *si; if(w->focus != nil && (si = tkcvsfindwin(w->focus)) != i)print("focus botch 3: i=%p si=%p\n", i, si);} if(event & TkLeave) { tkdeliver(w->focus, TkLeave, data); w->focus = nil; |