;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtype.lisp,v 1.34 2006-02-01 14:17:37 espen Exp $
+;; $Id: gtype.lisp,v 1.36 2006-02-01 22:48:39 espen Exp $
(in-package "GLIB")
type
(let ((name (find-foreign-type-name type-number)))
(cond
- ((and name (type-number-from-glib-name name nil))
+ ((and name (not (= (type-number-from-glib-name name nil) type-number)))
;; This is a hack because GdkEvent seems to be registered
;; multiple times
(type-from-number (type-number-from-glib-name name)))
(info type-info)
(0 unsigned-int))
-(defun register-new-type (type parent)
+(defun register-new-type (type parent &optional foreign-name)
(let ((parent-info (type-query parent)))
(with-slots ((parent-number type-number) class-size instance-size) parent-info
(let ((type-number
(%type-register-static
parent-number
- (default-alien-type-name type)
+ (or foreign-name (default-alien-type-name type))
(make-instance 'type-info :class-size class-size :instance-size instance-size))))
(setf (gethash type *lisp-type-to-type-number*) type-number)
(setf (gethash type-number *type-number-to-lisp-type*) type)
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass ginstance-class (proxy-class)
- ()))
+ ((foreign-init))))
-(defmethod shared-initialize ((class ginstance-class) names &rest initargs &key name gtype)
- (declare (ignore names))
- (let* ((class-name (or name (class-name class)))
- (type-number
+(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
+ (call-next-method)
+ (setf
+ (slot-value class 'foreign-init)
+ (or (first gtype) (default-type-init-name (or name (class-name class))))))
+
+
+(defmethod finalize-inheritance ((class ginstance-class))
+ (call-next-method)
+ (let* ((class-name (class-name class))
+ (super (most-specific-proxy-superclass class))
+ (foreign-init (slot-value class 'foreign-init))
+ (type-number
(or
(find-type-number class-name)
- (register-type class-name
- (or (first gtype) (default-type-init-name class-name))))))
- (if (getf initargs :size)
- (call-next-method)
- (let ((size (type-instance-size type-number)))
- (apply #'call-next-method class names :size (list size) initargs)))))
+ (if (or
+ (symbolp foreign-init)
+ (type-number-from-glib-name foreign-init nil))
+ (register-type class-name foreign-init)
+ (register-new-type class-name (class-name super) foreign-init)))))
+ (unless (eq (class-name super) (supertype type-number))
+ (warn "~A is the super type for ~A in the gobject type system."
+ (supertype type-number) class-name))
+
+ (unless (slot-boundp class 'size)
+ (setf (slot-value class 'size) (type-instance-size type-number)))))
(defmethod validate-superclass ((class ginstance-class) (super standard-class))