Update of /project/cells/cvsroot/cells-gtk3/gtk-ffi
In directory clnet:/tmp/cvs-serv26378/gtk-ffi
Modified Files:
gtk-button.lisp gtk-core.lisp gtk-ffi.lisp gtk-gl-ext.lisp
gtk-list-tree.lisp gtk-menu.lisp gtk-other.lisp gtk-tool.lisp
gtk-utilities.lisp package.lisp
Log Message:
ported to the latest cffi, cl-opengl, cl-cairo2
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-button.lisp 2008/04/13 10:59:23 1.1
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-button.lisp 2008/05/05 15:30:14 1.2
@@ -25,23 +25,23 @@
(gtk-button-new :pointer ())
(gtk-button-set-label
:void
- ((button :pointer) (label :gtk-string)))
+ ((button :pointer) (label gtk-string)))
(gtk-button-set-relief
:void
((button :pointer) (style :int)))
(gtk-button-set-use-stock
:void
- ((button :pointer) (use-stock :gtk-boolean)))
+ ((button :pointer) (use-stock gtk-boolean)))
(gtk-toggle-button-new :pointer ())
(gtk-toggle-button-set-mode
:void
((button :pointer)
- (draw-indicator :gtk-boolean)))
+ (draw-indicator gtk-boolean)))
(gtk-toggle-button-set-active
:void
- ((button :pointer) (active :gtk-boolean)))
+ ((button :pointer) (active gtk-boolean)))
(gtk-toggle-button-get-active
- :gtk-boolean
+ gtk-boolean
((button :pointer)))
(gtk-check-button-new :pointer ())
(gtk-radio-button-new
@@ -70,7 +70,7 @@
((spin-button :pointer)))
(gtk-spin-button-set-wrap
:void
- ((spin-button :pointer) (wrap :gtk-boolean))))
+ ((spin-button :pointer) (wrap gtk-boolean))))
#+debugthis
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-core.lisp 2008/04/13 10:59:23 1.1
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-core.lisp 2008/05/05 15:30:14 1.2
@@ -26,14 +26,14 @@
((milliseconds :unsigned-int)
(func :pointer)
(data :pointer)))
- (g-locale-from-utf8 :gtk-string
+ (g-locale-from-utf8 gtk-string
((utf8-string :pointer)
(len :int)
(bytes-read :pointer)
(bytes-written :pointer)
(gerror :pointer)))
(g-locale-to-utf8 :pointer
- ((local-string :gtk-string)
+ ((local-string gtk-string)
(len :int)
(bytes-read :pointer)
(bytes-written :pointer)
@@ -100,27 +100,27 @@
(destroy-data :pointer)))
(g-signal-connect-closure :unsigned-long
((instance :pointer)
- (detailed-signal :gtk-string)
+ (detailed-signal gtk-string)
(closure :pointer)
- (after :gtk-boolean)))
+ (after gtk-boolean)))
(g-object-set-valist :void
((object :pointer)
- (first-prop :gtk-string)
+ (first-prop gtk-string)
(varargs :pointer)))
(g-object-set-property :void
((object :pointer)
- (property-name :gtk-string)
+ (property-name gtk-string)
(value :pointer)))
(g-value-init :pointer ((value :pointer)
(type :unsigned-long)))
(g-value-unset :void ((value :pointer)))
(g-value-set-string :void
- ((value :pointer) (str :gtk-string)))
+ ((value :pointer) (str gtk-string)))
(g-value-set-int :void ((value :pointer) (int :int)))
(g-value-set-long :void ((value :pointer) (long :long)))
(g-value-set-boolean :void
((value :pointer)
- (bool :gtk-boolean)))
+ (bool gtk-boolean)))
(g-value-set-float :void
((value :pointer) (float :float)))
(g-value-set-double :void
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-ffi.lisp 2008/04/23 06:34:24 1.2
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-ffi.lisp 2008/05/05 15:30:14 1.3
@@ -24,8 +24,8 @@
"Convert hello-c to uffi to cffi types. Swap order of arguments."
(flet ((convert-type (type)
(case type
- (c-string :gtk-string)
- (boolean :gtk-boolean)
+ (c-string 'gtk-string)
+ (boolean 'gtk-boolean)
(t (cffi-uffi-compat::convert-uffi-type (ffi-to-uffi-type type))))))
(dbind (ignore module &rest funcs) body
(pprint `(,ignore
@@ -54,26 +54,45 @@
(defvar *gtk-debug* nil)
;;; ============== Define CFFI types, and their translations....
-(eval-when (:compile-toplevel :load-toplevel :execute) ; ph: help SBCL
- (cffi:defctype :gtk-string :pointer :documentation "string type for cffi type translation")
- (cffi:defctype :gtk-boolean :pointer :documentation "boolean type for cffi type translation"))
+#+nil (eval-when (:compile-toplevel :load-toplevel :execute) ; ph: help SBCL
+ (cffi:defctype gtk-string :pointer "string type for cffi type translation")
+ (cffi:defctype gtk-boolean :pointer "boolean type for cffi type translation"))
-(defmethod cffi:translate-to-foreign (value (type (eql :gtk-boolean)))
+(cffi:define-foreign-type gtk-boolean-type ()
+ ()
+ (:actual-type :pointer)
+ #-sbcl (:simple-parser gtk-boolean))
+
+#+sbcl (cffi:define-parse-method gtk-boolean (&rest cffi::args)
+ (apply #'make-instance 'gtk-boolean-type cffi::args))
+
+(cffi:define-foreign-type gtk-string-type ()
+ ()
+ (:actual-type :pointer)
+ #-sbcl (:simple-parser gtk-string))
+
+#+sbcl (cffi:define-parse-method gtk-string (&rest cffi::args)
+ (apply #'make-instance 'gtk-string-type cffi::args))
+
+
+(defmethod cffi:translate-to-foreign (value (type gtk-boolean-type))
(cffi:make-pointer (if value 1 0)))
-(defmethod cffi:translate-from-foreign (value (type (eql :gtk-boolean)))
+(defmethod cffi:translate-from-foreign (value (type gtk-boolean-type))
#-clisp(not (zerop (cffi::pointer-address value))) ; pod strange!
#+clisp(if (null value) ; pod something really wrong here!
nil
(not (zerop (cffi::pointer-address value)))))
-(defmethod cffi:translate-to-foreign (value (type (eql :gtk-string)))
+(defmethod cffi:translate-to-foreign (value (type gtk-string-type))
(when (null value) (setf value "")) ; pod ???
(cffi:foreign-string-alloc value))
-(defmethod cffi:translate-from-foreign (value (type (eql :gtk-string)))
+(defmethod cffi:translate-from-foreign (value (type gtk-string-type))
(utf-8-to-lisp (cffi:foreign-string-to-lisp value)))
+
+
(defun int-slot-indexed (obj obj-type slot index)
(declare (ignorable obj-type))
(cffi:mem-aref (cffi:foreign-slot-value obj obj-type slot) :int index))
@@ -199,7 +218,7 @@
,(when (with-debug-p name)
`(format *trace-output* "~%Calling (~A ~{~A~^ ~})"
,(string-downcase (string name)) (list ,@(mapcar 'car arguments)))))
- (let ((result ,(let ((fn `(,gtk-name ,@(mapcar #'(lambda (arg) (if (eql (cadr arg) :gtk-string)
+ (let ((result ,(let ((fn `(,gtk-name ,@(mapcar #'(lambda (arg) (if (eql (cadr arg) 'gtk-string)
`(lisp-to-utf-8 ,(car arg))
(car arg)))
arguments))))
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-gl-ext.lisp 2008/04/14 16:43:55 1.2
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-gl-ext.lisp 2008/05/05 15:30:14 1.3
@@ -18,7 +18,7 @@
;(export '(with-gl-drawable with-swap-buffers))
(cffi:define-foreign-library libgtkglext
- (:unix "libgtkglext-x11-1.0.so")
+ (:unix (:or "libgtkglext-x11-1.0.so" "libgtkglext-x11-1.0.so.0"))
(t (:default "libgtkglext")))
(cffi:use-foreign-library libgtkglext)
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-list-tree.lisp 2008/04/13 10:59:23 1.1
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-list-tree.lisp 2008/05/05 15:30:14 1.2
@@ -54,7 +54,7 @@
((tree-store :pointer)
(iter :pointer)
(parent :pointer)))
- (gtk-tree-store-remove :gtk-boolean
+ (gtk-tree-store-remove gtk-boolean
((tree-store :pointer)
(iter :pointer)))
(gtk-tree-store-clear :void
@@ -74,7 +74,7 @@
(gtk-tree-view-get-selection :pointer
((tree-view
:pointer)))
- (gtk-tree-view-get-path-at-pos :gtk-boolean
+ (gtk-tree-view-get-path-at-pos gtk-boolean
((tree-view :pointer)
(x :int)
(y :int)
@@ -104,19 +104,19 @@
(column :int)
(data :pointer)
(eof :int)))
- (gtk-tree-model-get-iter :gtk-boolean
+ (gtk-tree-model-get-iter gtk-boolean
((tree-model :pointer)
(iter :pointer)
(path :pointer)))
;;tree-model
- (gtk-tree-model-get-iter-from-string :gtk-boolean
+ (gtk-tree-model-get-iter-from-string gtk-boolean
((tree-model :pointer)
(iter :pointer)
- (path :gtk-string)))
+ (path gtk-string)))
;;tree-path
(gtk-tree-path-new-from-string :pointer
- ((path :gtk-string)))
- (gtk-tree-path-to-string :gtk-string
+ ((path gtk-string)))
+ (gtk-tree-path-to-string gtk-string
((path :pointer)))
(gtk-tree-path-free :void ((path :pointer)))
(gtk-tree-model-get-path :pointer
@@ -126,7 +126,7 @@
(gtk-tree-row-reference-new :pointer
((tree-model :pointer)
(path :pointer)))
- (gtk-tree-row-reference-valid :gtk-boolean
+ (gtk-tree-row-reference-valid gtk-boolean
((tree-row-reference :pointer)))
(gtk-tree-row-reference-get-model :pointer
((tree-row-reference :pointer)))
@@ -143,7 +143,7 @@
(gtk-tree-selection-select-path :void
((sel :pointer)
(path :pointer)))
- (gtk-tree-selection-get-selected :gtk-boolean
+ (gtk-tree-selection-get-selected gtk-boolean
((sel :pointer)
(model :pointer)
(iter :pointer)))
@@ -158,30 +158,30 @@
(gtk-tree-view-column-pack-start :void
((tree-column :pointer)
(renderer :pointer)
- (expand :gtk-boolean)))
+ (expand gtk-boolean)))
(gtk-tree-view-column-add-attribute :void
((tree-column :pointer)
(renderer :pointer)
- (attribute :gtk-string)
+ (attribute gtk-string)
(column :int)))
(gtk-tree-view-column-set-spacing :void
((tree-column :pointer)
(spacing :int)))
(gtk-tree-view-column-set-visible :void
((tree-column :pointer)
- (spacing :gtk-boolean)))
+ (spacing gtk-boolean)))
(gtk-tree-view-column-set-reorderable :void
((tree-column :pointer)
- (resizable :gtk-boolean)))
+ (resizable gtk-boolean)))
(gtk-tree-view-column-set-sort-column-id :void
((tree-column :pointer)
(col-id :int)))
(gtk-tree-view-column-set-sort-indicator :void
((tree-column :pointer)
- (resizable :gtk-boolean)))
+ (resizable gtk-boolean)))
(gtk-tree-view-column-set-resizable :void
((tree-column :pointer)
- (resizable :gtk-boolean)))
+ (resizable gtk-boolean)))
(gtk-tree-view-column-set-fixed-width :void
((tree-column :pointer)
(fixed-width :int)))
@@ -193,15 +193,15 @@
(max-width :int)))
(gtk-tree-view-column-set-title :void
((tree-column :pointer)
- (title :gtk-string)))
+ (title gtk-string)))
(gtk-tree-view-column-set-expand :void
((tree-column :pointer)
- (expand :gtk-boolean)))
+ (expand gtk-boolean)))
(gtk-tree-view-column-set-clickable :void
((tree-column
:pointer)
(clickable
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-tree-view-column-set-cell-data-func :void
((tree-column :pointer)
(cell-renderer :pointer)
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-menu.lisp 2008/04/13 10:59:23 1.1
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-menu.lisp 2008/05/05 15:30:14 1.2
@@ -19,7 +19,7 @@
(in-package :gtk-ffi)
(def-gtk-function :gtk gtk-check-menu-item-set-active :void
- ((check-menu :pointer) (active :gtk-boolean)))
+ ((check-menu :pointer) (active gtk-boolean)))
#+test
(def-gtk-lib-functions :gtk
@@ -40,7 +40,7 @@
(gtk-menu-bar-new :pointer ())
(gtk-menu-new :pointer ())
(gtk-menu-set-title :void
- ((menu :pointer) (title :gtk-string)))
+ ((menu :pointer) (title gtk-string)))
(gtk-menu-attach :void
((menu :pointer) (child :pointer)
(lattach :unsigned-int)
@@ -63,7 +63,7 @@
((label :pointer)))
(gtk-menu-item-set-right-justified :void
((menu-item :pointer)
- (right-justified :gtk-boolean)))
+ (right-justified gtk-boolean)))
(gtk-menu-item-set-submenu :void
((menu-item :pointer)
(submenu :pointer)))
@@ -81,7 +81,7 @@
(gtk-check-menu-item-new :pointer ())
(gtk-check-menu-item-new-with-label :pointer
((label :pointer)))
- (gtk-check-menu-item-get-active :gtk-boolean
+ (gtk-check-menu-item-get-active gtk-boolean
((check-menu :pointer)))
(gtk-radio-menu-item-new :pointer ((group :pointer)))
(gtk-radio-menu-item-new-from-widget :pointer
@@ -90,12 +90,12 @@
((group :pointer)))
(gtk-radio-menu-item-new-with-label-from-widget :pointer
((radio :pointer)
- (label :gtk-string)))
+ (label gtk-string)))
(gtk-radio-menu-item-get-group :pointer ((radio :pointer)))
(gtk-image-menu-item-new :pointer ())
- (gtk-image-menu-item-new-with-label :pointer ((label :gtk-string)))
+ (gtk-image-menu-item-new-with-label :pointer ((label gtk-string)))
(gtk-image-menu-item-new-from-stock :pointer
- ((stock-id :gtk-string)
+ ((stock-id gtk-string)
(accel-group :pointer)))
(gtk-image-menu-item-set-image :void
((menu-item :pointer)
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-other.lisp 2008/04/14 16:43:55 1.2
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-other.lisp 2008/05/05 15:30:14 1.3
@@ -23,13 +23,13 @@
;; main-loop
(gtk-init :void
((argc :pointer) (argv :pointer)))
- (gtk-init-check :gtk-boolean
+ (gtk-init-check gtk-boolean
((argc :pointer)
(argv :pointer)))
- (gtk-events-pending :gtk-boolean ())
- (gtk-main-iteration :gtk-boolean ())
- (gtk-main-iteration-do :gtk-boolean
- ((blocking :gtk-boolean)))
+ (gtk-events-pending gtk-boolean ())
+ (gtk-main-iteration gtk-boolean ())
+ (gtk-main-iteration-do gtk-boolean
+ ((blocking gtk-boolean)))
(gtk-main :void ())
(gtk-main-quit :void ())
(gtk-quit-add :unsigned-int
@@ -62,8 +62,8 @@
(gtk-box-pack-start :void
((box :pointer)
(widget :pointer)
- (expand :gtk-boolean)
- (fill :gtk-boolean)
+ (expand gtk-boolean)
+ (fill gtk-boolean)
(padding :int)))
(gtk-box-pack-start-defaults :void
((box :pointer)
@@ -72,15 +72,15 @@
(gtk-box-set-homogeneous :void
((box :pointer)
(homogeneous
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-box-set-spacing :void
((box :pointer)
(spacing :int)))
(gtk-hbox-new :pointer
- ((homogeneous :gtk-boolean)
+ ((homogeneous gtk-boolean)
(spacing :int)))
(gtk-vbox-new :pointer
- ((homogeneous :gtk-boolean)
+ ((homogeneous gtk-boolean)
(spacing :int)))
(gtk-drawing-area-new :pointer ())
@@ -88,7 +88,7 @@
(gtk-table-new :pointer
((rows :unsigned-int)
(columns :unsigned-int)
- (homogeneous :gtk-boolean)))
+ (homogeneous gtk-boolean)))
(gtk-table-attach :void
((table :pointer)
(child :pointer)
@@ -114,7 +114,7 @@
(gtk-table-set-homogeneous :void
((table :pointer)
(homogeneous
- :gtk-boolean)))
+ gtk-boolean)))
;;paned
(gtk-paned-add1 :void
@@ -131,27 +131,27 @@
;;expander
(gtk-expander-new :pointer
- ((label :gtk-string)))
+ ((label gtk-string)))
(gtk-expander-set-expanded :void
((expander :pointer)
(expanded
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-expander-set-spacing :void
((expander :pointer)
(spacing :pointer)))
(gtk-expander-set-label :void
((expander :pointer)
- (label :gtk-string)))
+ (label gtk-string)))
(gtk-expander-set-use-underline :void
((expander
:pointer)
(use-underline
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-expander-set-use-markup :void
((expander
:pointer)
(use-markup
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-expander-set-label-widget :void
((expander
:pointer)
@@ -172,10 +172,10 @@
(yscale :float)))
;;frame
- (gtk-frame-new :pointer ((label :gtk-string)))
+ (gtk-frame-new :pointer ((label gtk-string)))
(gtk-frame-set-label :void
((frame :pointer)
- (label :gtk-string)))
+ (label gtk-string)))
(gtk-frame-set-label-widget :void
((frame :pointer)
(label-widget
@@ -190,12 +190,12 @@
;;aspect-frame
(gtk-aspect-frame-new :pointer
- ((label :gtk-string)
+ ((label gtk-string)
(xalign :float)
(yalign :float)
(ratio :float)
(obey_child
- :gtk-boolean)))
+ gtk-boolean)))
;; separator
(gtk-hseparator-new :pointer ())
(gtk-vseparator-new :pointer ())
@@ -262,13 +262,13 @@
(pos :int)))
(gtk-notebook-set-show-tabs :void
((notebook :pointer)
- (show-tabs :gtk-boolean)))
+ (show-tabs gtk-boolean)))
(gtk-notebook-set-show-border :void
((notebook :pointer)
- (show-border :gtk-boolean)))
+ (show-border gtk-boolean)))
(gtk-notebook-set-scrollable :void
((notebook :pointer)
- (scrollable :gtk-boolean)))
+ (scrollable gtk-boolean)))
(gtk-notebook-set-tab-border :void
((notebook :pointer)
(border-width :int)))
@@ -278,7 +278,7 @@
((notebook :pointer)))
(gtk-notebook-set-homogeneous-tabs :void
((notebook :pointer)
- (homogeneous-tabs :gtk-boolean)))
+ (homogeneous-tabs gtk-boolean)))
(gtk-notebook-get-nth-page :pointer
((notebook :pointer)
(n :int)))
@@ -286,30 +286,30 @@
((notebook :pointer)))
;;label
- (gtk-label-new :pointer ((text :gtk-string)))
+ (gtk-label-new :pointer ((text gtk-string)))
(gtk-label-set-text :void
((label :pointer)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-label-set-text-with-mnemonic :void
((label :pointer)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-label-set-line-wrap :void
((label :pointer)
- (wrap :gtk-boolean)))
+ (wrap gtk-boolean)))
(gtk-label-set-selectable :void
((label :pointer)
- (selectable :gtk-boolean)))
+ (selectable gtk-boolean)))
(gtk-label-set-use-markup :void
((label :pointer)
- (use-markup :gtk-boolean)))
+ (use-markup gtk-boolean)))
(gtk-label-set-markup :void
((label :pointer)
- (markup :gtk-string)))
+ (markup gtk-string)))
(gtk-label-set-markup-with-mnemonic :void
((label :pointer)
- (markup :gtk-string)))
+ (markup gtk-string)))
(gtk-accel-label-new :pointer
- ((str :gtk-string)))
+ ((str gtk-string)))
(gtk-accel-label-set-accel-widget :void
((label :pointer)
(widget :pointer)))
@@ -319,7 +319,7 @@
(gtk-progress-bar-pulse :void ((pbar :pointer)))
(gtk-progress-bar-set-text :void
((pbar :pointer)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-progress-bar-set-fraction :void
((pbar :pointer)
(fraction :double)))
@@ -347,13 +347,13 @@
;;image
(gtk-image-new-from-file :pointer
- ((filename :gtk-string)))
+ ((filename gtk-string)))
(gtk-image-new-from-stock :pointer
- ((stock :gtk-string)
+ ((stock gtk-string)
(icon-size :int)))
(gtk-image-set-from-stock :void
((image :pointer)
- (stock :gtk-string)
+ (stock gtk-string)
(icon-size :int)))
(gtk-image-get-pixbuf :pointer
((image :pointer)))
@@ -364,7 +364,7 @@
((factory :pointer)))
(gtk-icon-factory-add :void
((factory :pointer)
- (stock-id :gtk-string)
+ (stock-id gtk-string)
(icon-set :pointer)))
;;icon-set
@@ -375,11 +375,11 @@
(gtk-statusbar-new :pointer ())
(gtk-statusbar-get-context-id :unsigned-int
((sbar :pointer)
- (description :gtk-string)))
+ (description gtk-string)))
(gtk-statusbar-push :unsigned-int
((sbar :pointer)
(context-id :unsigned-int)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-statusbar-pop :void
((sbar :pointer)
(context-id :unsigned-int)))
@@ -389,7 +389,7 @@
(message-id :unsigned-int)))
(gtk-statusbar-set-has-resize-grip :void
((sbar :pointer)
- (setting :gtk-boolean)))
+ (setting gtk-boolean)))
;;widget
(gtk-widget-show :void ((widget :pointer)))
@@ -401,7 +401,7 @@
(gtk-widget-destroy :void ((widget :pointer)))
(gtk-widget-set-sensitive :void
((widget :pointer)
- (sensitive :gtk-boolean)))
+ (sensitive gtk-boolean)))
(gtk-widget-set-size-request :void
((widget :pointer)
(width :int)
@@ -410,7 +410,7 @@
((widget :pointer)))
(gtk-widget-add-accelerator :void
((widget :pointer)
- (gsignal :gtk-string)
+ (gsignal gtk-string)
(accel-group :pointer)
(key :unsigned-int)
(mods :int)
@@ -430,10 +430,10 @@
(gtk-window-new :pointer ((type :int)))
(gtk-window-set-title :void
((widget :pointer)
- (title :gtk-string)))
- (gtk-window-set-icon-from-file :gtk-boolean
+ (title gtk-string)))
+ (gtk-window-set-icon-from-file gtk-boolean
((window :pointer)
- (filename :gtk-string)
+ (filename gtk-string)
(err :pointer)))
(gtk-window-set-default-size :void
((widget :pointer)
@@ -441,13 +441,13 @@
(height :int)))
(gtk-window-set-resizable :void
((widget :pointer)
- (resizable :gtk-boolean)))
+ (resizable gtk-boolean)))
(gtk-window-set-decorated :void
((widget :pointer)
- (decorated :gtk-boolean)))
+ (decorated gtk-boolean)))
(gtk-window-set-auto-startup-notification :void
((setting
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-window-set-position :void
((widget :pointer)
(position :int)))
@@ -468,7 +468,7 @@
(gtk-entry-new :pointer ())
(gtk-entry-set-text :void
((entry :pointer)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-entry-get-text :pointer ((entry :pointer)))
(gtk-entry-set-max-length :void
((entry :pointer)
@@ -476,13 +476,13 @@
(gtk-entry-set-editable :void
((entry :pointer)
(editable
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-entry-set-completion :void
((entry :pointer)
(completion :pointer)))
(gtk-entry-set-has-frame :void
((entry :pointer)
- (has-frame :gtk-boolean)))
+ (has-frame gtk-boolean)))
;;entry-completion
(gtk-entry-completion-new :pointer ())
@@ -504,7 +504,7 @@
(gtk-range-set-inverted :void
((range :pointer)
(inverted
- :gtk-boolean)))
+ gtk-boolean)))
(gtk-range-set-increments :void
((range :pointer)
(step :double)
@@ -517,7 +517,7 @@
;;scale
(gtk-scale-set-draw-value :void
((scale :pointer)
- (draw-value :gtk-boolean)))
+ (draw-value gtk-boolean)))
(gtk-scale-set-value-pos :void
((scale :pointer)
(pos-type :int)))
@@ -545,7 +545,7 @@
(gtk-combo-box-new-text :pointer ())
(gtk-combo-box-append-text :void
((combo-box :pointer)
- (text :gtk-string)))
+ (text gtk-string)))
(gtk-combo-box-remove-text :void
((combo-box :pointer)
(position :int)))
@@ -557,7 +557,7 @@
(gtk-combo-box-set-model :void
((combo-box :pointer)
(model :pointer)))
- (gtk-combo-box-get-active-iter :gtk-boolean
+ (gtk-combo-box-get-active-iter gtk-boolean
((combo-box :pointer)
(iter :pointer)))
(gtk-combo-box-set-active-iter :void
@@ -608,7 +608,7 @@
(gtk-dialog-add-button :pointer
((dialog :pointer)
(button-text
- :gtk-string)
+ gtk-string)
(response-id :int)))
(gtk-dialog-add-action-widget :void
((dialog :pointer)
@@ -616,7 +616,7 @@
(response-id :pointer)))
(gtk-dialog-set-has-separator :void
((dialog :pointer)
- (has-separator :gtk-boolean)))
+ (has-separator gtk-boolean)))
(gtk-dialog-set-default-response :void
((dialog :pointer)
(response-id :int)))
@@ -627,11 +627,11 @@
(flags :int)
(type :int)
(buttons :int)
- (message :gtk-string)))
+ (message gtk-string)))
(gtk-message-dialog-set-markup :void
((dialog
:pointer)
- (str :gtk-string)))
+ (str gtk-string)))
;;file-chooser
(gtk-file-chooser-set-action :void
@@ -639,42 +639,42 @@
(action :int)))
(gtk-file-chooser-set-local-only :void
((chooser :pointer)
[238 lines skipped]
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-tool.lisp 2008/04/13 10:59:23 1.1
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-tool.lisp 2008/05/05 15:30:14 1.2
@@ -29,13 +29,13 @@
(gtk-toolbar-set-show-arrow
:void
((toolbar :pointer)
- (show-arrow :gtk-boolean)))
+ (show-arrow gtk-boolean)))
(gtk-toolbar-set-orientation
:void
((toolbar :pointer) (orientation :int)))
(gtk-toolbar-set-tooltips
:void
- ((toolbar :pointer) (enable :gtk-boolean)))
+ ((toolbar :pointer) (enable gtk-boolean)))
(gtk-toolbar-set-style
:void
((toolbar :pointer) (style :int)))
@@ -46,8 +46,8 @@
:void
((tooltips :pointer)
(widget :pointer)
- (tip-text :gtk-string)
- (tip-private :gtk-string)))
+ (tip-text gtk-string)
+ (tip-private gtk-string)))
(gtk-tooltips-enable
:void
((tooltips :pointer)))
@@ -63,24 +63,24 @@
(gtk-tool-item-set-homogeneous
:void
((tool-item :pointer)
- (homogeneous :gtk-boolean)))
+ (homogeneous gtk-boolean)))
(gtk-tool-item-set-expand
:void
- ((tool-item :pointer) (expand :gtk-boolean)))
+ ((tool-item :pointer) (expand gtk-boolean)))
(gtk-tool-item-set-tooltip
:void
((tool-item :pointer)
(tooltips :pointer)
- (tip-text :gtk-string)
- (tip-private :gtk-string)))
+ (tip-text gtk-string)
+ (tip-private gtk-string)))
(gtk-tool-item-set-is-important
:void
((tool-item :pointer)
- (is-important :gtk-boolean)))
+ (is-important gtk-boolean)))
(gtk-separator-tool-item-new :pointer ())
(gtk-separator-tool-item-set-draw
:void
- ((item :pointer) (draw :gtk-boolean)))
+ ((item :pointer) (draw gtk-boolean)))
;;tool-button
(gtk-tool-button-new
@@ -88,17 +88,17 @@
((icon-widget :pointer) (label :pointer)))
(gtk-tool-button-new-from-stock
:pointer
- ((stock-id :gtk-string)))
+ ((stock-id gtk-string)))
(gtk-tool-button-set-label
:void
((tool-button :pointer) (label :pointer)))
(gtk-tool-button-set-use-underline
:void
((tool-button :pointer)
- (use-underline :gtk-boolean)))
+ (use-underline gtk-boolean)))
(gtk-tool-button-set-stock-id
:void
- ((tool-button :pointer) (stock-id :gtk-string)))
+ ((tool-button :pointer) (stock-id gtk-string)))
(gtk-tool-button-set-icon-widget
:void
((tool-button :pointer)
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-utilities.lisp 2008/04/14 16:43:55 1.2
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-utilities.lisp 2008/05/05 15:30:14 1.3
@@ -234,8 +234,7 @@
(defun deref-col-type-buffer (col-type buffer)
(ecase col-type
((:string :icon)
- (get-gtk-string
- (cffi:make-pointer (cffi:mem-aref buffer :pointer 0))))
+ (get-gtk-string (cffi:make-pointer (cffi-sys:pointer-address (cffi:mem-aref buffer :pointer 0)))))
(:boolean (not (zerop (cffi:mem-aref buffer :unsigned-char 0))))
(:date (cffi:mem-aref buffer :FLOAT 0))
(:int (cffi:mem-aref buffer :int 0))
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/package.lisp 2008/04/14 16:43:55 1.2
+++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/package.lisp 2008/05/05 15:30:14 1.3
@@ -19,7 +19,7 @@
(in-package :cl-user)
(defpackage :gtk-ffi
- (:use :common-lisp :pod)
+ (:use :common-lisp :pod :utils-kt)
(:export #:+c-null+
#:int-slot-indexed
#:load-gtk-libs
@@ -38,6 +38,8 @@
#:long
#:single-float
#:double-float
+ #:gtk-string
+ #:gtk-boolean
#:otherwise
#:*gtk-debug*
#:load-gtk-libs
@@ -79,4 +81,4 @@
#:gdk-event-motion-y
#:event-type
- #:gl-init))
+ #:gtk-gl-init))
