Improved support for multiple display connections

[clg] / gtk / defpackage.lisp

diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp
index 2339a83c756d45ed8761785a0cb7e195f2a71dc4..3593768fd692db2a33f33d64d03d73f73e38b2cd 100644 (file)
--- a/gtk/defpackage.lisp
+++ b/gtk/defpackage.lisp
@@ -8,15 +8,34 @@ (defpackage "GTK"
   (:import-from #+cmu"PCL" #+sbcl"SB-PCL"
           "ADD-READER-METHOD" "ADD-WRITER-METHOD")
   #+(or cmu sbcl)
-  (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER")
-  #+(or cmu sbcl)
+  (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER" "REMOVE-FD-HANDLER")
+  #?(or (pkg-config:featurep :cmu) (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*")               
+  #+clisp
+  (:import-from "SOCKET" "SOCKET-STATUS")
   (: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")
-  ;; Symbols re-exported from glib
+  (:export "CONTAINER-CHILD-CLASS" "CONTAINER-CHILD" "CONTAINER-CHILD-CLASS")
+  ;; Signal names that need to be explicit exported
+  (:export "TOGGLED")
+  ;; Symbols re-exported from glib -- will not be exported from
+  ;; this package in the future
   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
           "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"
           "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"))
+
+
+(defpackage "CLG"
+  (:use "GLIB" "GTK")
+  ;; Symbols re-exported from the GLIB package
+  (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
+          "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"
+          "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE")
+  ;; Symbols re-exported from the GDK package 
+  (:import-from "GDK" "TIMEOUT-ADD-WITH-LOCK" "IDLE-ADD-WITH-LOCK")
+  (:export "TIMEOUT-ADD-WITH-LOCK" "IDLE-ADD-WITH-LOCK")
+  ;; Symbols not automatically re-exported from the GTK package
+  (:export "TOGGLE" "CONTAINER-CHILD"))
+