projects
/
cl-gtk2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo
[cl-gtk2.git]
/
gtk
/
gtk.main_loop_events.lisp
diff --git
a/gtk/gtk.main_loop_events.lisp
b/gtk/gtk.main_loop_events.lisp
index
d2bdb9c
..
5fbc15f
100644
(file)
--- a/
gtk/gtk.main_loop_events.lisp
+++ b/
gtk/gtk.main_loop_events.lisp
@@
-19,10
+19,6
@@
(gtk-init)
(gtk-init)
-(defcfun gtk-test-register-all-types :void)
-
-(gtk-test-register-all-types)
-
(defcfun gtk-events-pending :boolean)
(defcfun gtk-main :void)
(defcfun gtk-events-pending :boolean)
(defcfun gtk-main :void)
@@
-32,6
+28,8
@@
#+thread-support
(defun ensure-gtk-main ()
#+thread-support
(defun ensure-gtk-main ()
+ (when (and *main-thread* (not (bt:thread-alive-p *main-thread*)))
+ (setf *main-thread* nil))
(unless *main-thread*
(setf *main-thread* (bt:make-thread (lambda () (gtk:gtk-main)) :name "cl-gtk2 main thread"))))
(unless *main-thread*
(setf *main-thread* (bt:make-thread (lambda () (gtk:gtk-main)) :name "cl-gtk2 main thread"))))
@@
-40,6
+38,9
@@
(when *main-thread*
(bt:join-thread *main-thread*)))
(when *main-thread*
(bt:join-thread *main-thread*)))
+#+thread-support
+(export 'join-main-thread)
+
#-thread-support
(defun ensure-gtk-main ()
(gtk-main))
#-thread-support
(defun ensure-gtk-main ()
(gtk-main))