Moved a couple of functions wrongly put in gtkobject.lisp to gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index bb8bb7613aab552bf725f328b6fd7b92995e8daf..a1b5de0f09a03fde1d9850866a0e2790a9afd753 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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: gtkcontainer.lisp,v 1.4 2001/10/21 23:20:13 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.5 2001/10/25 08:16:17 espen Exp $

 
 (in-package "GTK")
 
 
 (in-package "GTK")
 


@@ -49,6 +49,19 @@ (defun container-remove (container widget)
   (slot-makunbound widget 'child-slots))
 
 
   (slot-makunbound widget 'child-slots))
 
 

+(defbinding %container-child-get-property () nil
+  (container container)
+  (child widget)
+  (property-name string)
+  (value gvalue))
+
+(defbinding %container-child-set-property () nil
+  (container container)
+  (child widget)
+  (property-name string)
+  (value gvalue))
+  
+

 (defbinding container-check-resize () nil
   (container container))
 
 (defbinding container-check-resize () nil
   (container container))
 

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 32917ead8732eb58c8c1ddceaddbfdc32e04eeb1..cd905c0ba066424ba656a386b2e794af27997689 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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: gtkobject.lisp,v 1.10 2001/10/21 23:18:11 espen Exp $
+;; $Id: gtkobject.lisp,v 1.11 2001/10/25 08:16:17 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -136,18 +136,6 @@ (defmethod effective-slot-definition-class ((class child-class) initargs)
     (:property (find-class 'effective-child-slot-definition))
     (t (call-next-method))))
 
     (:property (find-class 'effective-child-slot-definition))
     (t (call-next-method))))
 

-(defbinding %container-child-get-property () nil
-  (container container)
-  (child widget)
-  (property-name string)
-  (value gvalue))
-
-(defbinding %container-child-set-property () nil
-  (container container)
-  (child widget)
-  (property-name string)
-  (value gvalue))
-  

 (defmethod compute-virtual-slot-accessors
     ((class child-class) (slotd effective-child-slot-definition) direct-slotds)
   (with-slots (type) slotd
 (defmethod compute-virtual-slot-accessors
     ((class child-class) (slotd effective-child-slot-definition) direct-slotds)
   (with-slots (type) slotd