[htoolkit-cvs] gio/src/examples/simple Calculator.hs,1.4,1.5 SimpleMenu.hs,1.5,1.6

[<kr_...@us...>]

Update of /cvsroot/htoolkit/gio/src/examples/simple
In directory sc8-pr-cvs1:/tmp/cvs-serv5894

Modified Files:
	Calculator.hs SimpleMenu.hs 
Log Message:
Update examples



Index: Calculator.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/examples/simple/Calculator.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Calculator.hs	2 Apr 2003 21:33:55 -0000	1.4
--- Calculator.hs	17 Jun 2003 17:05:39 -0000	1.5
***************
*** 6,16 ****
  
  main
!   = start SDI [] calculator
  
  calculator
    = do varst   <- newVar (0,id)
!        w       <- window [title =: "calculator", resizeable =: True]
!        display <- label [text =: "0"] w
!        keys    <- mapM (\c -> button [text =: [c], on command =: cmd varst display c] w)  "123+456-789*C0=/"
         set w [layout =: (pad 10 (hglue <<< display)) ^^^ grid (matrix 4 (map (hfix 50) keys))]
    where
--- 6,16 ----
  
  main
!   = start "Calculator" "1.0" SDI [] calculator
  
  calculator
    = do varst   <- newVar (0,id)
!        w       <- window []
!        display <- label [title =: "0"] w
!        keys    <- mapM (\c -> button [title =: [c], on command =: cmd varst display c] w)  "123+456-789*C0=/"
         set w [layout =: (pad 10 (hglue <<< display)) ^^^ grid (matrix 4 (map (hfix 50) keys))]
    where
***************
*** 21,25 ****
        = do st <- getVar varst
             let st' = calc st c
!            set display [text =: show (fst st')]
             setVar varst st'
  
--- 21,25 ----
        = do st <- getVar varst
             let st' = calc st c
!            set display [title =: show (fst st')]
             setVar varst st'
  

Index: SimpleMenu.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/examples/simple/SimpleMenu.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleMenu.hs	25 Apr 2003 06:56:28 -0000	1.5
--- SimpleMenu.hs	17 Jun 2003 17:05:39 -0000	1.6
***************
*** 4,9 ****
  
  main
!   = start SDI [] $
!     do w <- window [title =: "Hello world", view =: sz 200 200]
  
         bmpNew  <- readBitmap "res/new.bmp"  []
--- 4,9 ----
  
  main
!   = start "SimpleMenu" "1.0" SDI [] $
!     do w <- window [view =: sz 200 200]
  
         bmpNew  <- readBitmap "res/new.bmp"  []