ui: Fix circular dependency.

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 31934077c7a08d1948d48c588ae9869d37cb82c7..143c9d6f2de8214b6c0969e1ca4d0959482b9df6 100644 (file)
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -21,10 +21,6 @@ TUPLE: editor < line-gadget
     preedit-selection-mode?
     preedit-underlines ;
 
-GENERIC: preedit? ( gadget -- ? )
-
-M: gadget preedit? drop f ;
-
 M: editor preedit? preedit-start>> [ t ] [ f ] if ;
 
 <PRIVATE

diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
index e57587c91840c88298a1c1b118b2f1d363f5178b..56b448858c485ffccb95d42c4d1b74e56b6954d1 100644 (file)
--- a/basis/ui/gestures/gestures.factor
+++ b/basis/ui/gestures/gestures.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays ascii assocs boxes calendar classes columns
 combinators combinators.short-circuit deques fry kernel make math
 math.order math.parser math.vectors namespaces sequences sets system
-timers ui.gadgets ui.gadgets.private words locals ui.gadgets.editors ;
+timers ui.gadgets ui.gadgets.private words locals ;
 IN: ui.gestures
 
 : get-gesture-handler ( gesture gadget -- quot )
@@ -63,6 +63,10 @@ M: propagate-key-gesture-tuple send-queued-gesture
     [ gesture>> ] [ world>> world-focus ] bi
     [ handle-gesture ] with each-parent drop ;
 
+GENERIC: preedit? ( gadget -- ? )
+
+M: gadget preedit? drop f ;
+
 :: propagate-key-gesture ( gesture world -- )
     world world-focus preedit? [
         gesture world \ propagate-key-gesture-tuple queue-gesture