X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/dcb31db65bd37358773232f94a915ee0caad97b9..5884be5c1dd5f6dfa460088a9332230fe1a1d7af:/gdk/gdkevents.lisp diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp index ecc5717..c2571cd 100644 --- a/gdk/gdkevents.lisp +++ b/gdk/gdkevents.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 1999-2005 Espen S. Johnsen ;; -;; This library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public -;; License as published by the Free Software Foundation; either -;; version 2 of the License, or (at your option) any later version. +;; Permission is hereby granted, free of charge, to any person obtaining +;; a copy of this software and associated documentation files (the +;; "Software"), to deal in the Software without restriction, including +;; without limitation the rights to use, copy, modify, merge, publish, +;; distribute, sublicense, and/or sell copies of the Software, and to +;; permit persons to whom the Software is furnished to do so, subject to +;; the following conditions: ;; -;; This library is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; Lesser General Public License for more details. +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. ;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this library; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gdkevents.lisp,v 1.9 2005/03/06 17:26:22 espen Exp $ +;; $Id: gdkevents.lisp,v 1.11 2006/02/05 15:39:40 espen Exp $ (in-package "GDK") @@ -59,7 +64,6 @@ (defmethod validate-superclass ((class event-class) (super standard-class)) ;(subtypep (class-name super) 'event) t)) - (defmethod shared-initialize ((class event-class) names &key name type) (let ((class-name (or name (class-name class)))) (unless (eq class-name 'event) @@ -72,10 +76,10 @@ (let ((reader (reader-function 'event-type))) (defun %event-class (location) (gethash (funcall reader location 0) *event-classes*))) -(defmethod ensure-proxy-instance ((class event-class) location) +(defmethod make-proxy-instance :around ((class event-class) location &rest initargs) (declare (ignore class)) (let ((class (%event-class location))) - (make-instance class :location location))) + (apply #'call-next-method class location initargs))) ;;;;