Dialog widget updated

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 67433b5d1f5ffdbc4afbae60f75a0aa1397323ce..72cffa23505eef446363d768c140e3fa91e242d3 100644 (file)
--- 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.21 2004-12-16 23:49:53 espen Exp $
+;; $Id: gtk.lisp,v 1.25 2004-12-20 23:19:19 espen Exp $
 
 
 (in-package "GTK")
@@ -329,12 +329,10 @@ (defmethod shared-initialize ((dialog dialog) names &rest initargs
     (initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
   
 
-(defvar %*response-id-key* (gensym))
-
 (defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
   (or
    (cadr (assoc id (rest (type-expand-1 'response-type))))
-   (let ((response-ids (object-data dialog %*response-id-key*)))
+   (let ((response-ids (object-data dialog 'response-id-key)))
     (cond
       ((and response-ids (position id response-ids :test #'equal)))
       (create-p
@@ -344,7 +342,7 @@ (defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
          (1- (length response-ids)))
         (t
          (setf 
-          (object-data dialog %*response-id-key*)
+          (object-data dialog 'response-id-key)
           (make-array 1 :adjustable t :fill-pointer t :initial-element id))
          0)))
       (error-p
@@ -356,7 +354,7 @@ (defun %dialog-find-response-id (dialog response-id-num)
        (rassoc
        (list response-id-num)
        (rest (type-expand-1 'response-type)) :test #'equal))
-    (aref (object-data dialog %*response-id-key*) response-id-num )))
+    (aref (object-data dialog 'response-id-key) response-id-num )))
 
 
 (defmethod signal-connect ((dialog dialog) signal function &key object after)
@@ -390,8 +388,7 @@ (defbinding %dialog-add-button () button
 
 (defun dialog-add-button (dialog label &optional (response label)
                          &key default object after)
-  "Adds a button to the dialog. If no response is given, then label
-   will be used."
+  "Adds a button to the dialog."
   (let* ((id (if (functionp response)
                 label
               response))
@@ -436,8 +433,20 @@ (defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
   ((%dialog-find-response-id-num dialog response-id nil t) int)
   (sensitive boolean))
 
+#+gtk2.6
+(defbinding alternative-dialog-button-order-p(&optional screen)
+  (screen (or null screen)))
+
+#+gtk2.6
+(defbinding (dialog-set-alternative-button-order 
+            "gtk_dialog_set_alternative_button_order_from_array") 
+    (dialog new-order)
+  (dialog dialog)
+  ((length new-order) int)
+  ((map 'vector #'(lambda (id)
+                   (%dialog-find-response-id-num dialog id nil t))
+       new-order) (vector int)))
 
-;; Addition dialog functions
 
 (defmethod container-add ((dialog dialog) (child widget) &rest args)
   (apply #'container-add (dialog-vbox dialog) child args))
@@ -453,7 +462,12 @@ (defmethod (setf container-children) (children (dialog dialog))
 
 
 
-;;; Drawing area -- no functions
+;;; Drawing area
+
+(defbinding drawing-area-get-size () nil
+  (drawing-area drawing-area)
+  (width int :out)
+  (height int :out))
 
 
 ;;; Entry
@@ -467,6 +481,39 @@ (defbinding entry-get-layout-offsets () nil
   (y int :out))
 
 
+;;; Entry Completion
+
+(def-callback-marshal %entry-completion-match-func
+    (boolean entry-completion string (copy-of tree-iter)))
+
+(defbinding entry-completion-set-match-func (completion function) nil
+  (completion entry-completion)
+  ((callback %entry-completion-match-func) pointer)
+  ((register-callback-function function) unsigned-int)
+  ((callback %destroy-user-data) pointer))
+
+(defbinding entry-completion-complete () nil
+  (completion entry-completion))
+
+#+gtk2.6
+(defbinding entry-completion-insert-prefix () nil
+  (completion entry-completion))
+
+(defbinding entry-completion-insert-action-text () nil
+  (completion entry-completion)
+  (index int)
+  (text string))
+
+(defbinding entry-completion-insert-action-markup () nil
+  (completion entry-completion)
+  (index int)
+  (markup string))
+
+(defbinding entry-completion-delete-action () nil
+  (completion entry-completion)
+  (index int))
+
+
 ;;; Image
 
 (defbinding image-set-from-file () nil
@@ -1038,27 +1085,6 @@ (defbinding paned-pack2 () nil
   (resize boolean)
   (shrink boolean))
 
-(defun (setf paned-child1) (child paned)
-  (paned-pack1 paned child nil t)
-  child)
-
-(defun (setf paned-child2) (child paned)
-  (paned-pack2 paned child t t)
-  child)
-
-;; Defined in gtkglue.c
-(defbinding paned-child1 () widget
-  (paned paned)
-  (resize boolean :out)
-  (shrink boolean :out))
-
-;; Defined in gtkglue.c
-(defbinding paned-child2 () widget
-  (paned paned)
-  (resize boolean :out)
-  (shrink boolean :out))
-
-
 
 ;;; Layout