diff options
Diffstat (limited to 'otherlibs/labltk/example')
| -rw-r--r-- | otherlibs/labltk/example/clock.ml | 35 | ||||
| -rw-r--r-- | otherlibs/labltk/example/eyes.ml | 2 | ||||
| -rw-r--r-- | otherlibs/labltk/example/tetris.ml | 34 |
3 files changed, 34 insertions, 37 deletions
diff --git a/otherlibs/labltk/example/clock.ml b/otherlibs/labltk/example/clock.ml index 58b0a0fae..7c8d21311 100644 --- a/otherlibs/labltk/example/clock.ml +++ b/otherlibs/labltk/example/clock.ml @@ -82,15 +82,14 @@ class clock ~parent = object (self) (* Redraw everything *) method redraw = - Canvas.coords_set ~canvas - ~coords:[ 1; 1; width - 2; height - 2 ] - (`Tag "cadran"); + Canvas.coords_set ~coords:[ 1; 1; width - 2; height - 2 ] + canvas (`Tag "cadran"); self#draw_figures; self#draw_arrows (Unix.localtime (Unix.time ())) (* Delete and redraw the figures *) method draw_figures = - Canvas.delete ~canvas [`Tag "figures"]; + Canvas.delete canvas [`Tag "figures"]; for i = 1 to 12 do let angle = float (rflag * i - 3) *. pi /. 6. in Canvas.create_text @@ -103,29 +102,27 @@ class clock ~parent = object (self) (* Resize and reposition the arrows *) method draw_arrows tm = - Canvas.configure_line ~canvas - ~width:(min width height / 40) - (`Tag "hours"); + Canvas.configure_line ~width:(min width height / 40) + canvas (`Tag "hours"); let hangle = float (rflag * (tm.Unix.tm_hour * 60 + tm.Unix.tm_min) - 180) *. pi /. 360. in - Canvas.coords_set ~canvas + Canvas.coords_set ~coords:[ self#x 0.; self#y 0.; - self#x (cos hangle /. 2.); self#y (sin hangle /. 2.) ] - (`Tag "hours"); - Canvas.configure_line ~canvas - ~width:(min width height / 50) - (`Tag "minutes"); + self#x (cos hangle /. 2.); self#y (sin hangle /. 2.) ] + canvas (`Tag "hours"); + Canvas.configure_line ~width:(min width height / 50) + canvas (`Tag "minutes"); let mangle = float (rflag * tm.Unix.tm_min - 15) *. pi /. 30. in - Canvas.coords_set ~canvas + Canvas.coords_set ~coords:[ self#x 0.; self#y 0.; - self#x (cos mangle /. 1.5); self#y (sin mangle /. 1.5) ] - (`Tag "minutes"); + self#x (cos mangle /. 1.5); self#y (sin mangle /. 1.5) ] + canvas (`Tag "minutes"); let sangle = float (rflag * tm.Unix.tm_sec - 15) *. pi /. 30. in - Canvas.coords_set ~canvas + Canvas.coords_set ~coords:[ self#x 0.; self#y 0.; - self#x (cos sangle /. 1.25); self#y (sin sangle /. 1.25) ] - (`Tag "seconds") + self#x (cos sangle /. 1.25); self#y (sin sangle /. 1.25) ] + canvas (`Tag "seconds") end (* Initialize the Tcl interpreter *) diff --git a/otherlibs/labltk/example/eyes.ml b/otherlibs/labltk/example/eyes.ml index 7aeb1d583..73286d303 100644 --- a/otherlibs/labltk/example/eyes.ml +++ b/otherlibs/labltk/example/eyes.ml @@ -48,7 +48,7 @@ let _ = else e.ev_MouseX, e.ev_MouseY in - Canvas.move ~canvas:c ~x: (nx - !curx) ~y: (ny - !cury) o; + Canvas.move ~x: (nx - !curx) ~y: (ny - !cury) c o; curx := nx; cury := ny) c diff --git a/otherlibs/labltk/example/tetris.ml b/otherlibs/labltk/example/tetris.ml index 613c616f6..70571b114 100644 --- a/otherlibs/labltk/example/tetris.ml +++ b/otherlibs/labltk/example/tetris.ml @@ -213,33 +213,33 @@ class cell t1 t2 t3 ~canvas ~x ~y = object method set ~color:col = if color = col then () else if color <> 0 & col = 0 then begin - Canvas.move t1 ~canvas + Canvas.move canvas t1 ~x:(- block_size * (x + 1) -10 - cell_border * 2) ~y:(- block_size * (y + 1) -10 - cell_border * 2); - Canvas.move t2 ~canvas + Canvas.move canvas t2 ~x:(- block_size * (x + 1) -10 - cell_border * 2) ~y:(- block_size * (y + 1) -10 - cell_border * 2); - Canvas.move t3 ~canvas + Canvas.move canvas t3 ~x:(- block_size * (x + 1) -10 - cell_border * 2) ~y:(- block_size * (y + 1) -10 - cell_border * 2) end else begin - Canvas.configure_rectangle t2 ~canvas + Canvas.configure_rectangle canvas t2 ~fill: colors.(col - 1) ~outline: colors.(col - 1); - Canvas.configure_rectangle t1 ~canvas + Canvas.configure_rectangle canvas t1 ~fill: `Black ~outline: `Black; - Canvas.configure_rectangle t3 ~canvas + Canvas.configure_rectangle canvas t3 ~fill: (`Color "light gray") ~outline: (`Color "light gray"); if color = 0 & col <> 0 then begin - Canvas.move t1 ~canvas + Canvas.move canvas t1 ~x: (block_size * (x+1)+10+ cell_border*2) ~y: (block_size * (y+1)+10+ cell_border*2); - Canvas.move t2 ~canvas + Canvas.move canvas t2 ~x: (block_size * (x+1)+10+ cell_border*2) ~y: (block_size * (y+1)+10+ cell_border*2); - Canvas.move t3 ~canvas + Canvas.move canvas t3 ~x: (block_size * (x+1)+10+ cell_border*2) ~y: (block_size * (y+1)+10+ cell_border*2) end @@ -314,9 +314,9 @@ let init fw = ~x1:(-block_size - 12) ~y1:(-block_size - 12) ~x2:(-13) ~y2:(-13) in - Canvas.raise ~canvas:c t1; - Canvas.raise ~canvas:c t2; - Canvas.lower ~canvas:c t3; + Canvas.raise c t1; + Canvas.raise c t2; + Canvas.lower c t3; new cell ~canvas:c ~x ~y t1 t2 t3 end) in @@ -338,9 +338,9 @@ let init fw = ~x1:(-block_size - 12) ~y1:(-block_size - 12) ~x2:(-13) ~y2:(-13) in - Canvas.raise ~canvas:nc t1; - Canvas.raise ~canvas:nc t2; - Canvas.lower ~canvas:nc t3; + Canvas.raise nc t1; + Canvas.raise nc t2; + Canvas.lower nc t3; new cell ~canvas:nc ~x ~y t1 t2 t3 end) in @@ -551,12 +551,12 @@ let _ = ~x: (block_size * 5 + block_size / 2) ~y: (block_size * 10 + block_size / 2) ~anchor: `Center in - Canvas.lower ~canvas i; + Canvas.lower canvas i; let img = Imagephoto.create () in fun file -> try Imagephoto.configure img ~file: file; - Canvas.configure_image ~canvas i ~image: img + Canvas.configure_image canvas i ~image: img with _ -> begin |