Temporary hack to get clg build with Gtk+ 2.14

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 7d57bfdc004692940f481ef498eb07fbd94f3623..d9bae51236a135128699b371493a83dab389a8aa 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.
 
 ;; 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.46 2008-03-04 16:03:38 espen Exp $
+;; $Id: gtkobject.lisp,v 1.49 2008-10-09 18:45:01 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -29,12 +29,12 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (init-types-in-library gtk "libgtk-2.0")
+  (init-types-in-library gtk "libgtk-2.0"))

 
 

-  (defclass %object (gobject)
-    ()
-    (:metaclass gobject-class)
-    (:gtype |gtk_object_get_type|)))
+(defclass %object (initially-unowned)
+  ()
+  (:metaclass gobject-class)
+  (:gtype |gtk_object_get_type|))

 
 
 (defmethod initialize-instance ((object %object) &rest initargs &key signal)
 
 
 (defmethod initialize-instance ((object %object) &rest initargs &key signal)


@@ -43,16 +43,18 @@ (defmethod initialize-instance ((object %object) &rest initargs &key signal)
   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 
   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 

-(defmethod initialize-instance :around ((object %object) &rest initargs)
-  (declare (ignore initargs))
-  (call-next-method)
-  ;; Add a temorary reference which will be removed when the object is
-  ;; sinked
-  (funcall (reference-function '%object) (foreign-location object))
-  (%object-sink object))
-
-(defbinding %object-sink () nil
-  (object %object))
+#?-(pkg-exists-p "glib-2.0" :atleast-version "2.10.0")
+(progn
+  (defmethod initialize-instance :around ((object %object) &rest initargs)
+    (declare (ignore initargs))
+    (call-next-method)
+    ;; Add a temorary reference which will be removed when the object is
+    ;; sinked
+    (funcall (reference-function '%object) (foreign-location object))
+    (%object-sink object))
+  
+  (defbinding %object-sink () nil
+    (object %object)))

 
 ;;;; Main loop and event handling
 
 
 ;;;; Main loop and event handling
 


@@ -226,12 +228,18 @@ (defbinding %container-class-list-child-properties () pointer
   (class pointer)
   (n-properties unsigned-int :out))
 
   (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
   (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)
        (deallocate-memory array)))))
 
 (defun default-container-child-name (container-class)


@@ -245,14 +253,12 @@ (defun expand-container-type (type forward-p options)
        (expand-gobject-type type t options)
       `(progn
         ,(expand-gobject-type type nil options)
        (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))))))
-
-(defun container-child-class (container-class)
-  (gethash container-class *container-to-child-class-mappings*))
+        ,(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-dependencies (type options)
   (delete-duplicates 
 
 (defun container-dependencies (type options)
   (delete-duplicates