X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/7126772159863888c1ab35a0e6eeb6655baab821..c7dc6a10747ea8104768f828ac9296bf4ca56859:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 142548b..fc2e7bf 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2000-2006 Espen S. Johnsen <espen@users.sf.net>
 ;;
 ;; Permission is hereby granted, free of charge, to any person obtaining
 ;; a copy of this software and associated documentation files (the
@@ -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: gtkwidget.lisp,v 1.20 2006-02-26 15:24:46 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.23 2006-04-26 12:11:21 espen Exp $
 
 (in-package "GTK")
 
@@ -32,10 +32,11 @@
        (slot-boundp widget 'name) (not (zerop (length (widget-name widget)))))
       (print-unreadable-object (widget stream :type t :identity nil)
         (format stream "~S at 0x~X" 
-	 (widget-name widget) (sap-int (foreign-location widget))))
+	 (widget-name widget) (pointer-address (foreign-location widget))))
     (call-next-method)))
 
 (defmethod shared-initialize ((widget widget) names &key (visible nil visible-p))
+  (declare (ignore names))
   (when (and visible-p (not visible)) ; widget explicit set as not visible
     (setf (user-data widget 'hidden-p) t)
     (signal-connect widget 'show 
@@ -67,6 +68,7 @@
 
 
 (defmethod compute-signal-function ((widget widget) signal function object)
+  (declare (ignore signal))
   (if (eq object :parent)
       #'(lambda (&rest args)
 	  (if (slot-boundp widget 'parent)
@@ -146,12 +148,12 @@
 (defbinding widget-size-request
     (widget &optional (requisition (make-instance 'requisition))) nil
   (widget widget)
-  (requisition requisition :return))
+  (requisition requisition :in/return))
 
 (defbinding widget-get-child-requisition 
     (widget &optional (requisition (make-instance 'requisition))) nil
   (widget widget)
-  (requisition requisition :return))
+  (requisition requisition :in/return))
 
 (defbinding widget-size-allocate () nil
   (widget widget)
@@ -333,10 +335,12 @@ received."
   (state state-type)
   (color gdk:color))
 
-(defbinding widget-modify-font () nil
+(defbinding widget-modify-font (widget font-desc) nil
   (widget widget)
-  (state state-type)
-  (font-desc pango:font-description))
+  ((etypecase font-desc
+     (pango:font-description font-desc)
+     (string (pango:font-description-from-string font-desc)))
+   pango:font-description))
 
 (defbinding widget-create-pango-context () pango:context
   (widget widget))
@@ -486,8 +490,12 @@ received."
   (event gdk:event))
 
 (defun (setf widget-cursor) (cursor-type widget)
-  (let ((cursor (make-instance 'gdk:cursor :type cursor-type)))
-    (gdk:window-set-cursor (widget-window widget) cursor)))
+  (warn "(SETF WIDGET-CURSOR) is deprecated, use WIDGET-SET-CURSOR instead")
+  (widget-set-cursor widget cursor-type))
+
+(defun widget-set-cursor (widget cursor &rest args)
+  (gdk:window-set-cursor (widget-window widget) 
+   (apply #'gdk:ensure-cursor cursor args)))
 
 (defbinding %widget-get-parent-window () gdk:window
   (widget widget))