-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2001 Espen S. Johnsen <espen@users.sourceforge.net>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2001-2005 Espen S. Johnsen <espen@users.sf.net>
;;
-;; 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: ginterface.lisp,v 1.4 2004/11/06 21:39:58 espen Exp $
+;; $Id: ginterface.lisp,v 1.14 2006/02/15 09:45:41 espen Exp $
(in-package "GLIB")
(t (call-next-method))))
(defmethod compute-effective-slot-definition-initargs ((class ginterface-class) direct-slotds)
- (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+ (if (eq (slot-definition-allocation (first direct-slotds)) :property)
(nconc
(list :pname (signal-name-to-string
(most-specific-slot-value direct-slotds 'pname))
:readable (most-specific-slot-value direct-slotds 'readable)
:writable (most-specific-slot-value direct-slotds 'writable)
- :construct (most-specific-slot-value direct-slotds 'construct))
+ :construct-only (most-specific-slot-value direct-slotds 'construct))
(call-next-method))
(call-next-method)))
-(defmethod shared-initialize ((class ginterface-class) names
- &rest initargs &key name alien-name)
- (declare (ignore initargs names))
+(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
+ (declare (ignore names))
(let* ((class-name (or name (class-name class)))
(type-number
- (find-type-number
- (or (first alien-name) (default-alien-type-name class-name)) t)))
- (register-type class-name type-number))
+ (or
+ (find-type-number class-name)
+ (register-type class-name
+ (or (first gtype) (default-type-init-name class-name))))))
+; (type-default-interface-ref type-number)
+ )
(call-next-method))
-(defmethod validate-superclass
- ((class ginterface-class) (super pcl::standard-class))
+(defmethod validate-superclass ((class ginterface-class) (super standard-class))
(subtypep (class-name super) 'ginterface))
(declare (ignore class args))
(to-alien-function 'gobject))
+(defmethod reader-function ((class ginterface-class) &rest args)
+ (declare (ignore class args))
+ (reader-function 'gobject))
+
+(defmethod writer-function ((class ginterface-class) &rest args)
+ (declare (ignore class args))
+ (writer-function 'gobject))
+
+(defmethod destroy-function ((class ginterface-class) &rest args)
+ (declare (ignore class args))
+ (destroy-function 'gobject))
+
;;;;
(unwind-protect
(multiple-value-bind (array length)
(%object-interface-list-properties iface)
- (unwind-protect
- (%map-params array length type-number inherited-p)
- (deallocate-memory array)))
+ (unless (null-pointer-p array)
+ (unwind-protect
+ (%map-params array length type-number inherited-p)
+ (deallocate-memory array))))
; (type-default-interface-unref type-number)
)))
-(defun expand-ginterface-type (type options &rest args)
+(defun expand-ginterface-type (type forward-p options &rest args)
(declare (ignore args))
(let ((class (type-from-number type))
- (slots (getf options :slots)))
+ (slots (getf options :slots)))
`(defclass ,class (,(supertype type))
- ,(slot-definitions class (query-object-interface-properties type) slots)
+ ,(unless forward-p
+ (slot-definitions class (query-object-interface-properties type) slots))
(:metaclass ginterface-class)
- (:alien-name ,(find-type-name type)))))
+ (:gtype ,(register-type-as type)))))
+(defun ginterface-dependencies (type)
+ (delete-duplicates
+ (cons
+ (supertype type)
+ (mapcar #'param-value-type (query-object-interface-properties type)))))
-(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type)
+(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type 'ginterface-dependencies)
~mdw / clg / blobdiff