From 449be040f8ca571672028c4145ad8c475d470a0f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 23 Aug 2009 19:07:21 -0500
Subject: [PATCH] Use utf8 instead of ascii encoding in a couple of places to
 avoid pulling in ascii into deployed apps

---
 basis/cocoa/views/views.factor            | 2 +-
 basis/colors/constants/constants.factor   | 8 ++++----
 basis/ui/backend/cocoa/cocoa.factor       | 2 +-
 basis/ui/backend/cocoa/views/views.factor | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/basis/cocoa/views/views.factor b/basis/cocoa/views/views.factor
index f65fddac58..ce785dd8df 100644
--- a/basis/cocoa/views/views.factor
+++ b/basis/cocoa/views/views.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: specialized-arrays.int arrays kernel math namespaces make
+USING: arrays kernel math namespaces make
 cocoa cocoa.messages cocoa.classes core-graphics
 core-graphics.types sequences continuations accessors ;
 IN: cocoa.views
diff --git a/basis/colors/constants/constants.factor b/basis/colors/constants/constants.factor
index 38339577cf..98e7d43411 100644
--- a/basis/colors/constants/constants.factor
+++ b/basis/colors/constants/constants.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel assocs math math.parser memoize
-io.encodings.ascii io.files lexer parser
-colors sequences splitting combinators.smart ascii ;
+USING: kernel assocs math math.parser memoize io.encodings.utf8
+io.files lexer parser colors sequences splitting
+combinators.smart ascii ;
 IN: colors.constants
 
 <PRIVATE
@@ -19,7 +19,7 @@ IN: colors.constants
     [ parse-color ] H{ } map>assoc ;
 
 MEMO: rgb.txt ( -- assoc )
-    "resource:basis/colors/constants/rgb.txt" ascii file-lines parse-rgb.txt ;
+    "resource:basis/colors/constants/rgb.txt" utf8 file-lines parse-rgb.txt ;
 
 PRIVATE>
 
diff --git a/basis/ui/backend/cocoa/cocoa.factor b/basis/ui/backend/cocoa/cocoa.factor
index e05704e623..c40a19851f 100755
--- a/basis/ui/backend/cocoa/cocoa.factor
+++ b/basis/ui/backend/cocoa/cocoa.factor
@@ -7,7 +7,7 @@ cocoa.views cocoa.windows combinators command-line
 core-foundation core-foundation.run-loop core-graphics
 core-graphics.types destructors fry generalizations io.thread
 kernel libc literals locals math math.bitwise math.rectangles memory
-namespaces sequences specialized-arrays.int threads ui
+namespaces sequences threads ui
 ui.backend ui.backend.cocoa.views ui.clipboards ui.gadgets
 ui.gadgets.worlds ui.pixel-formats ui.pixel-formats.private
 ui.private words.symbol ;
diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor
index a7b9fd3801..ffff15a911 100644
--- a/basis/ui/backend/cocoa/views/views.factor
+++ b/basis/ui/backend/cocoa/views/views.factor
@@ -3,7 +3,7 @@
 USING: accessors alien alien.c-types alien.strings arrays assocs
 cocoa kernel math cocoa.messages cocoa.subclassing cocoa.classes
 cocoa.views cocoa.application cocoa.pasteboard cocoa.types
-cocoa.windows sequences io.encodings.ascii ui ui.private ui.gadgets
+cocoa.windows sequences io.encodings.utf8 ui ui.private ui.gadgets
 ui.gadgets.private ui.gadgets.worlds ui.gestures
 core-foundation.strings core-graphics core-graphics.types threads
 combinators math.rectangles ;
@@ -220,7 +220,7 @@ CLASS: {
 { "validateUserInterfaceItem:" "char" { "id" "SEL" "id" }
     [
         nip -> action
-        2dup [ window ] [ ascii alien>string ] bi* validate-action
+        2dup [ window ] [ utf8 alien>string ] bi* validate-action
         [ [ 2drop ] dip >c-bool ] [ SUPER-> validateUserInterfaceItem: ] if
     ]
 }