Update of /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk In directory clnet:/tmp/cvs-serv26378/cells-gtk/test-gtk

Modified Files: test-display.lisp test-entry.lisp test-layout.lisp Log Message: ported to the latest cffi, cl-opengl, cl-cairo2

--- /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-display.lisp 2008/04/16 14:41:30 1.3 +++ /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-display.lisp 2008/05/05 15:30:14 1.4 @@ -38,7 +38,8 @@ :on-clicked (callback (widget event data) (with-widget (w :statusbar) - (push-message w (format nil "~a" (fraction (fm-other :pbar))))))))) + (with-widget (pbar :pbar) + (push-message w (format nil "~a" (fraction pbar))))))))) (mk-hbox :kids (kids-list? (mk-progress-bar :md-name :pbar2 --- /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-entry.lisp 2008/04/13 10:59:20 1.1 +++ /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-entry.lisp 2008/05/05 15:30:14 1.2 @@ -30,21 +30,19 @@ :expand t :fill t :markup (c? (with-markup (:font-desc "24") (with-markup (:foreground :blue - :font-family "Arial" - :font-desc (if (value (fm-other :spin)) - (truncate (value (fm-other :spin))) - 10)) - (value (fm-other :entry))) + :font-family "Arial" + :font-desc (with-widget-value (s :spin :alternative 10) + (truncate s))) + (widget-value :entry)) (with-markup (:underline :double - :weight :bold - :foreground :red - :font-desc (if (value (fm-other :hscale)) - (truncate (value (fm-other :hscale))) - 10)) + :weight :bold + :foreground :red + :font-desc (with-widget-value (s :hscale :alternative 10) + (truncate s))) "is") - (with-markup (:strikethrough (value (fm^ :cool))) + (with-markup (:strikethrough (widget-value :cool)) "boring") - (with-markup (:strikethrough (not (value (fm^ :cool)))) + (with-markup (:strikethrough (not (widget-value :cool))) "cool!"))) :selectable t) (mk-entry :md-name :entry :auto-update t :init "Testing")))) @@ -61,8 +59,8 @@ :init t :label "Visible"))) (mk-hscale :md-name :hscale - :visible (c? (value (fm^ :visible))) - :sensitive (c? (value (fm^ :sensitive))) + :visible (c? (widget-value :visible)) + :sensitive (c? (widget-value :sensitive)) :expand t :fill t :min 0 :max 100 :init 10))))))) --- /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-layout.lisp 2008/04/13 10:59:21 1.1 +++ /project/cells/cvsroot/cells-gtk3/cells-gtk/test-gtk/test-layout.lisp 2008/05/05 15:30:14 1.2 @@ -6,7 +6,7 @@ :expand t :fill t :scrollable t :tab-labels (list "_Table" "_Panes" "_Alignment") - :tab-pos (c? (value (fm-other :tab-pos))) + :tab-pos (c? (widget-value :tab-pos)) :kids (kids-list? (mk-table :elements (cons