Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv9069/root/gtk-ffi
Modified Files: gtk-other.lisp Log Message: Now native CFFI
--- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-other.lisp 2006/02/11 03:46:42 1.12 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-other.lisp 2006/02/16 18:06:06 1.13 @@ -18,757 +18,869 @@
(in-package :gtk-ffi)
+ (def-gtk-lib-functions :gtk ;; main-loop - (gtk-init ((argc (c-ptr-null int)) - (argv c-pointer))) - (gtk-init-check ((argc (c-ptr-null int)) - (argv c-pointer)) - boolean) - (gtk-events-pending () - boolean) - (gtk-main-iteration () - boolean) - (gtk-main-iteration-do ((blocking boolean)) - boolean nil nil) - (gtk-main ()) - (gtk-main-quit ()) - (gtk-main-level () int) - (gtk-get-current-event-time () - uint32) + (gtk-init :void + ((argc :pointer) (argv :pointer))) + (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-main :void ()) + (gtk-main-quit :void ()) + (gtk-main-level :int ()) + (gtk-get-current-event-time :unsigned-int ())
;;container - (gtk-container-add ((container c-pointer) - (widget c-pointer)) - c-pointer) - (gtk-container-remove ((container c-pointer) - (widget c-pointer))) + (gtk-container-add :pointer + ((container :pointer) + (widget :pointer))) + (gtk-container-remove :void + ((container :pointer) + (widget :pointer)))
;;box - (gtk-box-pack-start ((box c-pointer) - (widget c-pointer) - (expand boolean) - (fill boolean) - (padding int)) - nil nil nil) - (gtk-box-pack-start-defaults ((box c-pointer) - (widget c-pointer))) - (gtk-box-set-homogeneous ((box c-pointer) - (homogeneous boolean)) - nil nil nil) - (gtk-box-set-spacing ((box c-pointer) - (spacing int))) - (gtk-hbox-new ((homogeneous boolean) - (spacing int)) - c-pointer nil nil) - (gtk-vbox-new ((homogeneous boolean) - (spacing int)) - c-pointer nil nil) - - (gtk-drawing-area-new () - c-pointer) + (gtk-box-pack-start :void + ((box :pointer) + (widget :pointer) + (expand :gtk-boolean) + (fill :gtk-boolean) + (padding :int))) + (gtk-box-pack-start-defaults :void + ((box :pointer) + (widget + :pointer))) + (gtk-box-set-homogeneous :void + ((box :pointer) + (homogeneous + :gtk-boolean))) + (gtk-box-set-spacing :void + ((box :pointer) + (spacing :int))) + (gtk-hbox-new :pointer + ((homogeneous :gtk-boolean) + (spacing :int))) + (gtk-vbox-new :pointer + ((homogeneous :gtk-boolean) + (spacing :int))) + (gtk-drawing-area-new :pointer ())
;;table - (gtk-table-new ((rows uint) - (columns uint) - (homogeneous boolean)) - c-pointer nil nil) - (gtk-table-attach ((table c-pointer) - (child c-pointer) - (l-attach uint) - (r-attach uint) - (t-attach uint) - (b-attach uint) - (x-options int) - (y-options int) - (x-padding int) - (y-padding int))) - (gtk-table-attach-defaults ((table c-pointer) - (child c-pointer) - (l-attach uint) - (r-attach uint) - (t-attach uint) - (b-attach uint))) - (gtk-table-set-homogeneous ((table c-pointer) - (homogeneous boolean)) - nil nil nil) + (gtk-table-new :pointer + ((rows :unsigned-int) + (columns :unsigned-int) + (homogeneous :gtk-boolean))) + (gtk-table-attach :void + ((table :pointer) + (child :pointer) + (l-attach :unsigned-int) + (r-attach :unsigned-int) + (t-attach :unsigned-int) + (b-attach :unsigned-int) + (x-options :int) + (y-options :int) + (x-padding :int) + (y-padding :int))) + (gtk-table-attach-defaults :void + ((table :pointer) + (child :pointer) + (l-attach + :unsigned-int) + (r-attach + :unsigned-int) + (t-attach + :unsigned-int) + (b-attach + :unsigned-int))) + (gtk-table-set-homogeneous :void + ((table :pointer) + (homogeneous + :gtk-boolean)))
;;paned - (gtk-paned-add1 ((paned c-pointer) - (child c-pointer))) - (gtk-paned-add2 ((paned c-pointer) - (child c-pointer))) - (gtk-paned-set-position ((paned c-pointer) - (pos int))) - (gtk-hpaned-new () - c-pointer) - (gtk-vpaned-new () - c-pointer) + (gtk-paned-add1 :void + ((paned :pointer) + (child :pointer))) + (gtk-paned-add2 :void + ((paned :pointer) + (child :pointer))) + (gtk-paned-set-position :void + ((paned :pointer) + (pos :int))) + (gtk-hpaned-new :pointer ()) + (gtk-vpaned-new :pointer ())
;;expander - (gtk-expander-new ((label c-string)) - c-pointer) - (gtk-expander-set-expanded ((expander c-pointer) - (expanded boolean))) - (gtk-expander-set-spacing ((expander c-pointer) - (spacing c-pointer))) - (gtk-expander-set-label ((expander c-pointer) - (label c-string))) - (gtk-expander-set-use-underline ((expander c-pointer) - (use-underline boolean))) - (gtk-expander-set-use-markup ((expander c-pointer) - (use-markup boolean))) - (gtk-expander-set-label-widget ((expander c-pointer) - (label-widget c-pointer))) - - ;;alignment - (gtk-alignment-new ((xalign single-float) - (yalign single-float) - (xscale single-float) - (yscale single-float)) - c-pointer) - (gtk-alignment-set ((alignment c-pointer) - (xalign single-float) - (yalign single-float) - (xscale single-float) - (yscale single-float))) - + (gtk-expander-new :pointer + ((label :gtk-string))) + (gtk-expander-set-expanded :void + ((expander :pointer) + (expanded + :gtk-boolean))) + (gtk-expander-set-spacing :void + ((expander :pointer) + (spacing :pointer))) + (gtk-expander-set-label :void + ((expander :pointer) + (label :gtk-string))) + (gtk-expander-set-use-underline :void + ((expander + :pointer) + (use-underline + :gtk-boolean))) + (gtk-expander-set-use-markup :void + ((expander + :pointer) + (use-markup + :gtk-boolean))) + (gtk-expander-set-label-widget :void + ((expander + :pointer) + (label-widget + :pointer))) + + ;;alignment + (gtk-alignment-new :pointer + ((xalign :float) + (yalign :float) + (xscale :float) + (yscale :float))) + (gtk-alignment-set :void + ((alignment :pointer) + (xalign :float) + (yalign :float) + (xscale :float) + (yscale :float))) + ;;frame - (gtk-frame-new ((label c-string)) - c-pointer) - (gtk-frame-set-label ((frame c-pointer) - (label c-string))) - (gtk-frame-set-label-widget ((frame c-pointer) - (label-widget c-pointer))) - (gtk-frame-set-label-align ((frame c-pointer) - (xalign single-float) - (yalign single-float))) - (gtk-frame-set-shadow-type ((frame c-pointer) - (shadow-type int))) - + (gtk-frame-new :pointer ((label :gtk-string))) + (gtk-frame-set-label :void + ((frame :pointer) + (label :gtk-string))) + (gtk-frame-set-label-widget :void + ((frame :pointer) + (label-widget + :pointer))) + (gtk-frame-set-label-align :void + ((frame :pointer) + (xalign :float) + (yalign :float))) + (gtk-frame-set-shadow-type :void + ((frame :pointer) + (shadow-type :int))) + ;;aspect-frame - (gtk-aspect-frame-new ((label c-string) - (xalign single-float) - (yalign single-float) - (ratio single-float) - (obey_child boolean)) - c-pointer) - - ;;separator - (gtk-hseparator-new () - c-pointer) - (gtk-vseparator-new () - c-pointer) - - ;;scrolling - (gtk-scrolled-window-new ((hadjustment c-pointer) - (vadjustment c-pointer)) - c-pointer) - (gtk-scrolled-window-set-policy ((scrolled-window c-pointer) - (h-policy int) - (v-policy int))) - (gtk-scrolled-window-add-with-viewport ((scrolled-window c-pointer) - (child c-pointer))) - (gtk-scrolled-window-set-placement ((scrolled-window c-pointer) - (placement int))) - (gtk-scrolled-window-set-shadow-type ((scrolled-window c-pointer) - (type int))) - - ;;notebook - (gtk-notebook-new () - c-pointer) - (gtk-notebook-append-page ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer)) - int) - (gtk-notebook-append-page-menu ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer) - (menu-label c-pointer)) - int) - (gtk-notebook-prepend-page ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer)) - int) - (gtk-notebook-prepend-page-menu ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer) - (menu-label c-pointer)) - int) - (gtk-notebook-insert-page ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer) - (pos int)) - int) - (gtk-notebook-insert-page-menu ((notebook c-pointer) - (child c-pointer) - (tab-label c-pointer) - (menu-label c-pointer) - (pos int)) - int) - (gtk-notebook-remove-page ((notebook c-pointer) - (page-num int))) - (gtk-notebook-set-current-page ((notebook c-pointer) - (page-num int))) - (gtk-notebook-set-tab-pos ((notebook c-pointer) - (pos int))) - (gtk-notebook-set-show-tabs ((notebook c-pointer) - (show-tabs boolean))) - (gtk-notebook-set-show-border ((notebook c-pointer) - (show-border boolean))) - (gtk-notebook-set-scrollable ((notebook c-pointer) - (scrollable boolean))) - (gtk-notebook-set-tab-border ((notebook c-pointer) - (border-width int))) - (gtk-notebook-popup-enable ((notebook c-pointer))) - (gtk-notebook-popup-disable ((notebook c-pointer))) - (gtk-notebook-set-homogeneous-tabs ((notebook c-pointer) - (homogeneous-tabs boolean))) - (gtk-notebook-get-nth-page ((notebook c-pointer) - (n int)) - c-pointer) - (gtk-notebook-get-n-pages ((notebook c-pointer)) - int) + (gtk-aspect-frame-new :pointer + ((label :gtk-string) + (xalign :float) + (yalign :float) + (ratio :float) + (obey_child + :gtk-boolean))) + ;; separator + (gtk-hseparator-new :pointer ()) + (gtk-vseparator-new :pointer ()) + + ;;scrolled + (gtk-scrolled-window-new :pointer + ((hadjustment :pointer) + (vadjustment + :pointer))) + (gtk-scrolled-window-set-policy :void + ((scrolled-window + :pointer) + (h-policy :int) + (v-policy :int))) + (gtk-scrolled-window-add-with-viewport :void + ((scrolled-window :pointer) + (child :pointer))) + (gtk-scrolled-window-set-placement :void + ((scrolled-window :pointer) + (placement :int))) + (gtk-scrolled-window-set-shadow-type :void + ((scrolled-window :pointer) + (type :int))) + + ;;notebook + (gtk-notebook-new :pointer ()) + (gtk-notebook-append-page :int + ((notebook :pointer) + (child :pointer) + (tab-label :pointer))) + (gtk-notebook-append-page-menu :int + ((notebook :pointer) + (child :pointer) + (tab-label :pointer)
[1161 lines skipped]