Update for SBCL 1.0.6

diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp
index 52caea2420f3e3a26e096d6f1f800dcce9369309..66f5ae803b8d2bc3dedc8bf5d513ecb6bb76b334 100644 (file)
--- 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")
           "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*" 
   (: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")
   (: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 2ee75116362b2a21533239ea6c91e674a4edc7a0..01f6ff3bf9bbe0d93de4825410051d3fc0950821 100644 (file)
--- 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.
 
 ;; 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")
 
 
 (in-package "GTK")


@@ -73,7 +73,7 @@ (defun clg-init (&optional display)
     (gdk:gdk-init)
     (unless (gtk-init)
       (error "Initialization of GTK+ failed."))
     (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)
     (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*))
       (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)
     #+(and clisp readline)
     ;; Readline will call the event hook at most ten times per second
     (setf readline:event-hook #'main-iterate-all)