X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/f5c99598e1a12d82a1e3223d4fdc90b3ceb144ad..72d9260f8258b525339c7241da0631ceaf9f3842:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 64aabe4..0117544 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.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: gtkwidget.lisp,v 1.28 2007-06-20 10:20:47 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.32 2008-11-25 22:17:08 espen Exp $
 
 (in-package "GTK")
 
@@ -60,8 +60,7 @@ (defmethod slot-unbound ((class gobject-class) (object widget)
    ((slot-boundp object 'parent)
     (with-slots (parent child-properties) object
       (setf child-properties
-       (make-instance 
-        (gethash (class-of parent) *container-to-child-class-mappings*)
+       (make-instance (find-child-class (class-of parent))
 	:parent parent :child object))))
    ((call-next-method))))
 
@@ -71,23 +70,23 @@ (defparameter *widget-display-as-default-in-signal-handler-p* t)
 (defmethod compute-signal-function ((widget widget) signal function object args)
   (let ((wrapper
 	 (if (eq object :parent)
-	     #'(lambda (&rest emission-args)
-		 (let ((all-args (nconc (rest emission-args) args)))
+	     #'(lambda (widget &rest emission-args)
+		 (let ((all-args (nconc emission-args args)))
 		   (if (slot-boundp widget 'parent)
 		       (apply function (widget-parent widget) all-args)
 		     ;; Delay until parent is set
 		     (signal-connect widget 'parent-set
 		      #'(lambda (old-parent)
 			  (declare (ignore old-parent))
-			  (apply #'signal-emit widget signal (rest emission-args)))
+			  (apply #'signal-emit widget signal emission-args))
 		      :remove t))))
 	   (call-next-method))))
     (if *widget-display-as-default-in-signal-handler-p*
-	#'(lambda (&rest args)
+	#'(lambda (widget &rest args)
 	    (let ((display (when (slot-boundp widget 'window)
 			     (gdk:drawable-display (widget-window widget)))))
 	      (gdk:with-default-display (display)
-	        (apply wrapper args))))
+	        (apply wrapper widget args))))
       wrapper)))
 
 
@@ -522,12 +521,29 @@ (defbinding widget-remove-mnemonic-label () nil
   (widget widget)
   (label widget))
 
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.14.0")
+(defbinding widget-get-snapshot () gdk:pixmap
+  (widget widget)
+  (clip-rect (or null gdk:rectangle)))
+
 
 ;;; Additional bindings and functions
 
-(defbinding (widget-mapped-p "gtk_widget_mapped_p") () boolean
+(defbinding %widget-flags () int
   (widget widget))
 
+(defun widget-flags (widget)
+  (let ((flags (%widget-flags widget)))
+    (nconc 
+     (int-to-object-flags flags)
+     (int-to-widget-flags flags))))
+
+(defun widget-mapped-p (widget)
+  (find :mapped (widget-flags widget)))
+
+(defun widget-realized-p (widget)
+  (find :realized (widget-flags widget)))
+
 (defbinding widget-get-size-allocation () nil
   (widget widget)
   (width int :out)