Fix for CMUCL 18c

diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index 9721c7a..b101811 100644 (file)
--- a/gdk/gdkevents.lisp
+++ b/gdk/gdkevents.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdkevents.lisp,v 1.1 2001-05-11 16:20:20 espen Exp $
+;; $Id: gdkevents.lisp,v 1.2 2001-05-31 12:36:39 espen Exp $
 
 (in-package "GDK")
 
@@ -68,20 +68,20 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass event-class (proxy-class)
-    ((event-type :reader event-class-type))))
-
-
-(defmethod shared-initialize ((class event-class) names
-                             &rest initargs &key type)
-  (declare (ignore initargs names))
-  (call-next-method)
-  (setf (slot-value class 'event-type) (first type))
-  (setf (gethash (first type) *event-classes*) class))
+    ((event-type :reader event-class-type)))
 
+  
+  (defmethod shared-initialize ((class event-class) names
+                               &rest initargs &key type)
+    (declare (ignore initargs names))
+    (call-next-method)
+    (setf (slot-value class 'event-type) (first type))
+    (setf (gethash (first type) *event-classes*) class))
+  
 
-(defmethod validate-superclass
-  ((class event-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'event))
+  (defmethod validate-superclass
+    ((class event-class) (super pcl::standard-class))
+    (subtypep (class-name super) 'event)))
 
 
 ;;;;

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index 11a0f80..e53b01f 100644 (file)
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gboxed.lisp,v 1.4 2001-05-29 15:46:17 espen Exp $
+;; $Id: gboxed.lisp,v 1.5 2001-05-31 12:36:20 espen Exp $
 
 (in-package "GLIB")
 
@@ -39,24 +39,24 @@
 ;;;; Metaclass for boxed classes
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass boxed-class (proxy-class)))
+  (defclass boxed-class (proxy-class))
 
 
-(defmethod shared-initialize ((class boxed-class) names
-                             &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
-  (call-next-method)
+  (defmethod shared-initialize ((class boxed-class) names
+                               &rest initargs &key name alien-name)
+    (declare (ignore initargs names))
+    (call-next-method)
+    
+    (let* ((class-name (or name (class-name class)))
+          (type-number
+           (find-type-number
+            (or (first alien-name) (default-alien-type-name class-name)))))
+      (register-type class-name type-number)))
 
-  (let* ((class-name (or name (class-name class)))
-        (type-number
-         (find-type-number
-          (or (first alien-name) (default-alien-type-name class-name)))))
-    (register-type class-name type-number)))
 
-
-(defmethod validate-superclass
+  (defmethod validate-superclass
     ((class boxed-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'boxed))
+    (subtypep (class-name super) 'boxed)))
 
 
 ;;;;