From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 3 Mar 2017 01:14:54 +0000 (-0700)
Subject: gtk, planetarium: Remove references to deprecated bindings.
X-Git-Tag: mit-scheme-pucked-9.2.12~199
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=b08d57a70e57f30dca6875941090e9b56175f751;p=mit-scheme.git

gtk, planetarium: Remove references to deprecated bindings.
---

diff --git a/src/gtk/fix-demo.scm b/src/gtk/fix-demo.scm
index c39a0bc5f..d503c803e 100644
--- a/src/gtk/fix-demo.scm
+++ b/src/gtk/fix-demo.scm
@@ -327,11 +327,10 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 		 (demo-drawing-cursor-inks drawing))
        (%trace2 ";blinked on\n")
        (sleep-current-thread 500)
-       (if (there-exists?
-	    (demo-drawing-cursor-inks drawing)
-	    (lambda (cursor.widgets)
-	      (there-exists? (cdr cursor.widgets)
-			     (lambda (w) (not (gtk-widget-destroyed? w))))))
+       (if (any (lambda (cursor.widgets)
+		  (any (lambda (w) (not (gtk-widget-destroyed? w)))
+		       (cdr cursor.widgets)))
+		(demo-drawing-cursor-inks drawing))
 	   (loop)
 	   (%trace ";blinking ended\n"))))))
 
diff --git a/src/planetarium/mit-3d.pkg b/src/planetarium/mit-3d.pkg
index ba20a62c5..ef8a9dd89 100644
--- a/src/planetarium/mit-3d.pkg
+++ b/src/planetarium/mit-3d.pkg
@@ -38,7 +38,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  burst-string read-line write-string ->namestring
 	  error:wrong-type-argument real? ->flonum symbol-name
 	  guarantee-list-of-type->length
-	  guarantee-procedure-of-arity guarantee-real
+	  guarantee-procedure-of-arity
 	  universal-time->local-time-string
 	  define-class define-method initialize-instance
 	  system-global-environment
diff --git a/src/planetarium/mit.pkg b/src/planetarium/mit.pkg
index 4a81ab389..63e6b98a9 100644
--- a/src/planetarium/mit.pkg
+++ b/src/planetarium/mit.pkg
@@ -99,7 +99,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  ;; Many of these are in usual-integrations/expansion-names
 	  ;; and thus do not have to be imported, but are listed here
 	  ;; anyway for completeness (and analysis someday).
-	  guarantee-integer integer-divide round->exact truncate->exact
+	  guarantee integer-divide round->exact truncate->exact
 	  ->flonum flo:= flo:< flo:<= flo:+ flo:- flo:* flo:/
 	  flo:negative? flo:negate flo:truncate
 	  flo:sin flo:cos flo:atan2 flo:sqrt flo:atan
diff --git a/src/planetarium/tellurion.scm b/src/planetarium/tellurion.scm
index a5fc22414..a8beb442e 100644
--- a/src/planetarium/tellurion.scm
+++ b/src/planetarium/tellurion.scm
@@ -40,7 +40,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	     (queue! 'time-to (->time (car args))))
 	    ((eq? keyword 'HOUR-TO)
 	     (let ((hour (car args)))
-	       (guarantee-integer hour 'hour-to)
+	       (guarantee integer? hour 'hour-to)
 	       (if (or (< hour 0) (< 23 hour))
 		   (error "Invalid hour:" hour))
 	       (queue! 'hour-to hour)))