X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.high-level.lisp;h=977007f236dc75c02e206b450327768e51582200;hb=af5ce50499aa0db8d068c00e0a25d8a1334c1740;hp=4d427e4a42609c7f94ef54cff3c0e4000d7743a9;hpb=e47f55fdba89d198a3eb42f31799d641e292e089;p=cl-gtk2.git

diff --git a/gtk/gtk.high-level.lisp b/gtk/gtk.high-level.lisp
index 4d427e4..977007f 100644
--- a/gtk/gtk.high-level.lisp
+++ b/gtk/gtk.high-level.lisp
@@ -1,16 +1,26 @@
 (in-package :gtk)
 
+(define-condition gtk-call-aborted (error)
+  ((condition :initarg :condition :reader gtk-call-aborted-condition))
+  (:report (lambda (c stream)
+             (format stream "Call within main loop aborted because of error:~%~A" (gtk-call-aborted-condition c)))))
+
 (defun call-within-main-loop-and-wait (fn)
   (let ((lock (bt:make-lock))
         (cv (bt:make-condition-variable))
+        error
         result)
     (bt:with-lock-held (lock)
       (within-main-loop
-        (setf result (multiple-value-list (funcall fn)))
+        (handler-case
+            (setf result (multiple-value-list (funcall fn)))
+          (error (e) (setf error e)))
         (bt:with-lock-held (lock)
           (bt:condition-notify cv)))
       (bt:condition-wait cv lock)
-      (values-list result))))
+      (if error
+          (error 'gtk-call-aborted :condition error)
+          (values-list result)))))
 
 (export 'call-within-main-loop-and-wait)
 
@@ -132,4 +142,16 @@
             (with-progress-bar ("Texts" 10)
               (loop
                  repeat 10
-                 do (with-progress-bar-action (sleep 1))))))))
\ No newline at end of file
+                 do (with-progress-bar-action (sleep 1))))))))
+
+(defun show-message (message &key (buttons :ok) (message-type :info) (use-markup nil))
+  (let ((dialog (make-instance 'message-dialog
+                               :text message
+                               :buttons buttons
+                               :message-type message-type
+                               :use-markup use-markup)))
+    (prog1
+        (dialog-run dialog)
+      (object-destroy dialog))))
+
+(export 'show-message)