From 802fcdd315629f5da59f0716b0eb5065d372c040 Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 28 Oct 2003 15:56:45 +0000 Subject: Make sure we do default placement strategy when placement is empty [Bug 819284] --- ChangeLog | 5 +++++ library/tk.tcl | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a11606..d789ae8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-10-28 Donal K. Fellows + + * library/tk.tcl (::tk::PlaceWindow): Added check for empty string + first when determining placement strategy. [Bug 819284] + 2003-10-23 Jim Ingham * macosx/tkMacOSXDialog.c (NavServicesGetFile): Minor cleanups. diff --git a/library/tk.tcl b/library/tk.tcl index 040d741..eed96b3 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.50 2003/07/31 22:17:14 patthoyts Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.51 2003/10/28 15:56:46 dkf Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -79,7 +79,11 @@ proc ::tk::PlaceWindow {w {place ""} {anchor ""}} { wm withdraw $w update idletasks set checkBounds 1 - if {[string equal -len [string length $place] $place "pointer"]} { + if ($place eq ""} { + set x [expr {([winfo screenwidth $w]-[winfo reqwidth $w])/2}] + set y [expr {([winfo screenheight $w]-[winfo reqheight $w])/2}] + set checkBounds 0 + } elseif {[string equal -len [string length $place] $place "pointer"]} { ## place at POINTER (centered if $anchor == center) if {[string equal -len [string length $anchor] $anchor "center"]} { set x [expr {[winfo pointerx $w]-[winfo reqwidth $w]/2}] -- cgit v0.12