X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/ddd14ce8f98399870abdf67452465b88a83a38b7..3e4f39aed54688e361ada3e73be676ca1fb5dfb7:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 0f40e66..7d57bfd 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.46 2008-03-04 16:03:38 espen Exp $
 
 
 (in-package "GTK")
@@ -56,6 +56,9 @@ (defbinding %object-sink () nil
 
 ;;;; 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 @@ (defbinding main-iteration-do (&optional (blocking t)) boolean
 
 (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 @@ (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition)
 	  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 @@ (defmethod add-reader-method ((class container-child-class) generic-function slo
 		  (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