From c30122d1fcf1a2830481b881423df0fda0546f38 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 5 Sep 2011 20:12:56 -0500
Subject: [PATCH] more adjustments to try to get the drracket test suites
 running in drdr

---
 collects/drracket/private/syncheck/gui.rkt    | 19 ++++++++++---------
 collects/meta/props                           |  2 +-
 collects/tests/drracket/hangman.rkt           |  1 +
 .../drracket/private/drracket-test-util.rkt   |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/collects/drracket/private/syncheck/gui.rkt b/collects/drracket/private/syncheck/gui.rkt
index 94fcacf337..28ba64e1af 100644
--- a/collects/drracket/private/syncheck/gui.rkt
+++ b/collects/drracket/private/syncheck/gui.rkt
@@ -572,14 +572,14 @@ If the namespace does not, they are colored the unbound color.
             (define/public (syncheck:add-rename-menu id-as-sym to-be-renamed/poss name-dup?)
               (define (make-menu menu)
                 (let ([name-to-offer (format "~a" id-as-sym)])
-                  (instantiate menu-item% ()
-                    (parent menu)
-                    (label (fw:gui-utils:format-literal-label (string-constant cs-rename-var) name-to-offer))
-                    (callback
-                     (λ (x y)
-                       (let ([frame-parent (find-menu-parent menu)])
-                         (rename-callback name-to-offer
-                                          frame-parent)))))))
+                  (new menu-item%
+                       [parent menu]
+                       [label (fw:gui-utils:format-literal-label (string-constant cs-rename-var) name-to-offer)]
+                       [callback
+                        (λ (x y)
+                          (let ([frame-parent (find-menu-parent menu)])
+                            (rename-callback name-to-offer
+                                             frame-parent)))])))
               
               ;; rename-callback : string 
               ;;                   (and/c syncheck-text<%> definitions-text<%>)
@@ -596,7 +596,8 @@ If the namespace does not, they are colored the unbound color.
                            (string-constant cs-rename-id)
                            (fw:gui-utils:format-literal-label (string-constant cs-rename-var-to) name-to-offer)
                            parent
-                           name-to-offer)))])
+                           name-to-offer
+                           #:dialog-mixin frame:focus-table-mixin)))])
                   (when new-str
                     (define new-sym (format "~s" (string->symbol new-str)))
                     (define dup-name? (name-dup? new-sym))
diff --git a/collects/meta/props b/collects/meta/props
index f22fe1d92e..d0f441deab 100755
--- a/collects/meta/props
+++ b/collects/meta/props
@@ -1433,7 +1433,7 @@ path/s is either such a string or a list of them.
 "collects/tests/drracket/get-defs-test.rkt" drdr:command-line (gracket *)
 "collects/tests/drracket/hangman.rkt" responsible (robby matthias) drdr:command-line (gracket *)
 "collects/tests/drracket/io.rkt" drdr:command-line (gracket *) drdr:timeout 500
-"collects/tests/drracket/language-test.rkt" responsible (robby matthias) drdr:command-line (gracket *) drdr:timeout 600
+"collects/tests/drracket/language-test.rkt" responsible (robby matthias) drdr:command-line (gracket *) drdr:timeout 1500
 "collects/tests/drracket/leaky-frame.rkt" drdr:command-line (gracket *)
 "collects/tests/drracket/memory-log.rkt" drdr:command-line (gracket *)
 "collects/tests/drracket/module-lang-test-utils.rkt" drdr:command-line (gracket-text "-t" *)
diff --git a/collects/tests/drracket/hangman.rkt b/collects/tests/drracket/hangman.rkt
index c29ee1facd..844c7a5bf8 100644
--- a/collects/tests/drracket/hangman.rkt
+++ b/collects/tests/drracket/hangman.rkt
@@ -3,6 +3,7 @@
          racket/class)
 
 (fire-up-drscheme-and-run-tests 
+ #:use-focus-table? #f
  (λ ()
    (define drs (wait-for-drscheme-frame))
    (define defs (send drs get-definitions-text))
diff --git a/collects/tests/drracket/private/drracket-test-util.rkt b/collects/tests/drracket/private/drracket-test-util.rkt
index d0314f1ae9..a0e377d9da 100644
--- a/collects/tests/drracket/private/drracket-test-util.rkt
+++ b/collects/tests/drracket/private/drracket-test-util.rkt
@@ -593,7 +593,7 @@
   ;; but just to print and return.
   (define orig-display-handler (error-display-handler))
   
-  (define (fire-up-drscheme-and-run-tests run-test)
+  (define (fire-up-drscheme-and-run-tests #:use-focus-table? [use-focus-table? #t] run-test)
     (on-eventspace-handler-thread 'fire-up-drscheme-and-run-tests)
     (let ()
       ;; change the preferences system so that it doesn't write to 
@@ -616,7 +616,7 @@
       ;; of the startup of drscheme)
       (fw:preferences:restore-defaults)
       
-      (fw:test:use-focus-table #t)
+      (fw:test:use-focus-table use-focus-table?)
       
       (thread (λ () 
 		 (let ([orig-display-handler (error-display-handler)])