X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/1de3a4180b9466454eeb09e9e690ff50097be710..167450a314d73a284308da7bd4117302ded4f0dc:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index b510ec0..bd62906 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -15,22 +15,22 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkwidget.lisp,v 1.8 2002-03-24 12:58:34 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.10 2004-11-06 21:39:58 espen Exp $
 
 (in-package "GTK")
 
 
 (defmethod shared-initialize ((widget widget) names &rest initargs &key parent)
-  (declare (ignore initargs names))
+  (remf initargs :parent)
   (prog1
-      (call-next-method)
+      (apply #'call-next-method widget names initargs)
     (when parent
       (let ((old-parent (widget-parent widget))
-	    (parent-widget (first (mklist parent)))
+	    (parent (first (mklist parent)))
 	    (args (rest (mklist parent))))
 	(when old-parent
 	  (container-remove old-parent widget))
-	(apply #'container-add parent-widget widget args)))))
+	(apply #'container-add parent widget args)))))
 
 (defmethod shared-initialize :after ((widget widget) names &rest initargs
 				     &key show-all)
@@ -361,7 +361,7 @@ received."
 
 (defun widget-get-size-request (widget)
   (multiple-value-bind (width height) (%widget-get-size-request widget)
-    (values (unless (= width -1) width) (unless (= height -1) height))))
+     (values (unless (= width -1) width) (unless (= height -1) height))))
 
 (defbinding widget-set-size-request (widget width height) nil
   (widget widget)