From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sun, 6 Jul 2014 08:33:12 +0000 (-0700)
Subject: gtk-screen: Catch up with Glib,Pango,Gtk name changes.
X-Git-Tag: mit-scheme-pucked-9.2.12~366^2~6
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f310cd9dd88829990830c4dbf2a2bebbdd5bc713;p=mit-scheme.git

gtk-screen: Catch up with Glib,Pango,Gtk name changes.
---

diff --git a/src/gtk-screen/check.scm b/src/gtk-screen/check.scm
index 3eb3fcb3d..f35dffbf3 100644
--- a/src/gtk-screen/check.scm
+++ b/src/gtk-screen/check.scm
@@ -9,6 +9,6 @@
   (set! *initial-options-file* (merge-pathnames "gtk-screen-optiondb" dirname)))
 
 (load-option 'GTK-SCREEN)
-(if (gtk-thread-running?)
+(if (gtk-initialized?)
     (load "gtk-screen-check")
     (warn "Could not test the GTK subsystem without a DISPLAY."))
\ No newline at end of file
diff --git a/src/gtk-screen/gtk-screen.pkg b/src/gtk-screen/gtk-screen.pkg
index 6d66e3623..bf043c183 100644
--- a/src/gtk-screen/gtk-screen.pkg
+++ b/src/gtk-screen/gtk-screen.pkg
@@ -25,8 +25,11 @@ USA.
 
 (global-definitions runtime/)
 (global-definitions sos/)
-(global-definitions gtk/)
 (global-definitions edwin/)
+(global-definitions glib/)
+(global-definitions pango/)
+(global-definitions cairo/)
+(global-definitions gtk/)
 
 (define-package (edwin screen gtk-screen)
   (files "gtk-screen" "gtk-faces")
@@ -82,7 +85,7 @@ USA.
 	  %window-start-mark
 	  %set-window-start-mark!
 	  %window-tab-width)
-  (import (gtk pango)
+  (import (pango)
 	  pangos->pixels)
   (import (gtk gtk-widget)
 	  gtk-widget-destroy-callback
@@ -104,9 +107,10 @@ USA.
 	  fix-rect-min-x fix-rect-max-x fix-rect-min-y fix-rect-max-y
 	  set-fix-rect-size! set-fix-rect-position!
 	  fix-rect-intersect? fix-rect-union!)
+  (import (glib)
+	  gobject-alien gobject-unref!)
   (import (gtk)
 	  gdk-key-state->char-bits gdk-keyval->name
-	  gobject-alien gobject-unref!
 	  gdk-window-process-updates
 
 	  gtk-widget-destroyed? gtk-widget-destroy
@@ -148,21 +152,6 @@ USA.
 	  gtk-window-set-opacity
 	  gtk-window-set-default-size
 
-	  pango-layout-get-pixel-extents
-	  pango-layout-index-to-pos
-	  pango-layout-set-text
-	  pango-layout-set-markup
-
-	  pango-context-get-metrics
-	  pango-context-spacing
-
-	  pango-font-description-from-string
-	  pango-font-description-to-string
-	  pango-font-description-free
-	  pango-font-metrics-get-ascent pango-font-metrics-get-descent
-	  pango-font-metrics-get-approximate-char-width
-	  pango-font-metrics-unref
-
 	  set-scm-widget-minimum-size!
 	  set-scm-widget-natural-size!
 
diff --git a/src/gtk-screen/gtk-screen.scm b/src/gtk-screen/gtk-screen.scm
index 185cb5f3e..111ee165c 100644
--- a/src/gtk-screen/gtk-screen.scm
+++ b/src/gtk-screen/gtk-screen.scm
@@ -695,7 +695,7 @@ USA.
   (set! gtk-display-type
 	(make-display-type 'GTK
 			   #t
-			   gtk-thread-running?
+			   gtk-initialized?
 			   make-gtk-screen
 			   (lambda (screen)
 			     screen	;ignore