X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/5dd328ff6f454bf520aa9dbc5f4461eaaf4a4c1b..0ffe3acd54763c2fd503c51efaffe979a46f59aa:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index c613886..20e4380 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtk.lisp,v 1.90 2008-02-29 18:34:19 espen Exp $
+;; $Id: gtk.lisp,v 1.95 2008-10-08 18:18:52 espen Exp $
 
 
 (in-package "GTK")
@@ -45,7 +45,7 @@
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
 (defun clg-version ()
-  "clg 0.93")
+  "clg 0.94")
 
 
 ;;;; Initalization and display handling
@@ -108,7 +108,7 @@
     (when (and 
 	   (find-package "SWANK")
 	   (not (eq (symbol-value (find-symbol "*COMMUNICATION-STYLE*" "SWANK")) style)))
-      (error "When running clg in Slime, the communication style ~S must be used in combination with asynchronous event handling on this platform. See the README file and <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information." style)))
+      (error "When running clg in Slime, the communication style ~S must be used in combination with asynchronous event handling on this platform. See the README file and <http://common-lisp.net/project/slime/doc/html/Communication-style.html> for more information." style)))
 
   #?(or (featurep :cmu) (sbcl< 1 0 6) (sbcl>= 1 0 15 6))
   (progn
@@ -602,8 +602,8 @@
 (defmethod compute-signal-function ((bin bin) signal function object args)
   (declare (ignore signal))
   (if (eq object :child)
-      #'(lambda (&rest emission-args) 
-	  (apply function (bin-child bin) (nconc (rest emission-args) args)))
+      #'(lambda (bin &rest emission-args) 
+	  (apply function (bin-child bin) (nconc emission-args args)))
     (call-next-method)))
 
 
@@ -1686,7 +1686,7 @@
   icons)
 
 (defbinding %window-set-default-icon () nil
-  (icons (glist gdk:pixbuf)))
+  (icon gdk:pixbuf))
 
 (defgeneric (setf window-default-icon) (icon))
 
@@ -2396,7 +2396,7 @@
 
 (defun spin-button-spin (spin-button value)
   (etypecase value
-    (real (%spin-button-spin spin-button :spin-user-defined value))
+    (real (%spin-button-spin spin-button :user-defined value))
     (spin-type (%spin-button-spin spin-button value 0))))
 
 
@@ -2531,36 +2531,40 @@
 
 ;;; Tooltip
 
-;; #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
-;; (progn
-;;   (defbinding %tooltip-set-markup () nil
-;;     tooltip
-;;     (markup string))
-
-;;   (defbinding %tooltip-set-text () nil
-;;     tooltip
-;;     (text string))
-
-;;   (defbinding %tooltip-set-icon () nil
-;;     tooltip
-;;     (icon gdk:pixbuf))
-
-;;   (defbinding %tooltip-set-from-stock-icon () nil
-;;     tooltip
-;;     (stock-id string)
-;;     icon-size)
-
-;;   (defbinding %tooltip-set-custom () nil
-;;     tooltip
-;;     widget)
-
-;;   (defun tooltip-set (tooltip value &key (markup t) (icon-size :button))
-;;     (etypecase value
-;;       (string (if markup
-;; 		  (tooltip-set-markup tooltip value)
-;; 		(tooltip-set-text tooltip value)))
-;;       (pixbuf (tooltip-set-icon tooltip value))
-;;       (keyword (tooltip-set-icon-from-stock tooltip value icon-size))
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+(progn
+  (defbinding tooltip-set-markup () nil
+    tooltip
+    (markup string))
+
+  (defbinding tooltip-set-text () nil
+    tooltip
+    (text string))
+
+  (defbinding %tooltip-set-icon () nil
+    tooltip
+    (icon gdk:pixbuf))
+
+  (defbinding %tooltip-set-icon-from-stock () nil
+    tooltip
+    (stock-id string)
+    icon-size)
+
+  (defun tooltip-set-icon (tooltip icon &key (size :button))
+    (etypecase icon
+      (gdk:pixbuf (%tooltip-set-icon tooltip icon))
+      (string (%tooltip-set-icon-from-stock tooltip icon size))))
+
+  (defbinding tooltip-set-custom () nil
+    tooltip
+    widget)
+
+  (defbinding tooltip-trigger-tooltip-query (&optional (display (gdk:display-get-default))) nil
+    (display gdk:display))
+
+  (defbinding tooltip-set-tip-area () nil
+    tooltip
+    gdk:rectangle))