From b21457411ea3a7bdfedfa04fcb604dd724c2b6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Fri, 25 Mar 2016 21:10:26 +0100 Subject: [PATCH] mirrors: makes string an inspectable sequence, fixes #1238 --- basis/mirrors/mirrors.factor | 6 +++--- basis/ui/gadgets/panes/panes.factor | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/basis/mirrors/mirrors.factor b/basis/mirrors/mirrors.factor index ecd6da18fa..ca8ff7fd6a 100644 --- a/basis/mirrors/mirrors.factor +++ b/basis/mirrors/mirrors.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2007, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs byte-arrays classes classes.tuple -classes.tuple.private combinators fry hash-sets hashtables -kernel math quotations sequences sets slots slots.private -vectors ; +classes.tuple.private combinators fry hash-sets hashtables kernel math +quotations sequences sets slots slots.private strings vectors ; IN: mirrors TUPLE: mirror { object read-only } ; @@ -61,6 +60,7 @@ INSTANCE: array inspected-sequence INSTANCE: vector inspected-sequence INSTANCE: callable inspected-sequence INSTANCE: byte-array inspected-sequence +INSTANCE: string inspected-sequence GENERIC: make-mirror ( obj -- assoc ) M: hashtable make-mirror ; diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor index 9c6f0f7135..e76417ee71 100644 --- a/basis/ui/gadgets/panes/panes.factor +++ b/basis/ui/gadgets/panes/panes.factor @@ -442,8 +442,3 @@ pane H{ GENERIC: content-gadget ( object -- gadget/f ) M: object content-gadget drop f ; - -M: string content-gadget - '[ _ write ] make-pane - { 450 100 } >>pref-dim - ;