Fixed bug in ui.gadgets.tabs, irc.ui no longer uses delegation

diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index ef2bfd3d55c47de457dcd49b4acc9483fdc3ab84..cc138dad92f68dbd06d2cd3664b889613ded7b2e 100755 (executable)
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -82,10 +82,10 @@ M: irc-message write-irc
     <scrolling-pane>\r
     [ <pane-stream> swap display ] keep ;\r
 \r
-TUPLE: irc-editor outstream listener client ;\r
+TUPLE: irc-editor < editor outstream listener client ;\r
 \r
 : <irc-editor> ( pane listener client -- editor )\r
-    [ <editor> irc-editor construct-editor\r
+    [ irc-editor new-editor\r
     swap >>listener swap <pane-stream> >>outstream\r
     ] dip client>> >>client ;\r
 \r

diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 1b4f63360923edf639616b1f8ee5005e6b7a90ab..7c663f88e3a2b52927ab287396f52dec136b013e 100755 (executable)
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -51,6 +51,6 @@ DEFER: (del-page)
     tabbed new-frame\r
     [ g 0 <model> >>model\r
       <pile> 1 >>fill [ >>toggler ] keep swap @left grid-add\r
-      [ keys g swap >>names ]\r
+      [ keys >vector g swap >>names ]\r
       [ values g model>> <book> [ >>content ] keep swap @center grid-add ] bi\r
       g redo-toggler g ] with-gadget ;\r