From 2aa84a9b4f4f6849b78c512a7e1665b37f0cdcc9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 25 Jan 2009 00:11:06 -0600
Subject: [PATCH] Fix a couple of bootstrap errors

---
 basis/help/markup/markup.factor   | 3 ++-
 basis/ui/cocoa/tools/tools.factor | 4 ++--
 basis/ui/render/render.factor     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index e9c818a8e0..299fd1531f 100644
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -3,7 +3,8 @@
 USING: accessors arrays definitions generic io kernel assocs
 hashtables namespaces make parser prettyprint sequences strings
 io.styles vectors words math sorting splitting classes slots fry
-sets vocabs help.stylesheet help.topics vocabs.loader quotations ;
+sets vocabs help.stylesheet help.topics vocabs.loader quotations
+combinators ;
 IN: help.markup
 
 PREDICATE: simple-element < array
diff --git a/basis/ui/cocoa/tools/tools.factor b/basis/ui/cocoa/tools/tools.factor
index 2c2e0273a8..d2dfde9dd4 100644
--- a/basis/ui/cocoa/tools/tools.factor
+++ b/basis/ui/cocoa/tools/tools.factor
@@ -75,12 +75,12 @@ CLASS: {
 } {
     "evalInListener:userData:error:"
     "void"
-    { "id" "SEL" "id" "id" "void*" }
+    { "id" "SEL" "id" "id" "id" }
     [ nip [ eval-listener f ] do-service 2drop ]
 } {
     "evalToString:userData:error:"
     "void"
-    { "id" "SEL" "id" "id" "void*" }
+    { "id" "SEL" "id" "id" "id" }
     [ nip [ eval>string ] do-service 2drop ]
 } ;
 
diff --git a/basis/ui/render/render.factor b/basis/ui/render/render.factor
index 95559aaae1..deed0b5f04 100755
--- a/basis/ui/render/render.factor
+++ b/basis/ui/render/render.factor
@@ -141,7 +141,7 @@ TUPLE: gradient < caching-pen colors last-vertices last-colors ;
     concat concat >float-array ;
 
 : gradient-colors ( colors -- seq )
-    [ color>raw 4array dup 2array ] map concat concat
+    [ >rgba-components 4array dup 2array ] map concat concat
     >float-array ;
 
 M: gradient recompute-pen ( gadget gradient -- )