X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..f669d557d2ed78a18912095334a31fb9796e4231:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index f6ca6bd..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,12 +20,23 @@
 ;; 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.18 2005-04-23 16:48:52 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.23 2006-04-26 12:11:21 espen Exp $
 
 (in-package "GTK")
 
 
+#-debug-ref-counting
+(defmethod print-object ((widget widget) stream)
+  (if (and 
+       (proxy-valid-p widget) 
+       (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) (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 
@@ -55,14 +66,9 @@ (defmethod slot-unbound ((class gobject-class) (object widget)
 	:parent parent :child object))))
    ((call-next-method))))
 
-(defmethod slot-boundp-using-class ((class gobject-class) (object widget) slot)
-  (or
-   (and 
-    (eq (slot-definition-name slot) 'child-properties) 
-    (slot-boundp object 'parent))
-   (call-next-method)))
 
 (defmethod compute-signal-function ((widget widget) signal function object)
+  (declare (ignore signal))
   (if (eq object :parent)
       #'(lambda (&rest args)
 	  (if (slot-boundp widget 'parent)
@@ -142,12 +148,12 @@ (defbinding widget-queue-resize-no-redraw () nil
 (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)
@@ -156,7 +162,7 @@ (defbinding widget-size-allocate () nil
 (defbinding widget-add-accelerator
     (widget signal accel-group key modifiers flags) nil
   (widget widget)
-  ((name-to-string signal) string)
+  ((signal-name-to-string signal) string)
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type)
@@ -329,10 +335,12 @@ (defbinding widget-modify-base () nil
   (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))
@@ -482,8 +490,12 @@ (defbinding get-event-widget () widget
   (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))