From 57232b12497fd420b04ae7fcd813fb6fdb6c8e1b Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 18 Mar 2018 17:29:07 -0700 Subject: [PATCH] gtk: Use a (gtk internal) package. Update refs to other internals. --- src/gtk/gtk.pkg | 83 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg index 724d52e2c..890926540 100644 --- a/src/gtk/gtk.pkg +++ b/src/gtk/gtk.pkg @@ -31,16 +31,64 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (global-definitions cairo/) (define-package (gtk) - (parent (glib)) + (parent (glib))) + +(define-package (gtk internal) + (parent (gtk)) (files "gtk") ;;(depends-on "gtk-const.bin" "../glib/") - ) + (import (pango) + ->color + pango-font-description-from-string + pango-layout-get-baseline + pango-layout-get-pixel-extents + pango-layout-index-to-pos + pango-layout-set-font-description + pango-layout-set-text + pango-layout-xy-to-index) + (import (cairo) + cairo-arc + cairo-clip + cairo-clip-extents + cairo-close-path + cairo-create + cairo-destroy + cairo-fill + cairo-fill-preserve + cairo-image-surface-create + cairo-line-to + cairo-matrix + cairo-move-to + cairo-paint + cairo-pattern-add-color-stop + cairo-pattern-create-radial + cairo-pattern-destroy + cairo-rectangle + cairo-rel-line-to + cairo-reset-clip + cairo-restore + cairo-save + cairo-scale + cairo-set-dash + cairo-set-font-matrix + cairo-set-line-width + cairo-set-operator + cairo-set-source + cairo-set-source-color + cairo-set-source-surface + cairo-show-pango-layout + cairo-show-text + cairo-stroke + cairo-stroke-preserve + cairo-surface-destroy + cairo-surface-flush + cairo-translate)) (define-package (gtk gdk) - (parent (gtk)) + (parent (gtk internal)) (files "gdk") ;;(depends-on "gtk-const.bin") - (import (cairo) + (import (cairo internal) check-cairo-status check-cairo-surface-status make-cairo-cleanup @@ -62,7 +110,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. )) (define-package (gtk gtk-widget) - (parent (gtk)) + (parent (gtk internal)) (files "gtk-widget") ;;(depends-on "gtk.bin" "gtk" "../runtime/ffi" "../pango/" "../glib/") (export (gtk) @@ -153,7 +201,8 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. gtk-paned-get-child1 gtk-paned-get-child2 gtk-paned-get-position gtk-paned-set-position gtk-paned-view? gtk-paned-view-new) - (import (pango) make-pango-layout guarantee-pango-font-description) + (import (pango internal) + make-pango-layout guarantee-pango-font-description) (import (gio) gfile?) (import (gtk gdk) get-gdk-display @@ -161,7 +210,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. gdk-display-set-clipboard-text)) (define-package (gtk widget) - (parent (gtk)) + (parent (gtk internal)) (files "scm-widget") ;;(depends-on "gtk.bin" "gtk" "../runtime/ffi") (import (gtk gtk-widget) @@ -172,13 +221,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. set-scm-widget-minimum-size! set-scm-widget-natural-size!)) (define-package (gtk fix-layout) - (parent (gtk)) + (parent (gtk internal)) (files "fix-layout") ;;(depends-on "pango" "cairo" "gtk.bin" "gtk" "../runtime/ffi" "gtk-const.bin") (import (ffi) find-c-includes c-enum-constant-values) - (import (pango) + (import (pango internal) make-pango-layout pango-rectangle pangos->pixels pixels->pangos) (import (glib thread) glib-thread) @@ -258,7 +307,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. )) (define-package (gtk keys) - (parent (gtk)) + (parent (gtk internal)) (files "keys") ;;(depends-on "gtk.bin" "gtk" "../runtime/ffi" "gtk-const.bin") (export (gtk) @@ -269,7 +318,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. c-enum-constant-values)) (define-package (gtk main) - (parent (gtk)) + (parent (gtk internal)) (files "main") ;;(depends-on "gtk.bin" "gtk" "../runtime/ffi") (import (runtime load) @@ -286,7 +335,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. gtk-time-slice-window!)) (define-package (gtk event-viewer) - (parent (gtk)) + (parent (gtk internal)) (files "gtk-ev") ;;(depends-on "gtk.bin" "gtk" "../runtime/ffi") (import (gtk fix-layout) @@ -294,13 +343,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. make-fix-rect fix-rect-x fix-rect-y fix-rect-width fix-rect-height fix-rect-max-y set-fix-rect! fix-rect-union!) - (import (pango) + (import (pango internal) pango-rectangle pangos->pixels) (export () make-gtk-event-viewer-demo)) (define-package (runtime gtk-graphics) - (parent (gtk)) + (parent (gtk internal)) (files "gtk-graphics") (import (gtk fix-layout) fix-ink-extent fix-rect-height fix-rect-width @@ -318,14 +367,14 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (define-package (gtk fix-layout demo) (parent (gtk fix-layout)) (files "fix-demo") - (import (cairo) + (import (cairo internal) cairo-identity-matrix cairo-matrix-scale! cairo-matrix-translate! cairo-point x y cairo-transform! guarantee-flonum) (export () make-fix-layout-demo)) (define-package (gtk swat) - (parent (gtk)) + (parent (gtk internal)) (files "swat") (import (runtime thread-queue) thread-queue/peek-until) @@ -339,7 +388,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. fix-rect-x fix-rect-y with-fix-rect set-fix-rect-size! fix-rect-move! copy-fix-rect! point-in-fix-rect? fix-rect-union!) - (import (cairo) + (import (cairo internal) cairo-point x y set-x! set-y! cairo-transform! cairo-rotation-matrix cairo-matrix-scale! cairo-matrix-translate!) (export (swat) -- 2.25.1