From cb271c9aefcdc2e895559e9d0baf3e0541cb49d6 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 4 Jun 2007 19:03:12 +0000 Subject: [PATCH] Update for SBCL 1.0.6 Organization: Straylight/Edgeware From: espen --- gtk/defpackage.lisp | 4 ++-- gtk/gtk.lisp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp index 52caea2..66f5ae8 100644 --- a/gtk/defpackage.lisp +++ b/gtk/defpackage.lisp @@ -9,10 +9,10 @@ (defpackage "GTK" "ADD-READER-METHOD" "ADD-WRITER-METHOD") #+(or cmu sbcl) (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER" "REMOVE-FD-HANDLER") - #+(or cmu sbcl) + #?(or (pkg-config:featurep :cmu) (and (pkg-config:featurep :sbcl) (not (pkg-config:sbcl>= 1 0 6)))) (:import-from #+cmu"LISP" #+sbcl"SB-IMPL" "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" - "*MAX-EVENT-TO-USEC*") + "*MAX-EVENT-TO-USEC*") (:export "EVENTS-PENDING-P" "GET-CURRENT-EVENT" "MAIN-DO-EVENT" "MAIN" "MAIN-LEVEL" "MAIN-QUIT" "MAIN-ITERATION-DO" "MAIN-ITERATE-ALL") (:export "CONTAINER-CHILD-CLASS" "CONTAINER-CHILD" "CONTAINER-CHILD-CLASS") diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp index 2ee7511..01f6ff3 100644 --- a/gtk/gtk.lisp +++ b/gtk/gtk.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gtk.lisp,v 1.71 2007-06-01 09:17:17 espen Exp $ +;; $Id: gtk.lisp,v 1.72 2007-06-04 19:03:12 espen Exp $ (in-package "GTK") @@ -73,7 +73,7 @@ (defun clg-init (&optional display) (gdk:gdk-init) (unless (gtk-init) (error "Initialization of GTK+ failed.")) - #+(or cmu sbcl) + #?(or (pkg-config:featurep :cmu) (and (pkg-config:featurep :sbcl) (not (pkg-config:sbcl>= 1 0 6)))) (progn (signal-connect (gdk:display-manager) 'display-opened #'(lambda (display) @@ -89,6 +89,8 @@ (defun clg-init (&optional display) (setq *periodic-polling-function* #'main-iterate-all) (setq *max-event-to-sec* 0) (setq *max-event-to-usec* *event-poll-interval*)) + #?(pkg-config:sbcl>= 1 0 6) + (warn "Periodic polling functionality has been removed from SERVE-EVENT in SBCL 1.0.6. An explicit gtk main loop has to be invoked.") #+(and clisp readline) ;; Readline will call the event hook at most ten times per second (setf readline:event-hook #'main-iterate-all) -- [mdw]