Callbacks from C done properly

[clg] / gdk / gdkevents.lisp

diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index 9721c7aa5c7773c29f9800d3aaccae7fcf26e65f..fe7e35727dd248c5dab40b8ac45d559b8fa290c6 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.4 2004-10-31 11:53:30 espen Exp $
 
 (in-package "GDK")
 
@@ -49,10 +49,8 @@   (defclass event (boxed)
 
 (defmethod initialize-instance ((event event) &rest initargs)
   (declare (ignore initargs))
-  (with-slots (location %type) event
-    (setf location (%event-new))
-    (setf %type (event-class-type (class-of event))))
-  (call-next-method))
+  (call-next-method)
+  (setf (slot-value event '%type) (event-class-type (class-of event))))
 
 (deftype-method translate-from-alien
     event (type-spec location &optional weak-ref)
@@ -61,27 +59,25 @@ (deftype-method translate-from-alien
      (unless (null-pointer-p location)
        (ensure-proxy-instance (%type-of-event location) location ,weak-ref))))
 
-(defbinding %event-new () pointer)
-
 
 ;;;; Metaclass for event classes
 
 (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 &key name type)
+    (call-next-method)
+    (setf (slot-value class 'event-type) (first type))
+    (setf (gethash (first type) *event-classes*) class)
+    (let ((class-name (or name (class-name class))))
+      (register-type class-name 'event)))
+  
 
-(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)))
 
 
 ;;;;