* tests/xmfbox.test: Updated tests.

* generic/tkWindow.c:
* generic/tkInt.h: Updated Tcl_OptionCmd -> Tcl_OptionObjCmd

* generic/tkOption.c: Tcl_Obj'ectified the "option" command.

1 files changed, 18 insertions, 17 deletions

diff --git a/tests/xmfbox.test b/tests/xmfbox.test
index 29ebf18..52ed35d 100644
--- a/tests/xmfbox.test
+++ b/tests/xmfbox.test
@@ -9,7 +9,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: xmfbox.test,v 1.3 1999/11/12 23:55:16 wart Exp $
+# RCS: @(#) $Id: xmfbox.test,v 1.4 2000/03/24 23:13:19 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -80,8 +80,8 @@ test xmfbox-2.1 {tkMotifFDialog_InterpFilter, ~ in dir names} {unixOnly} {
     cleanup
     file mkdir ./~nosuchuser1
     set x [tkMotifFDialog_Create foo open {}]
-    $foo(fEnt) delete 0 end
-    $foo(fEnt) insert 0 [pwd]/~nosuchuser1
+    $::tk::dialog::file::foo(fEnt) delete 0 end
+    $::tk::dialog::file::foo(fEnt) insert 0 [pwd]/~nosuchuser1
     set kk [tkMotifFDialog_InterpFilter $x]
 } [list $testPWD/~nosuchuser1 *]
 
@@ -89,8 +89,8 @@ test xmfbox-2.2 {tkMotifFDialog_InterpFilter, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
-    $foo(fEnt) delete 0 end
-    $foo(fEnt) insert 0 [pwd]/~nosuchuser1
+    $::tk::dialog::file::foo(fEnt) delete 0 end
+    $::tk::dialog::file::foo(fEnt) insert 0 [pwd]/~nosuchuser1
     set kk [tkMotifFDialog_InterpFilter $x]
 } [list $testPWD ./~nosuchuser1]
 
@@ -98,18 +98,18 @@ test xmfbox-2.3 {tkMotifFDialog_Update, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
-    $foo(fEnt) delete 0 end
-    $foo(fEnt) insert 0 [pwd]/~nosuchuser1
+    $::tk::dialog::file::foo(fEnt) delete 0 end
+    $::tk::dialog::file::foo(fEnt) insert 0 [pwd]/~nosuchuser1
     tkMotifFDialog_InterpFilter $x
     tkMotifFDialog_Update $x
-    $foo(fList) get end
+    $::tk::dialog::file::foo(fList) get end
 } ~nosuchuser1
 
 test xmfbox-2.4 {tkMotifFDialog_LoadFile, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
-    set i [lsearch [$foo(fList) get 0 end] ~nosuchuser1]
+    set i [lsearch [$::tk::dialog::file::foo(fList) get 0 end] ~nosuchuser1]
     expr {$i >= 0}
 } 1
 
@@ -117,23 +117,24 @@ test xmfbox-2.5 {tkMotifFDialog_BrowseFList, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
-    set i [lsearch [$foo(fList) get 0 end] ~nosuchuser1]
-    $foo(fList) selection clear 0 end
-    $foo(fList) selection set $i
+    set i [lsearch [$::tk::dialog::file::foo(fList) get 0 end] ~nosuchuser1]
+    $::tk::dialog::file::foo(fList) selection clear 0 end
+    $::tk::dialog::file::foo(fList) selection set $i
     tkMotifFDialog_BrowseFList $x
-    $foo(sEnt) get
+    $::tk::dialog::file::foo(sEnt) get
 } $testPWD/~nosuchuser1
 
 test xmfbox-2.5 {tkMotifFDialog_ActivateFList, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
-    set i [lsearch [$foo(fList) get 0 end] ~nosuchuser1]
-    $foo(fList) selection clear 0 end
-    $foo(fList) selection set $i
+    set i [lsearch [$::tk::dialog::file::foo(fList) get 0 end] ~nosuchuser1]
+    $::tk::dialog::file::foo(fList) selection clear 0 end
+    $::tk::dialog::file::foo(fList) selection set $i
     tkMotifFDialog_BrowseFList $x
     tkMotifFDialog_ActivateFList $x
-    list $foo(selectPath) $foo(selectFile) $tkPriv(selectFilePath)
+    list $::tk::dialog::file::foo(selectPath) \
+	    $::tk::dialog::file::foo(selectFile) $tkPriv(selectFilePath)
 } [list $testPWD ~nosuchuser1 $testPWD/~nosuchuser1]
 
 # cleanup