Update of /project/lambda-gtk/cvsroot/lambda-gtk
In directory common-lisp.net:/tmp/cvs-serv31337
Modified Files:
lambda-gtk-common.lisp lambda-gtk-openmcl.lisp
Log Message:
package cleanup issues, renamed openmcl interface dir to gtk2
Date: Mon Dec 13 03:51:23 2004
Author: htaube
Index: lambda-gtk/lambda-gtk-common.lisp
diff -u lambda-gtk/lambda-gtk-common.lisp:1.1.1.1 lambda-gtk/lambda-gtk-common.lisp:1.2
--- lambda-gtk/lambda-gtk-common.lisp:1.1.1.1 Tue Nov 30 15:59:31 2004
+++ lambda-gtk/lambda-gtk-common.lisp Mon Dec 13 03:51:23 2004
@@ -522,8 +522,11 @@
fil)
(pprint `(eval-when (:compile-toplevel :load-toplevel :execute)
(defpackage :gtk ,uses
- #+openmcl (:shadow :true :false))
- (defpackage :gdk ,uses)
+ (:shadow :true :false :fill))
+ (defpackage :gdk ,uses
+ (:shadow :copy :invert :xor :clear :and :or
+ :set :delete :plus :mouse :destroy
+ :map :unmap :scroll) )
(defpackage :g ,uses ,@ gshadow)
(defpackage :atk ,uses)
(defpackage :pango ,uses (:shadow :break)))
Index: lambda-gtk/lambda-gtk-openmcl.lisp
diff -u lambda-gtk/lambda-gtk-openmcl.lisp:1.2 lambda-gtk/lambda-gtk-openmcl.lisp:1.3
--- lambda-gtk/lambda-gtk-openmcl.lisp:1.2 Wed Dec 8 03:22:27 2004
+++ lambda-gtk/lambda-gtk-openmcl.lisp Mon Dec 13 03:51:23 2004
@@ -338,9 +338,9 @@
(dolist (l *gtk-libfiles*)
(open-shared-library (libpath l)))))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (if (probe-file \"ccl:darwin-headers;gtk\" )
+ (if (probe-file \"ccl:darwin-headers;gtk2\" )
(use-interface-dir :gtk2)
- (error \"Interface directory ccl:darwin-headers;gtk; does not exist.\")))
+ (error \"Interface directory ccl:darwin-headers;gtk2; does not exist.\")))
")
;;;