Merge branch 'gtk' into gtk-image-loader

[factor.git] / basis / ui / backend / gtk / gtk.factor

diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 57b406f6fd412edafc1ea29e51b30667aa6a6a79..fe72c6ddf5a3586b45921966f2fba706e8f9261c 100644 (file)
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -8,12 +8,9 @@ io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel
 libc literals locals math math.bitwise math.order math.vectors
 namespaces sequences strings system threads ui ui.backend
 ui.clipboards ui.commands ui.event-loop ui.gadgets
-ui.gadgets.menus ui.gadgets.private ui.gadgets.worlds
-ui.gestures ui.pixel-formats ui.pixel-formats.private
-ui.private ;
-RENAME: windows ui.private => ui:windows
-EXCLUDE: ui.gadgets.editors => change-caret ;
-RENAME: change-caret ui.gadgets.editors => editors:change-caret
+ui.gadgets.editors ui.gadgets.menus ui.gadgets.private
+ui.gadgets.worlds ui.gestures ui.pixel-formats
+ui.pixel-formats.private ui.private ;
 IN: ui.backend.gtk
 
 SINGLETON: gtk-ui-backend
@@ -231,7 +228,12 @@ CONSTANT: poll-fd-events
         mx get fd>> >>fd
         poll-fd-events >>events ;
 
-: init-io-event-source ( -- )
+HOOK: init-io-event-source io-backend ( -- )
+
+M: c-io-backend init-io-event-source
+    ;
+
+M: object init-io-event-source
     GSourceFuncs malloc-struct &free
         [ io-source-prepare ] GSourceFuncsPrepareFunc >>prepare
         [ io-source-check ] GSourceFuncsCheckFunc >>check