From 60e183499ff44eb13b42bc9174d7fe69e7d4070c Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Thu, 13 Jan 2005 09:54:04 +0000
Subject: Partial fix of [Bug 600313]

---
 ChangeLog          |  5 +++++
 library/tkfbox.tcl | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c93e92..99297b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* library/tkfbox.tcl (IconList_Selection, IconList_Create):
+	(IconList_Arrange): Assorted tk_getOpenFile fixes. [part of Bug 600313]
+
 2005-01-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* doc/event.n: Added section on predefined virtual events. [Bug 608115]
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 59bdae3..8bff977 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
 #	files by clicking on the file icons or by entering a filename
 #	in the "Filename:" entry.
 #
-# RCS: @(#) $Id: tkfbox.tcl,v 1.48 2004/09/10 22:31:10 dkf Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.49 2005/01/13 09:54:04 dkf Exp $
 #
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
 #
@@ -104,6 +104,7 @@ proc ::tk::IconList_Selection {w op args} {
 		    set first $ind
 		    break
 		}
+		incr ind
 	    }
 	    set ind [expr {[llength $data(selection)] - 1}]
 	    for {} {$ind >= 0} {incr ind -1} {
@@ -259,6 +260,8 @@ proc ::tk::IconList_Create {w} {
     bind $data(canvas) <Double-ButtonRelease-1> \
 	    [list tk::IconList_Double1 $w %x %y]
 
+    bind $data(canvas) <Control-B1-Motion> {;}
+
     bind $data(canvas) <Up>		[list tk::IconList_UpDown $w -1]
     bind $data(canvas) <Down>		[list tk::IconList_UpDown $w  1]
     bind $data(canvas) <Left>		[list tk::IconList_LeftRight $w -1]
@@ -467,6 +470,7 @@ proc ::tk::IconList_Arrange {w} {
     if {$data(curItem) != ""} {
 	IconList_Select $w [lindex [lindex $data(list) $data(curItem)] 2] 0
     }
+    IconList_DrawSelection $w
 }
 
 # Gets called when the user invokes the IconList (usually by double-clicking
@@ -539,7 +543,7 @@ proc ::tk::IconList_Btn1 {w x y} {
     set x [expr {int([$data(canvas) canvasx $x])}]
     set y [expr {int([$data(canvas) canvasy $y])}]
     set i [IconList_Index $w @${x},${y}]
-    if {$i==""} return
+    if {$i eq ""} return
     IconList_Selection $w clear 0 end
     IconList_Selection $w set $i
     IconList_Selection $w anchor $i
@@ -553,7 +557,7 @@ proc ::tk::IconList_CtrlBtn1 {w x y} {
 	set x [expr {int([$data(canvas) canvasx $x])}]
 	set y [expr {int([$data(canvas) canvasy $y])}]
 	set i [IconList_Index $w @${x},${y}]
-	if {$i==""} return
+	if {$i eq ""} return
 	if { [IconList_Selection $w includes $i] } {
 	    IconList_Selection $w clear $i
 	} else {
@@ -571,7 +575,7 @@ proc ::tk::IconList_ShiftBtn1 {w x y} {
 	set x [expr {int([$data(canvas) canvasx $x])}]
 	set y [expr {int([$data(canvas) canvasy $y])}]
 	set i [IconList_Index $w @${x},${y}]
-	if {$i==""} return
+	if {$i eq ""} return
 	set a [IconList_Index $w anchor]
 	if { [string equal $a ""] } {
 	    set a $i
@@ -591,7 +595,7 @@ proc ::tk::IconList_Motion1 {w x y} {
     set x [expr {int([$data(canvas) canvasx $x])}]
     set y [expr {int([$data(canvas) canvasy $y])}]
     set i [IconList_Index $w @${x},${y}]
-    if {$i==""} return
+    if {$i eq ""} return
     IconList_Selection $w clear 0 end
     IconList_Selection $w set $i
 }
@@ -652,7 +656,7 @@ proc ::tk::IconList_UpDown {w amount} {
 	set i 0
     } else {
 	set i [tk::IconList_Index $w anchor]
-	if {$i==""} return
+	if {$i eq ""} return
 	incr i $amount
     }
     IconList_Selection $w clear 0 end
@@ -681,7 +685,7 @@ proc ::tk::IconList_LeftRight {w amount} {
 	set i 0
     } else {
 	set i [IconList_Index $w anchor]
-	if {$i==""} return
+	if {$i eq ""} return
 	incr i [expr {$amount*$data(itemsPerColumn)}]
     }
     IconList_Selection $w clear 0 end
@@ -721,7 +725,7 @@ proc ::tk::IconList_Goto {w text} {
 	return
     }
 
-    if {$data(curItem) == "" || $data(curItem) == 0} {
+    if {$data(curItem) eq "" || $data(curItem) == 0} {
 	set start  0
     } else {
 	set start  $data(curItem)
@@ -942,7 +946,7 @@ proc ::tk::dialog::file::Config {dataName type argList} {
     #
     tclParseConfigSpec ::tk::dialog::file::$dataName $specs "" $argList
 
-    if {$data(-title) == ""} {
+    if {$data(-title) eq ""} {
 	if {[string equal $type "open"]} {
 	    set data(-title) "[mc "Open"]"
 	} else {
-- 
cgit v0.12