summaryrefslogtreecommitdiff
path: root/libtk
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2010-08-21 19:20:57 +0100
committerforsyth <forsyth@vitanuova.com>2010-08-21 19:20:57 +0100
commit43d5f895e7e089a8ca755eca0a19386de5f59f61 (patch)
treeff4c557101257ee4b4d09f468adef388c30d126e /libtk
parent5849851a19380dbb62a47d9c4d868a81e42fa79b (diff)
20100821-1920
Diffstat (limited to 'libtk')
-rw-r--r--libtk/NOTICE3
-rw-r--r--libtk/canvu.c4
2 files changed, 2 insertions, 5 deletions
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;