Adding bindings to entry completion

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 67433b5d1f5ffdbc4afbae60f75a0aa1397323ce..a42f10f48cbce2f5b5277711134f0063492e0e2b 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.24 2004-12-20 22:43:26 espen Exp $
 
 
 (in-package "GTK")
@@ -453,7 +453,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 +472,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 +1076,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