Updated for gtk 2.0

[clg] / gtk / gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 9a07ec8cc2326d0b9ba2ef98c949c25e7bd3add9..3f263bb56183d8b132e082dde68632e2d20dda58 100644 (file)
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -15,22 +15,25 @@
 ;; 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.5 2001/10/21 23:22:04 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.7 2001/12/12 20:24:41 espen Exp $
 
 (in-package "GTK")
 
 
-(defmethod initialize-instance ((widget widget) &rest initargs &key parent)
-  (declare (ignore initargs))
+(defmethod shared-initialize ((widget widget) names &rest initargs &key parent)
+  (declare (ignore initargs names))
   (call-next-method)
   (when parent
-    (let ((parent-widget (first (mklist parent)))
+    (let ((old-parent (widget-parent widget))
+         (parent-widget (first (mklist parent)))
          (args (rest (mklist parent))))
+      (when old-parent
+       (container-remove old-parent widget))
       (apply #'container-add parent-widget widget args))))
 
-(defmethod initialize-instance :after ((widget widget) &rest initargs
-                                      &key show-all)
-  (declare (ignore initargs))
+(defmethod shared-initialize :after ((widget widget) names &rest initargs
+                                    &key show-all)
+  (declare (ignore initargs names))
   (when show-all
     (widget-show-all widget)))
 
@@ -93,6 +96,7 @@ (defbinding widget-realize () nil
 (defbinding widget-unrealize () nil
   (widget widget))
 
+#|
 (defbinding widget-add-accelerator
     (widget signal accel-group key modifiers flags) nil
   (widget widget)
@@ -125,6 +129,7 @@ (defbinding widget-unlock-accelerators () nil
 (defbinding (widget-accelerators-locked-p "gtk_widget_accelerators_locked")
     () boolean
   (widget widget))
+|#
 
 (defbinding widget-event () int
   (widget widget)