Added gffi to the list of used packages and cleaned up

diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp
index dc8895b8fc0597fdbe5e254ba5405ccfa080e9c3..2339a83c756d45ed8761785a0cb7e195f2a71dc4 100644 (file)
--- a/gtk/defpackage.lisp
+++ b/gtk/defpackage.lisp
@@ -1,21 +1,22 @@
 (defpackage "GTK"
 (defpackage "GTK"

-  (:use "GLIB" "COMMON-LISP" "AUTOEXPORT")
+  (:use "GFFI" "GLIB" "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")

   #+cmu(:use "PCL" "EXT")
   #+sbcl(:use "SB-PCL" "SB-EXT")
   #+cmu(:use "PCL" "EXT")
   #+sbcl(:use "SB-PCL" "SB-EXT")

-  (:shadowing-import-from "GLIB" "DEFTYPE")
+  #+clisp(:use "CLOS")
+  #+clisp(:shadowing-import-from "GFFI" "SLOT-DEFINITION-TYPE")
+  #+(or cmu sbcl)

   (:import-from #+cmu"PCL" #+sbcl"SB-PCL"
           "ADD-READER-METHOD" "ADD-WRITER-METHOD")
   (: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")

+  #+(or cmu sbcl)

   (:import-from #+cmu"LISP" #+sbcl"SB-IMPL"
           "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" 
           "*MAX-EVENT-TO-USEC*")               
   (:import-from #+cmu"LISP" #+sbcl"SB-IMPL"
           "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" 
           "*MAX-EVENT-TO-USEC*")               

-  (:export "*CLG-VERSION*")
-  (:export "OBJECT" "OBJECT-ARG" "OBJECT-SINK")
-  (:export "REGISTER-USER-DATA" "FIND-USER-DATA" "REGISTER-CALLBACK-FUNCTION"
-          "*CALLBACK-MARSHAL*" "*DESTROY-MARSHAL*")

   (:export "EVENTS-PENDING-P" "GET-CURRENT-EVENT" "MAIN-DO-EVENT" "MAIN"
   (:export "EVENTS-PENDING-P" "GET-CURRENT-EVENT" "MAIN-DO-EVENT" "MAIN"

-          "MAIN-LEVEL" "MAIN-QUIT" "MAIN-ITERATION" "MAIN-ITERATE-ALL"
-          "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE")
+          "MAIN-LEVEL" "MAIN-QUIT" "MAIN-ITERATION-DO" "MAIN-ITERATE-ALL")
+  (:export "CONTAINER-CHILD-CLASS" "CONTAINER-CHILD")
+  ;; Symbols re-exported from glib

   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"

-          "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK")
-  (:export "OBJECT-CLASS" "WIDGET-CLASS" "CONTAINER-CLASS" "CHILD-CLASS"))
+          "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"
+          "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"))