;; 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.42 2006/02/06 22:58:35 espen Exp $
+;; $Id: gtype.lisp,v 1.43 2006/02/08 21:53:34 espen Exp $
(in-package "GLIB")
((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
-(defmethod compute-foreign-size ((class ginstance-class))
- (type-instance-size (find-type-number (class-name class))))
+(defun update-size (class)
+ (let ((type-number (find-type-number class)))
+ (cond
+ ((not (slot-boundp class 'size))
+ (setf (slot-value class 'size) (type-instance-size type-number)))
+ ((and
+ (slot-boundp class 'size)
+ (not (= (type-instance-size type-number) (slot-value class 'size))))
+ (warn "Size mismatch for class ~A" class)))))
+
(defmethod finalize-inheritance ((class ginstance-class))
(call-next-method)
(supertype type-number)
(not (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))))
+ (supertype type-number) class-name)))
+
+ (update-size class))
+
+
+(defmethod shared-initialize ((class ginstance-class) names &rest initargs)
+ (declare (ignore initargs))
+ (call-next-method)
+ (when (class-finalized-p class)
+ (update-size class)))
+
(defmethod validate-superclass ((class ginstance-class) (super standard-class))
(subtypep (class-name super) 'ginstance))
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtkobject.lisp,v 1.29 2006/02/04 12:17:45 espen Exp $
+;; $Id: gtkobject.lisp,v 1.30 2006/02/08 21:57:26 espen Exp $
(in-package "GTK")
(if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
(nconc
(list :pname (most-specific-slot-value direct-slotds 'pname))
+ ;; Need this to prevent type type expansion in SBCL (>= 0.9.8)
+ (list :type (most-specific-slot-value direct-slotds 'type))
(call-next-method))
(call-next-method)))
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtkwidget.lisp,v 1.18 2005/04/23 16:48:52 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.19 2006/02/08 22:00:09 espen Exp $
(in-package "GTK")
:parent parent :child object))))
((call-next-method))))
-(defmethod slot-boundp-using-class ((class gobject-class) (object widget) slot)
- (or
- (and
- (eq (slot-definition-name slot) 'child-properties)
- (slot-boundp object 'parent))
- (call-next-method)))
(defmethod compute-signal-function ((widget widget) signal function object)
(if (eq object :parent)