X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/37ad565bb0b2a7a8b7bdf35aa217edb1a2ac94b0..19406f20ddb51fdcf94bf9a91c12c53717bad724:/gtk/defpackage.lisp

diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp
index 5badf41..52caea2 100644
--- a/gtk/defpackage.lisp
+++ b/gtk/defpackage.lisp
@@ -8,7 +8,7 @@
   (: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")
+  (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER" "REMOVE-FD-HANDLER")
   #+(or cmu sbcl)
   (:import-from #+cmu"LISP" #+sbcl"SB-IMPL"
 	   "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" 
@@ -18,7 +18,18 @@
   (:export "CONTAINER-CHILD-CLASS" "CONTAINER-CHILD" "CONTAINER-CHILD-CLASS")
   ;; Signal names that need to be explicit exported
   (:export "TOGGLED")
-  ;; Symbols re-exported from glib
+  ;; 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 GTK package
+  (:export "TOGGLE" "CONTAINRE-CHILD")
+  ;; Symbols re-exported from GLIB package
   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
 	   "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"
 	   "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"))