Made iter argument to TREE-MODEL-ITER-N-CHILDREN optional

[clg] / gtk / gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 142548b48e996fd1632d42fb13c9cf150254cafb..9155813dfbcc86bfce17a3e7aba937f9e83d5402 100644 (file)
--- 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.25 2006-09-27 08:44:44 espen Exp $
 
 (in-package "GTK")
 
@@ -32,10 +32,11 @@ (defmethod print-object ((widget widget) stream)
        (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 slot-unbound ((class gobject-class) (object widget)
 
 
 (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-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)
@@ -294,17 +296,58 @@ (defbinding widget-shape-combine-mask () nil
   (x-offset int)
   (y-offset int))
 
-(defbinding widget-path () nil
-  (widget widget)
-  (path-length int :out)
-  (path string :out)
-  (reverse-path string :out))
+(defun widget-path (widget)
+  (let ((subpath (list (if (and 
+                           (slot-boundp widget 'name) 
+                           (not (zerop (length (widget-name widget)))))
+                          (widget-name widget)
+                        (type-of widget)))))
+    (if (slot-boundp widget 'parent)
+       (nconc (widget-path (widget-parent widget)) subpath)
+      subpath)))
+
+(defun widget-class-path (widget)
+    (let ((subpath (list (type-of widget))))
+  (if (slot-boundp widget 'parent)
+      (nconc (widget-class-path (widget-parent widget)) subpath)
+    subpath)))
+
+
+(defun widget-path-lookup (path &optional (root (nreverse (window-list-toplevels))) (error-p t))
+  (let ((component (first path)))
+    (loop
+     for widget in (mklist root)
+     do (when (or
+              (and 
+               (stringp component) (slot-boundp widget 'name) 
+               (string= component (widget-name widget)))
+              (and
+               (symbolp component) (typep widget component)))
+         (cond
+          ((endp (rest path)) (return widget))
+          ((typep widget 'container)
+           (let ((descendant (widget-path-lookup (rest path) (container-children widget) nil)))
+             (when descendant
+               (return descendant))))))))
+  (when error-p
+    (error "Widget not found: ~A" path)))
+
+
+(defun widget-find (name &optional (root (nreverse (window-list-toplevels))) (error-p t))
+  "Search for a widget with the given name. ROOT should be a container
+widget or a list of containers."
+  (loop
+   for widget in (mklist root)
+   do (cond
+       ((and (slot-boundp widget 'name) (string= name (widget-name widget)))
+       (return-from widget-find widget))
+       ((typep widget 'container)
+       (let ((descendant (widget-find name (container-children widget) nil)))
+         (when descendant
+           (return-from widget-find descendant))))))
+  (when error-p
+    (error "Widget not found: ~A" name)))
 
-(defbinding widget-class-path () nil
-  (widget widget)
-  (path-length int :out)
-  (path string :out)
-  (reverse-path string :out))
 
 (defbinding widget-modify-style () nil
   (widget widget)
@@ -333,10 +376,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))
@@ -486,8 +531,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))