ui: use control-value/set-control-value in a few places.

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index af7133799af1436407f9b3bfcf9f99ee8d70d61a..498ab2fc8bdf82660575fa4ba5a4f51990e39bc4 100644 (file)
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -257,19 +257,19 @@ PRIVATE>
     bi ;
 
 : update-mouse-index ( table -- )
-    dup [ model>> value>> ] [ mouse-index>> ] bi
+    dup [ control-value ] [ mouse-index>> ] bi
     dup [ swap length [ drop f ] [ 1 - min ] if-zero ] [ 2drop f ] if
     >>mouse-index drop ;
 
 : initial-selection-index ( table -- n/f )
     {
-        [ model>> value>> empty? not ]
+        [ control-value empty? not ]
         [ selection-required?>> ]
         [ drop 0 ]
     } 1&& ;
 
 : find-row-index ( value table -- n/f )
-    [ model>> value>> ] [ renderer>> ] bi
+    [ control-value ] [ renderer>> ] bi
     '[ _ row-value? ] with find drop ;
 
 : update-table-rows ( table -- )

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index c4587bb4d63f1d0c8d531202e8d4fc4bc616323a..6c6bed5b70d906a94999124140aa2a82de629bad 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -28,10 +28,10 @@ M: browser-gadget set-history-value
 : show-help ( link browser-gadget -- )
     [ >link ] dip
     [
-        2dup model>> value>> =
+        2dup control-value =
         [ 2drop ] [ [ add-recent ] [ history>> add-history ] bi* ] if
     ]
-    [ model>> set-model ]
+    [ set-control-value ]
     2bi ;
 
 : <help-pane> ( browser-gadget -- gadget )
@@ -84,7 +84,7 @@ M: browser-gadget handle-gesture
     } 2|| ;
 
 M: browser-gadget definitions-changed ( set browser -- )
-    [ model>> value>> swap showing-definition? ] keep
+    [ control-value swap showing-definition? ] keep
     '[ _ [ history-value ] keep set-history-value ] when ;
 
 M: browser-gadget focusable-child* search-field>> ;

diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index 96af78e21cb47d5b210e1b2ba320a443f07b55ad..f9ca9ceeeea6879e002d31fdf633573030969d74 100644 (file)
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -133,13 +133,13 @@ TUPLE: error-display < track ;
         dup model>> [ [ print-error ] when* ] <pane-control> <scroller> 1 track-add ;
 
 : com-inspect ( error-display -- )
-    model>> value>> [ inspector ] when* ;
+    control-value [ inspector ] when* ;
 
 : com-help ( error-display -- )
-    model>> value>> [ error>> error-help-window ] when* ;
+    control-value [ error>> error-help-window ] when* ;
 
 : com-edit ( error-display -- )
-    model>> value>> [ edit-error ] when* ;
+    control-value [ edit-error ] when* ;
 
 error-display "toolbar" f {
     { f com-inspect }

diff --git a/extra/gml/viewer/viewer.factor b/extra/gml/viewer/viewer.factor
index ce1bd4b971d2e1b4d5ff10f24dc916adc49328af..8142997b94273c178929d1a6f7b18be891b2be5d 100644 (file)
--- a/extra/gml/viewer/viewer.factor
+++ b/extra/gml/viewer/viewer.factor
@@ -144,7 +144,7 @@ TUPLE: gml-viewer-world < wasd-world
     drag? ;\r
 \r
 TYPED: refresh-b-rep-view ( world: gml-viewer-world -- )\r
-    dup model>> value>> >>b-rep\r
+    dup control-value >>b-rep\r
     dup vertex-array>> [ vertex-array-buffer dispose ] when*\r
     dup [ b-rep>> ] [ selected>> value>> ] bi make-b-rep-vertices {\r
         [\r
@@ -162,7 +162,7 @@ TYPED: refresh-b-rep-view ( world: gml-viewer-world -- )
 \r
 M: gml-viewer-world model-changed\r
     nip\r
-    [ model>> value>> ]\r
+    [ control-value ]\r
     [ b-rep<< ]\r
     [ dup viewable? [ refresh-b-rep-view ] [ drop ] if ] tri ;\r
 \r

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index 2b1aef6d2b96083ea57fcb8fc51685449cb0c239..1b46f58e3a60e182f2a9f50c49361d6563557bfe 100644 (file)
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -84,7 +84,7 @@ TUPLE: slides < book ;
 
 : change-page ( book n -- )
     over control-value + over children>> length rem
-    swap model>> set-model ;
+    swap set-control-value ;
 
 : next-page ( book -- ) 1 change-page ;
 

diff --git a/extra/ui/gadgets/book-extras/book-extras.factor b/extra/ui/gadgets/book-extras/book-extras.factor
index 41e16e0f9f050a477669652cd86bbed5ff58fa8a..beb0f0781211b934e5de70b223bc08be98cc6d3c 100644 (file)
--- a/extra/ui/gadgets/book-extras/book-extras.factor
+++ b/extra/ui/gadgets/book-extras/book-extras.factor
@@ -11,7 +11,7 @@ IN: ui.gadgets.book-extras
 : <book-border-btn> ( label quot -- button ) (book-t) <border-button> ;
 : >>> ( gadget -- ) owner next ;
 : <<< ( gadget -- ) owner prev ;
-: go-to ( gadget number -- ) swap owner model>> set-model ;
+: go-to ( gadget number -- ) swap owner set-control-value ;
 
 : <forward-btn> ( label -- button ) [ >>> ] <button> ;
 : <backward-btn> ( label -- button ) [ <<< ] <button> ;

diff --git a/unmaintained/4DNav/window3D/window3D.factor b/unmaintained/4DNav/window3D/window3D.factor
index e83e88401911f728c95cce9ba5c2c0523146698b..04bc0b0663b9e7b5ad8bf1c0f1e3b4e49f9b263f 100644 (file)
--- a/unmaintained/4DNav/window3D/window3D.factor
+++ b/unmaintained/4DNav/window3D/window3D.factor
@@ -71,7 +71,7 @@ M: window3D draw-gadget* ( gadget -- )
             GL_FRONT GL_AMBIENT_AND_DIFFUSE glColorMaterial\r
             ! *************************\r
             \r
-            model>> value>> \r
+            control-value\r
             [ space->GL ] when*\r
 \r
             ! *************************\r