From 647c99e5eb8f39caa408f12639497ed549ef7ea5 Mon Sep 17 00:00:00 2001
From: espen <espen>
Date: Fri, 4 Feb 2005 13:15:14 +0000
Subject: [PATCH] Fixes for Gtk 2.6

---
 gtk/gtk.lisp      | 29 +++++++++++++++++++++++------
 gtk/gtktypes.lisp | 13 +++++++++++--
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index b9e9c22..faca526 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.32 2005-02-03 23:09:07 espen Exp $
+;; $Id: gtk.lisp,v 1.33 2005-02-04 13:15:15 espen Exp $
 
 
 (in-package "GTK")
@@ -62,6 +62,24 @@
       (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
 
 (defbinding %accel-group-connect () nil
@@ -565,8 +583,8 @@
   (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 
@@ -752,8 +770,7 @@
 
 #+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))
 
@@ -920,7 +937,7 @@
 ;;; 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)
diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 41e599d..c36d2c5 100644
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.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: gtktypes.lisp,v 1.30 2005-01-12 13:38:18 espen Exp $
+;; $Id: gtktypes.lisp,v 1.31 2005-02-04 13:15:14 espen Exp $
 
 
 (in-package "GTK")
@@ -626,7 +626,7 @@
      :type entry-completion)
     (max-length :merge t :unbound 0)
     #+gtk2.6
-    (with-chars :merge t :unbound -1)))
+    (width-chars :merge t :unbound -1)))
 
   ("GtkEntryCompletion"
    :slots
@@ -993,6 +993,15 @@
    ; deprecated property
    ((font :ignore t)))
 
+  ("GtkClipboard"
+   :slots
+   ((display
+     :allocation :virtual
+     :getter "gtk_clipboard_get_display"
+     :reader clipboard-display
+     :type gdk:display)))
+
+
   ;; Not needed
   ("GtkFundamentalType" :ignore t)
   ("GtkArgFlags" :ignore t)
-- 
2.11.0