X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/84967144c882854364eb20d872e4b52793983ae9..18ffc6e0ec7b51a8393c6428857084c0fb886c76:/gtk/gtk.lisp?ds=sidebyside

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 6299f2c..3da3b13 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.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
 
-;; $Id: gtk.lisp,v 1.18 2004/11/19 13:09:00 espen Exp $
+;; $Id: gtk.lisp,v 1.21 2004/12/16 23:49:53 espen Exp $
 
 
 (in-package "GTK")
@@ -321,11 +321,12 @@ (defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model
 
 ;;;; Dialog
 
-(defmethod shared-initialize ((dialog dialog) names &rest initargs &key button)
-  (declare (ignore button))
-  (call-next-method)
-  (dolist (button-definition (get-all initargs :button))
-    (apply #'dialog-add-button dialog (mklist button-definition))))
+(defmethod shared-initialize ((dialog dialog) names &rest initargs 
+			      &key button buttons)
+  (declare (ignore button buttons))
+  (prog1
+      (call-next-method)
+    (initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
   
 
 (defvar %*response-id-key* (gensym))
@@ -457,7 +458,7 @@ (defmethod (setf container-children) (children (dialog dialog))
 
 ;;; Entry
 
-(defbinding  entry-get-layout () (copy-of pango:layout)
+(defbinding  entry-get-layout () pango:layout
   (entry entry))
 
 (defbinding entry-get-layout-offsets () nil
@@ -524,7 +525,7 @@ (defbinding label-select-region () nil
 (defbinding label-get-text () string
   (label label))
 
-(defbinding label-get-layout () (copy-of pango:layout)
+(defbinding label-get-layout () pango:layout
   (label label))
 
 (defbinding label-get-selection-bounds () boolean
@@ -650,6 +651,15 @@ (defbinding toggle-button-toggled () nil
 
 ;;; Window
 
+(defmethod initialize-instance ((window window) &rest initargs 
+				&key accel-group accel-groups)
+  (declare (ignore accel-group accel-groups))
+  (prog1
+      (call-next-method)
+    (initial-add window #'window-add-accel-group 
+     initargs :accel-group :accel-groups)))
+
+
 (defbinding window-set-wmclass () nil
   (window window)
   (wmclass-name string)
@@ -676,7 +686,8 @@ (defbinding window-set-default-size (window width height) int
 
 ;(defbinding window-set-geometry-hints)
 
-(defbinding window-list-toplevels () (glist window))
+(defbinding window-list-toplevels () (glist (copy-of window))
+  "Returns a list of all existing toplevel windows.")
 
 (defbinding window-add-mnemonic (window key target) nil
   (window window)
@@ -1170,17 +1181,16 @@ (defbinding table-resize () nil
   (columns unsigned-int))
 
 (defbinding table-attach (table child left right top bottom
-			  &key (x-options '(:expand :fill))
-			       (y-options '(:expand :fill))
-			       (x-padding 0) (y-padding 0)) nil
+			  &key options x-options y-options
+			  (x-padding 0) (y-padding 0)) nil
   (table table)
   (child widget)
   (left unsigned-int)
   (right unsigned-int)
   (top unsigned-int)
   (bottom unsigned-int)
-  (x-options attach-options)
-  (y-options attach-options)
+  ((append (mklist options) (mklist x-options)) attach-options)
+  ((append (mklist options) (mklist y-options)) attach-options)
   (x-padding unsigned-int)
   (y-padding unsigned-int))
 
@@ -1494,14 +1504,57 @@ (defbinding progress-bar-pulse () nil
   (progress-bar progress-bar))
 
 
+;;; Size group
+
+(defmethod initialize-instance ((size-group size-group) &rest initargs 
+				&key widget widgets)
+  (declare (ignore widget widgets))
+  (prog1
+      (call-next-method)
+    (initial-add size-group #'size-group-add-widget 
+     initargs :widget :widgets)))
+
+
+(defbinding size-group-add-widget () nil
+  (size-group size-group)
+  (widget widget))
+
+(defbinding size-group-remove-widget () nil
+  (size-group size-group)
+  (widget widget))
+
 
 ;;; Stock items
 
-(defbinding stock-lookup () boolean
+(defbinding %stock-item-copy () pointer
+  (location pointer))
+
+(defbinding %stock-item-free () nil
+  (location pointer))
+
+(defmethod reference-foreign ((class (eql (find-class 'stock-item))) location)
+  (%stock-item-copy location))
+
+(defmethod unreference-foreign ((class (eql (find-class 'stock-item))) location)
+  (%stock-item-free location))
+
+(defbinding stock-add (stock-item) nil
+  (stock-item stock-item)
+  (1 unsigned-int))
+
+(defbinding stock-list-ids () (gslist string))
+
+(defbinding %stock-lookup () boolean
   (stock-id string)
-  ((make-instance 'stock-item) stock-item :return))
-  
+  (location pointer))
 
+(defun stock-lookup (stock-id)
+  (let ((location 
+	 (allocate-memory (proxy-instance-size (find-class 'stock-item)))))
+    (unwind-protect
+	(when (%stock-lookup stock-id location)
+	  (ensure-proxy-instance 'stock-item (%stock-item-copy location)))
+	(deallocate-memory location))))
 
 
 ;;; Tooltips
@@ -1548,22 +1601,6 @@ (defbinding rc-get-style () style
 
 ;;; Accelerator Groups
 #|
-(defbinding accel-group-get-default () accel-group)
-
-(deftype-method alien-ref accel-group (type-spec)
-  (declare (ignore type-spec))
-  '%accel-group-ref)
-
-(deftype-method alien-unref accel-group (type-spec)
-  (declare (ignore type-spec))
-  '%accel-group-unref)
-
-(defbinding %accel-group-ref () accel-group
-  (accel-group (or accel-group pointer)))
-
-(defbinding %accel-group-unref () nil
-  (accel-group (or accel-group pointer)))
-
 (defbinding accel-group-activate (accel-group key modifiers) boolean
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)