Duplicate definitions removed

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 2987297319cd635db56e1273bdc37dfba866a32e..7e50f1cbd023168cadffd7d0899d863e24eff1c5 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -20,10 +20,16 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkcontainer.lisp,v 1.18 2005-04-23 16:48:52 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.20 2006-02-28 16:32:18 espen Exp $
 
 (in-package "GTK")
 
+(defgeneric container-add (container widget &rest args))
+(defgeneric container-remove (container widget))
+(defgeneric container-children (container))
+(defgeneric (setf container-children) (children container))
+
+
 (defmethod shared-initialize ((container container) names &rest initargs 
                              &key child children child-args 
                                   (show-children nil show-children-p))
@@ -89,11 +95,11 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
-(def-callback-marshal %foreach-callback (nil widget))
+(define-callback-marshal %foreach-callback nil (widget))
 
 (defbinding %container-foreach (container callback-id) nil
   (container container)
-  ((callback %foreach-callback) pointer)
+  (%foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun container-foreach (container function)
@@ -102,7 +108,7 @@ (defun container-foreach (container function)
 
 (defbinding %container-forall (container callback-id) nil
   (container container)
-  ((callback %foreach-callback) pointer)
+  (%foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun container-forall (container function)