[cells-gtk-cvs] CVS update: root/cells-gtk/gtk-app.lisp root/cells-gtk/tree-view.lisp root/cells-gtk/widgets.lisp

[Kenny Tilton]

Update of /project/cells-gtk/cvsroot/root/cells-gtk
In directory common-lisp.net:/tmp/cvs-serv22788/cells-gtk

Modified Files:
	gtk-app.lisp tree-view.lisp widgets.lisp 
Log Message:
Merge brave but incomplete attempt at adding OS/X.
Date: Thu Dec 23 17:34:45 2004
Author: ktilton

Index: root/cells-gtk/gtk-app.lisp
diff -u root/cells-gtk/gtk-app.lisp:1.5 root/cells-gtk/gtk-app.lisp:1.6
--- root/cells-gtk/gtk-app.lisp:1.5	Wed Dec 22 17:23:50 2004
+++ root/cells-gtk/gtk-app.lisp	Thu Dec 23 17:34:42 2004
@@ -112,13 +112,6 @@
                      :module (string lib)))
         finally (setf *gtk-loaded* t))))
 
-#+cmu
-(loop for lib in '(:gthread :glib :gobject :gdk :gtk)
-        do (assert (uffi:load-foreign-library (gtk-ffi::libname lib)
-                     :force-load #+lispworks t #-lispworks nil
-                     :module (string lib)))
-        finally (setf *gtk-loaded* t))
-
 (eval-when (compile load eval)
   (export '(gtk-app gtk-reset cells-gtk-init title icon tooltips tooltips-enable tooltips-delay
              start-app gtk-global-callback-register gtk-global-callback-funcall)))


Index: root/cells-gtk/tree-view.lisp
diff -u root/cells-gtk/tree-view.lisp:1.6 root/cells-gtk/tree-view.lisp:1.7
--- root/cells-gtk/tree-view.lisp:1.6	Wed Dec 22 17:23:50 2004
+++ root/cells-gtk/tree-view.lisp	Thu Dec 23 17:34:42 2004
@@ -101,7 +101,7 @@
 	   (:multiple 3))))))
 
 (ff-defun-callable :cdecl :int tree-view-select-handler
-  ((column-widget (* :void)) (event (* :void)) (data (* :void)))
+  ((column-widget :pointer-void) (event :pointer-void) (data :pointer-void))
   (bif (tree-view (gtk-object-find column-widget))
     (let ((cb (callback-recover tree-view :on-select)))
       (funcall cb tree-view column-widget event data))
@@ -173,8 +173,8 @@
 				  (items-factory self)))))
 
 (ff-defun-callable :cdecl :int tree-view-render-cell-callback
-    ((tree-column (* :void)) (cell-renderer (* :void))
-     (tree-model (* :void)) (iter (* :void)) (data (* :void)))
+    ((tree-column :pointer-void) (cell-renderer :pointer-void)
+     (tree-model :pointer-void) (iter :pointer-void) (data :pointer-void))
   (bif (self (gtk-object-find tree-column))
     (let ((cb (callback-recover self :render-cell)))
       (assert cb () "No :render-cell callback for ~a" self)
@@ -225,4 +225,4 @@
 		 `(list ,type ',inits ,renderer))))
 
 (eval-when (compile load eval)
-  (export '(mk-listbox mk-treebox def-columns)))
\ No newline at end of file
+  (export '(mk-listbox mk-treebox def-columns)))


Index: root/cells-gtk/widgets.lisp
diff -u root/cells-gtk/widgets.lisp:1.5 root/cells-gtk/widgets.lisp:1.6
--- root/cells-gtk/widgets.lisp:1.5	Thu Dec 16 05:51:11 2004
+++ root/cells-gtk/widgets.lisp	Thu Dec 23 17:34:42 2004
@@ -118,7 +118,7 @@
 
 (defmacro def-gtk-event-handler (event)
   `(ff-defun-callable :cdecl :int ,(intern (string-upcase (format nil "~a-handler" event)))
-     ((widget (* :void)) (event (* :void)) (data (* :void)))
+     ((widget :pointer-void) (event :pointer-void) (data :pointer-void))
      ;(print (list :entered-gtk-event-handler-cb ,(symbol-name event) widget))
      (bif (self (gtk-object-find widget))
        (let ((cb (callback-recover self ,(intern (symbol-name event) :keyword))))
@@ -238,6 +238,7 @@
                    1))))
 
 
+#-cmu
 (ff-defun-callable :cdecl :boolean timeout-handler-callback
     ((data (* :int)))
   ;;(print (list :timeout-handler-callback data))