Added proper protection for multi threaded event handling

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 9a319813a2214c350886471f188bc54fd164464c..f5376351785447fd37379af2fdbd59d57b7f71fc 100644 (file)
--- 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.40 2007-03-12 12:59:22 espen Exp $
+;; $Id: gtkobject.lisp,v 1.42 2007-06-06 10:43:54 espen Exp $
 
 
 (in-package "GTK")
@@ -29,9 +29,7 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library 
-   #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") 
-                         "/libgtk-x11-2.0." asdf:*dso-extension*))
+  (init-types-in-library gtk "libgtk-2.0")
 
   (defclass %object (gobject)
     ()
@@ -238,4 +236,10 @@     (defclass ,child-class (,(default-container-child-name super))
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))
 
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)