*** tk-init.stk.orig	Mon May 14 12:28:46 2001
--- tk-init.stk	Mon May 14 12:38:26 2001
***************
*** 4,10 ****
  ;;;; This script is executed for each STk-based application. It arranges class 
  ;;;; bindings for widgets.
  ;;;;
! ;;;; Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
  ;;;; 
  ;;;; Permission to use, copy, modify, distribute,and license this
  ;;;; software and its documentation for any purpose is hereby granted,
--- 4,10 ----
  ;;;; This script is executed for each STk-based application. It arranges class 
  ;;;; bindings for widgets.
  ;;;;
! ;;;; Copyright © 1993-2001 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
  ;;;; 
  ;;;; Permission to use, copy, modify, distribute,and license this
  ;;;; software and its documentation for any purpose is hereby granted,
***************
*** 20,26 ****
  ;;;;
  ;;;;           Author: Erick Gallesio [eg@unice.fr]
  ;;;;    Creation date: 17-May-1993 12:35
! ;;;; Last file update: 11-Oct-1999 18:16 (eg)
  ;;;;
  
  (unless (equal? *tk-version* "8.0")
--- 20,26 ----
  ;;;;
  ;;;;           Author: Erick Gallesio [eg@unice.fr]
  ;;;;    Creation date: 17-May-1993 12:35
! ;;;; Last file update: 14-May-2001 12:38 (eg)
  ;;;;
  
  (unless (equal? *tk-version* "8.0")
***************
*** 191,207 ****
    ;; Start without mapping the root window.
    (wm 'withdraw ".")
    
!   (let ((old-pack pack) (old-wm wm))
!     (set! pack 
! 	  (lambda l
! 	    (let ((res (apply old-pack l)))
! 	      (for-each (lambda (x)
! 			  (when (and *start-withdrawn*
! 				     (eq? (winfo 'toplevel x) *root*)
! 				     (winfo 'manager x))
! 			    (wm 'deiconify *root*)))
! 			(winfo 'children *root*))
! 	      res)))
      
      (set! wm
  	  (lambda l
--- 191,210 ----
    ;; Start without mapping the root window.
    (wm 'withdraw ".")
    
!   (let ((old-pack pack) (old-wm wm) (old-grid grid) (old-place place))
!     (define (apply-old-geometry-manager old)
!       (lambda l
! 	(let ((res (apply old l)))
! 	  (for-each (lambda (x)
! 		      (when (and *start-withdrawn*
! 				 (eq? (winfo 'toplevel x) *root*)
! 				 (winfo 'manager x))
! 			(wm 'deiconify *root*)))
! 		    (winfo 'children *root*))
! 	  res)))
!     (set! pack  (apply-old-geometry-manager old-pack))
!     (set! grid  (apply-old-geometry-manager old-grid))
!     (set! place (apply-old-geometry-manager old-place))
      
      (set! wm
  	  (lambda l
***************
*** 211,216 ****
--- 214,223 ----
  		;; Replace the pack and wm command by the original Tk ones
  		(set! pack    		old-pack)
  		(set! Tk:pack 		old-pack)
+ 		(set! grid		old-grid)
+ 		(set! Tk:grid		old-grid)
+ 		(set! place		old-place)
+ 		(set! Tk:place		old-place)
  		(set! wm      		old-wm)
  		(set! Tk:wm   		old-wm)
  		(set! *start-withdrawn*	#f))
***************
*** 281,286 ****
--- 288,294 ----
  (define Tk:destroy	destroy)
  (define Tk:focus	focus)
  (define Tk:grab		grab)
+ (define Tk:grid		grid)
  (define Tk:lower	lower)
  (define Tk:option	option)
  (define Tk:pack		pack)