ui.backend.cocoa.tools: use interactive-vocabs for 'evaluate selection' service

diff --git a/basis/ui/backend/cocoa/tools/tools.factor b/basis/ui/backend/cocoa/tools/tools.factor
index 00c1ad35831b3cbf639eb60daa864e574076f9d3..89fd8e7708c44d1cbfbf7b2ce3107dd947636069 100644 (file)
--- a/basis/ui/backend/cocoa/tools/tools.factor
+++ b/basis/ui/backend/cocoa/tools/tools.factor
@@ -1,11 +1,11 @@
-! Copyright (C) 2006, 2009 Slava Pestov.
+! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.syntax cocoa cocoa.nibs cocoa.application
 cocoa.classes cocoa.dialogs cocoa.pasteboard cocoa.runtime
 cocoa.subclassing core-foundation core-foundation.strings
 help.topics kernel memory namespaces parser system ui
 ui.tools.browser ui.tools.listener ui.backend.cocoa eval
-locals vocabs.refresh ;
+locals listener vocabs.refresh ;
 FROM: alien.c-types => int void ;
 IN: ui.backend.cocoa.tools
 
@@ -82,12 +82,20 @@ CLASS: {
     "evalInListener:userData:error:"
     void
     { id SEL id id id }
-    [ nip [ eval-listener f ] do-service 2drop ]
+    [
+        nip
+        [ eval-listener f ] do-service
+        2drop
+    ]
 } {
     "evalToString:userData:error:"
     void
     { id SEL id id id }
-    [ nip [ eval>string ] do-service 2drop ]
+    [
+        nip
+        [ [ (eval>string) ] with-interactive-vocabs ] do-service
+        2drop
+    ]
 } ;
 
 : register-services ( -- )