Small bug fix

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index d54aacaf7a7473f8cc5c61f18762625b9e9897c1..e7ee2ac8019c92fd2920014e03ccd85e848e81a8 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.31 2005-01-13 00:17:55 espen Exp $
+;; $Id: gtk.lisp,v 1.34 2005-02-10 00:15:51 espen Exp $
 
 
 (in-package "GTK")
@@ -56,11 +56,28 @@ (defun clg-init (&optional display)
     (gtk-init)
     (prog1
        (gdk:display-open display)
-      (system:add-fd-handler 
-       (gdk:display-connection-number) :input #'main-iterate-all)
-      (setq lisp::*periodic-polling-function* #'main-iterate-all)
-      (setq lisp::*max-event-to-sec* 0)
-      (setq lisp::*max-event-to-usec* 1000))))
+      (add-fd-handler (gdk:display-connection-number) :input #'main-iterate-all)
+      (setq *periodic-polling-function* #'main-iterate-all)
+      (setq *max-event-to-sec* 0)
+      (setq *max-event-to-usec* 1000))))
+
+
+;;; About dialog
+
+#+gtk2.6
+(progn
+  (def-callback-marshal %about-dialog-activate-link-func 
+    (nil (dialog about-dialog) (link (copy-of string))))
+
+  (defbinding about-dialog-set-email-hook (function) nil
+    ((callback %about-dialog-activate-link-func) pointer)
+    ((register-callback-function function) unsigned-int)
+    ((callback user-data-destroy-func) pointer))
+  
+  (defbinding about-dialog-set-url-hook (function) nil
+    ((callback %about-dialog-activate-link-func) pointer)
+    ((register-callback-function function) unsigned-int)
+    ((callback user-data-destroy-func) pointer)))
 
 
 ;;; Acccel group
@@ -117,7 +134,7 @@ (defun accel-groups-activate (object accelerator)
 (defbinding accel-groups-from-object () (gslist accel-groups)
   (object gobject))
 
-(defbinding accelerator-valid-p (key &optional mask) boolean
+(defbinding accelerator-valid-p (key &optional modifiers) boolean
   (key unsigned-int)
   (modifiers gdk:modifier-type))
 
@@ -379,10 +396,6 @@ (defbinding check-menu-item-toggled () nil
   (check-menu-item check-menu-item))
 
 
-
-;;; Clipboard
-
-
 ;;; Color selection
 
 (defbinding (color-selection-is-adjusting-p
@@ -570,8 +583,8 @@ (defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
   (sensitive boolean))
 
 #+gtk2.6
-(defbinding alternative-dialog-button-order-p(&optional screen)
-  (screen (or null screen)))
+(defbinding alternative-dialog-button-order-p (&optional screen) boolean
+  (screen (or null gdk:screen)))
 
 #+gtk2.6
 (defbinding (dialog-set-alternative-button-order 
@@ -622,7 +635,7 @@ (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))
+  ((callback user-data-destroy-func) pointer))
 
 (defbinding entry-completion-complete () nil
   (completion entry-completion))
@@ -757,17 +770,16 @@ (defbinding file-filter-add-pattern () nil
 
 #+gtk2.6
 (defbinding file-filter-add-pixbuf-formats () nil
-  (filter file-filter)
-  (pattern string))
+  (filter file-filter))
 
 (def-callback-marshal %file-filter-func (boolean file-filter-info))
 
-(defbinding file-filter-add-custom () nil
+(defbinding file-filter-add-custom (filter needed function) nil
   (filter file-filter)
   (needed file-filter-flags)
   ((callback %file-filter-func) pointer)
   ((register-callback-function function) unsigned-int)
-  ((callback %destroy-user-data) pointer))
+  ((callback user-data-destroy-func) pointer))
 
 (defbinding file-filter-get-needed () file-filter-flags
   (filter file-filter))
@@ -925,7 +937,7 @@ (defbinding menu-item-toggle-size-allocate () nil
 ;;; Menu tool button
 
 #+gtk2.6
-(defbinding menu-tool-button-set-arrow-tip () nil
+(defbinding menu-tool-button-set-arrow-tooltip () nil
   (menu-tool-button menu-tool-button)
   (tooltips tooltips)
   (tip-text string)
@@ -1871,7 +1883,7 @@ (defbinding editable-insert-text (editable text &optional (position 0)) nil
   (editable editable)
   (text string)
   ((length text) int)
-  (position position-type :in-out))
+  (position position :in-out))
 
 (defun editable-append-text (editable text)
   (editable-insert-text editable text nil))