From f7654c43f895fd31af766c4c55b0ce763d2f7aba Mon Sep 17 00:00:00 2001 From: hobbs Date: Mon, 13 Oct 2003 00:55:08 +0000 Subject: * unix/mkLinks: * doc/GetHWND.3: add Tk_AttachHWND docs [Bug #220803] --- ChangeLog | 16 ++++++++++++---- doc/GetHWND.3 | 17 ++++++++++++++--- tests/listbox.test | 6 +++--- unix/mkLinks | 2 ++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d322a5..117d309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-10-12 Jeff Hobbs + + * tests/listbox.test (13.3): correct result size + (4.7): correct test for possible window drift [Bug #701931] (dgp) + + * unix/mkLinks: + * doc/GetHWND.3: add Tk_AttachHWND docs [Bug #220803] + 2003-10-10 Jeff Hobbs * mac/tkMacButton.c (TkpDisplayButton): @@ -5,12 +13,12 @@ * unix/tkUnixButton.c (TkpDisplayButton): correct imageYOffset for buttons with just images. -2003-10-09 Jeff Hobbs +2003-10-09 Jeff Hobbs * win/tkWinButton.c (TkpDisplayButton): correct imageYOffset for buttons with just images. -2003-10-06 Don Porter +2003-10-06 Don Porter * doc/ConfigWidg.3: Removed reference to Tk_Offset from the NAME section to resolve mkLinks conflict with SetOptions.3 [Bug 404197] @@ -20,8 +28,8 @@ value different from TCL_PREFIX is selected, since [package require Tk] fails in that configuration. [Bugs 428627,765642] - * unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so - that alpha and beta releases of Tcl are not favored. [Bug 608698] + * unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so + that alpha and beta releases of Tcl are not favored. [Bug 608698] * unix/configure.in: Added check that version of Tcl header found by configure matches that of the Tk we wish to build. As long as diff --git a/doc/GetHWND.3 b/doc/GetHWND.3 index b512578..eb33db6 100644 --- a/doc/GetHWND.3 +++ b/doc/GetHWND.3 @@ -2,28 +2,39 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: GetHWND.3,v 1.2 2000/09/07 00:28:38 ericm Exp $ +'\" RCS: @(#) $Id: GetHWND.3,v 1.2.8.1 2003/10/13 00:55:08 hobbs Exp $ '\" '\" .so man.macros -.TH Tk_GetHWND 3 "" Tk "Tk Library Procedures" +.TH HWND 3 8.0 Tk "Tk Library Procedures" .BS .SH NAME -Tk_GetHWND \- retrieve the Windows handle for an X window +Tk_GetHWND, Tk_AttachHWND \- manage interactione between the Windows handle and an X window .SH SYNOPSIS .nf \fB#include \fR .sp HWND \fBTk_GetHWND\fR(\fIwindow\fR) +.sp +Window +\fBTk_AttachHWND\fR(\fItkwin, hwnd\fR) .SH ARGUMENTS .AP Window window in X token for window. +.AP Tk_Window tkwin in +Tk window for window. +.AP HWND hwnd in +Windows HWND for window. .BE .SH DESCRIPTION .PP \fBTk_GetHWND\fR returns the Windows HWND identifier for X Windows window given by \fIwindow\fR. +.PP +\fBTk_AttachHWND\fR binds the Windows HWND identifier to the +specified Tk_Window given by \fItkwin\fR. It returns an X Windows +window that encapsulates the HWND. .SH KEYWORDS identifier, window diff --git a/tests/listbox.test b/tests/listbox.test index 37f5f30..a6f858c 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: listbox.test,v 1.21 2003/02/25 02:07:25 hobbs Exp $ +# RCS: @(#) $Id: listbox.test,v 1.21.2.1 2003/10/13 00:55:25 hobbs Exp $ package require tcltest 2.1 namespace import -force tcltest::configure @@ -841,7 +841,7 @@ test listbox-4.7 {ConfigureListbox procedure} { catch {destroy .l} wm withdraw . listbox .l -font $fixed -width 30 -height 20 -setgrid 1 - wm geom . +0+0 + wm geom . +25+25 pack .l update wm deiconify . @@ -1529,7 +1529,7 @@ test listbox-13.3 {ListboxScanTo procedure} {fonts} { .l scan dragto [expr 5+$width] [expr 10+$height] update lappend x [.l xview] [.l yview] -} {{0.8 1} {0.75 1} {0.62 0.82} {0.25 0.5}} +} {{0.8 1} {0.75 1} {0.64 0.84} {0.25 0.5}} test listbox-14.1 {NearestListboxElement procedure, partial last line} { mkPartial diff --git a/unix/mkLinks b/unix/mkLinks index 0b91246..2caca62 100644 --- a/unix/mkLinks +++ b/unix/mkLinks @@ -476,7 +476,9 @@ if test -r GetHWND.3; then rm -f GetHWND.3.* $ZIP GetHWND.3 rm -f Tk_GetHWND.3 Tk_GetHWND.3.* + rm -f Tk_AttachHWND.3 Tk_AttachHWND.3.* ln $S GetHWND.3$Z Tk_GetHWND.3$Z + ln $S GetHWND.3$Z Tk_AttachHWND.3$Z fi if test -r GetImage.3; then rm -f GetImage.3.* -- cgit v0.12