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

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 0f40e66..c098921 100644
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.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: gtkobject.lisp,v 1.44 2007-09-06 14:22:19 espen Exp $
+;; $Id: gtkobject.lisp,v 1.47 2008-03-06 22:02:08 espen Exp $
 
 
 (in-package "GTK")
@@ -56,6 +56,9 @@
 
 ;;;; Main loop and event handling
 
+(defparameter *reentrant-main-iteration* t)
+(defvar *running-main-iteration* nil)
+
 (defbinding events-pending-p () boolean)
 
 (defbinding get-current-event () gdk:event)
@@ -74,9 +77,11 @@
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))
-  (loop
-   while (events-pending-p)
-   do (main-iteration-do nil))
+  (unless (and (not *reentrant-main-iteration*) *running-main-iteration*)
+    (let ((*running-main-iteration* t))
+      (loop
+       while (events-pending-p)
+       do (main-iteration-do nil))))
   #+clisp 0)
 
 
@@ -181,7 +186,7 @@
 	  value))))
 
 
-(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
   (add-method
    generic-function
    (make-instance 'standard-method
@@ -192,7 +197,7 @@
 		  (declare (ignore next-methods))
 		  (child-property-value (first args) slot-name)))))
 
-(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
   (add-method
    generic-function
    (make-instance 'standard-method
@@ -221,12 +226,18 @@
   (class pointer)
   (n-properties unsigned-int :out))
 
-(defun query-container-class-child-properties (type-number)
+(defun query-container-class-child-properties (type-number &optional owner-only-p)
   (let ((class (type-class-ref type-number)))
     (multiple-value-bind (array length)
 	(%container-class-list-child-properties class)
       (unwind-protect
-	  (map-c-vector 'list #'identity array 'param length)
+	  (let ((properties (map-c-vector 'list #'identity array 'param length)))
+	    (if owner-only-p
+		(delete-if 
+		  #'(lambda (property)
+		      (not (eql (slot-value property 'glib::owner-type) type-number)))
+		  properties)
+	      properties))
 	(deallocate-memory array)))))
 
 (defun default-container-child-name (container-class)
@@ -240,11 +251,12 @@
 	(expand-gobject-type type t options)
       `(progn
 	 ,(expand-gobject-type type nil options)
-	 (defclass ,child-class (,(default-container-child-name super))
-	   ,(slot-definitions child-class 
-	     (query-container-class-child-properties type) nil)
-	   (:metaclass container-child-class)
-	   (:container ,class))))))
+	 ,(let ((child-properties (query-container-class-child-properties type t)))
+	    (when child-properties
+	      `(defclass ,child-class (,(default-container-child-name super))
+	         ,(slot-definitions child-class child-properties nil)
+		 (:metaclass container-child-class)
+		 (:container ,class))))))))
 
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))