gtk: Fix usings

diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor
index 3f92333cc5c719cf5c81392bc08a7e81af0f5a20..2b82e996a08a074b85582cb5093f7db72247d469 100644 (file)
--- a/basis/game/input/input.factor
+++ b/basis/game/input/input.factor
@@ -109,6 +109,6 @@ SYMBOLS: pressed released ;
 {
     { [ os windows? ] [ "game.input.dinput" require ] }
     { [ os macosx? ] [ "game.input.iokit" require ] }
-    { [ os linux? ] [ "game.input.gtk" require ] }
+    { [ os linux? ] [ "game.input.gtk2" require ] }
     [ ]
 } cond

diff --git a/extra/clutter/ffi/ffi.factor b/extra/clutter/ffi/ffi.factor
index 6bd70c83c49ef2753fca0909afeef5142d1f6d8d..f751cae08a3115c67f6a2f42c5d2143a6e94981e 100644 (file)
--- a/extra/clutter/ffi/ffi.factor
+++ b/extra/clutter/ffi/ffi.factor
@@ -5,7 +5,7 @@ gobject-introspection kernel system vocabs ;
 IN: clutter.ffi
 
 <<
-"gtk" require
+"gtk2" require
 "atk.ffi" require
 "pango.cairo.ffi" require
 "clutter.cogl.ffi" require

diff --git a/extra/clutter/gtk/ffi/ffi.factor b/extra/clutter/gtk/ffi/ffi.factor
index d37f354c7c07cf206925a92d72d5f654e1ecb82e..b05663d151870c93bff77e10d584bc0f032f7e9d 100644 (file)
--- a/extra/clutter/gtk/ffi/ffi.factor
+++ b/extra/clutter/gtk/ffi/ffi.factor
@@ -6,7 +6,7 @@ IN: clutter.gtk.ffi
 
 <<
 "clutter.ffi" require
-"gtk.ffi" require
+"gtk2.ffi" require
 >>
 
 LIBRARY: clutter.gtk

diff --git a/extra/file-picker/linux/linux.factor b/extra/file-picker/linux/linux.factor
index 30d5a191f2ebb89df22105f2e5f9afca89a2a4d5..27dd905e807aeb962069c09d8e9b61c4f65401ee 100644 (file)
--- a/extra/file-picker/linux/linux.factor
+++ b/extra/file-picker/linux/linux.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2014, 2015 John Benediktsson.
 ! See https://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.strings alien.syntax destructors
-file-picker gobject-introspection.standard-types gtk.ffi
+file-picker gobject-introspection.standard-types gtk2.ffi
 io.encodings.utf8 kernel locals namespaces system ui.gadgets.worlds ;
 IN: file-picker.linux
 

diff --git a/extra/gtk-samples/hello-world/hello-world.factor b/extra/gtk-samples/hello-world/hello-world.factor
index 2f482ffab74d1fe30abf11dde532b8caefee3499..e12d29fc2bcbd23ae3ef2d13ff8d1a74d521c345 100644 (file)
--- a/extra/gtk-samples/hello-world/hello-world.factor
+++ b/extra/gtk-samples/hello-world/hello-world.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See https://factorcode.org/license.txt for BSD license.
-USING: alien.strings gobject.ffi gtk.ffi io.encodings.utf8
+USING: alien.strings gobject.ffi gtk2.ffi io.encodings.utf8
 kernel ;
 IN: gtk-samples.hello-world