;; 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.35 2006-02-01 17:46:11 espen Exp $
+;; $Id: gtype.lisp,v 1.38 2006-02-04 12:15:32 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)))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass ginstance-class (proxy-class)
- ()))
+ ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
-(defmethod shared-initialize :after ((class ginstance-class) names &key name gtype)
- (let* ((class-name (or name (class-name class)))
+(defmethod compute-foreign-size ((class ginstance-class))
+ (type-instance-size (find-type-number (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-name (or (first gtype) (default-type-init-name class-name)))
- (type-number
+ (gtype (or
+ (first (ginstance-class-gtype class))
+ (default-alien-type-name class-name)))
+ (type-number
(or
(find-type-number class-name)
- (if (type-number-from-glib-name foreign-name nil)
- (register-type class-name foreign-name)
- (register-new-type class-name (class-name super) foreign-name)))))
+ (if (or (symbolp gtype) (type-number-from-glib-name gtype nil))
+ (register-type class-name gtype)
+ (register-new-type class-name (class-name super) gtype)))))
(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)))))
+ (supertype type-number) class-name))))
(defmethod validate-superclass ((class ginstance-class) (super standard-class))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass ginstance (proxy)
- ((class :allocation :alien :type pointer))
- (:metaclass proxy-class)))
+ (;(class :allocation :alien :type pointer :offset 0)
+ )
+ (:metaclass proxy-class)
+ (:size #.(size-of 'pointer))))
(defun %type-number-of-ginstance (location)
(let ((class (sap-ref-sap location 0)))