Menu
▾
▴
[htoolkit-cvs] gio/src/Graphics/UI/GIO Window.hs,1.13,1.14 Controls.hs,1.9,1.10
|
From: <kr_...@us...> - 2003-04-26 20:54:04
|
Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv2509/src/Graphics/UI/GIO
Modified Files:
Window.hs Controls.hs
Log Message:
Remove windowHandle attribute. Use exported hwindow function instead
Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Window.hs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Window.hs 26 Apr 2003 20:03:05 -0000 1.13
--- Window.hs 26 Apr 2003 20:54:00 -0000 1.14
***************
*** 15,19 ****
, dialog, runDialog
-- * Internal
! , windowHandle
) where
--- 15,19 ----
, dialog, runDialog
-- * Internal
! , hwindow
) where
***************
*** 119,128 ****
title = newAttr (\w -> Lib.getWindowTitle (hwindow w))
(\w x -> Lib.setWindowTitle (hwindow w) x)
-
- -- | The window handle
- windowHandle :: Attr Window WindowHandle
- windowHandle
- = readAttr "windowHandle" (\w -> return (hwindow w))
-
-- | The view domain of the window. If it is larger than the current view size, scroll bars
--- 119,122 ----
Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Controls.hs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Controls.hs 27 Mar 2003 13:36:20 -0000 1.9
--- Controls.hs 26 Apr 2003 20:54:00 -0000 1.10
***************
*** 45,52 ****
label :: [Prop Label] -> Window -> IO Label
label props w
! = do lab <- do hwnd <- get w windowHandle
! hlab <- Port.createLabel hwnd
lfont <- newVar Port.defaultFont
! return (Label hlab hwnd lfont)
set lab props
return lab
--- 45,51 ----
label :: [Prop Label] -> Window -> IO Label
label props w
! = do lab <- do hlab <- Port.createLabel (hwindow w)
lfont <- newVar Port.defaultFont
! return (Label hlab (hwindow w) lfont)
set lab props
return lab
***************
*** 82,89 ****
button :: [Prop Button] -> Window -> IO Button
button props w
! = do but <- do hwnd <- get w windowHandle
! hbut <- Port.createButton hwnd
bfont <- newVar Port.defaultFont
! return (Button hbut hwnd bfont)
set but props
return but
--- 81,87 ----
button :: [Prop Button] -> Window -> IO Button
button props w
! = do but <- do hbut <- Port.createButton (hwindow w)
bfont <- newVar Port.defaultFont
! return (Button hbut (hwindow w) bfont)
set but props
return but
***************
*** 124,131 ****
entry :: [Prop Entry] -> Window -> IO Entry
entry props w
! = do e <- do hwnd <- get w windowHandle
! hentry <- Port.createEdit hwnd
efont <- newVar Port.defaultFont
! return (Entry hentry hwnd efont)
set e props
return e
--- 122,128 ----
entry :: [Prop Entry] -> Window -> IO Entry
entry props w
! = do e <- do hentry <- Port.createEdit (hwindow w)
efont <- newVar Port.defaultFont
! return (Entry hentry (hwindow w) efont)
set e props
return e
***************
*** 171,178 ****
popup :: [Prop Popup] -> Window -> IO Popup
popup props w
! = do p <- do hwnd <- get w windowHandle
! hpop <- Port.createPopUp hwnd
pitems <- newVar []
! return (Popup hpop hwnd pitems)
set p [on command =: popupCommand p]
set p props
--- 168,174 ----
popup :: [Prop Popup] -> Window -> IO Popup
popup props w
! = do p <- do hpop <- Port.createPopUp (hwindow w)
pitems <- newVar []
! return (Popup hpop (hwindow w) pitems)
set p [on command =: popupCommand p]
set p props
***************
*** 235,241 ****
checkGroup items props w
= do cg <- do cs <- mapM (\(txt,c,cmd) -> check txt [checked =: c, on command =:: checkCommand cmd] w) items
- hwnd <- get w windowHandle
cglayout <- newVar vertical
! return (CheckGroup cs hwnd cglayout)
set cg props
cs <- get cg selection
--- 231,236 ----
checkGroup items props w
= do cg <- do cs <- mapM (\(txt,c,cmd) -> check txt [checked =: c, on command =:: checkCommand cmd] w) items
cglayout <- newVar vertical
! return (CheckGroup cs (hwindow w) cglayout)
set cg props
cs <- get cg selection
***************
*** 290,297 ****
radioGroup items props w
= do rg <- do rs <- mapM (\(first,(txt,cmd)) -> radioEx first txt [] w) (zip (True:repeat False) items)
- hwnd <- get w windowHandle
glayout <- newVar vertical
gselect <- newVar 0
! return (RadioGroup rs (map snd items) hwnd gselect glayout)
mapM_ (select rg) (zip [0..] (radios rg))
set rg [selected =: 0]
--- 285,291 ----
radioGroup items props w
= do rg <- do rs <- mapM (\(first,(txt,cmd)) -> radioEx first txt [] w) (zip (True:repeat False) items)
glayout <- newVar vertical
gselect <- newVar 0
! return (RadioGroup rs (map snd items) (hwindow w) gselect glayout)
mapM_ (select rg) (zip [0..] (radios rg))
set rg [selected =: 0]
***************
*** 345,351 ****
check :: String -> [Prop Check] -> Window -> IO Check
check txt props w
! = do c <- do hwnd <- get w windowHandle
! hcheck <- Port.createCheckBox hwnd txt
! return (Check hcheck hwnd)
set c props
return c
--- 339,344 ----
check :: String -> [Prop Check] -> Window -> IO Check
check txt props w
! = do c <- do hcheck <- Port.createCheckBox (hwindow w) txt
! return (Check hcheck (hwindow w))
set c props
return c
***************
*** 387,393 ****
radioEx :: Bool -> String -> [Prop Radio] -> Window -> IO Radio
radioEx first txt props w
! = do r <- do hwnd <- get w windowHandle
! hradio <- Port.createRadioBox hwnd first txt
! return (Radio hradio hwnd)
set r props
return r
--- 380,385 ----
radioEx :: Bool -> String -> [Prop Radio] -> Window -> IO Radio
radioEx first txt props w
! = do r <- do hradio <- Port.createRadioBox (hwindow w) first txt
! return (Radio hradio (hwindow w))
set r props
return r
***************
*** 438,444 ****
hslider :: [Prop Slider] -> Window -> IO Slider
hslider props w
! = do r <- do hwnd <- get w windowHandle
! shandle <- Port.createHorzSlider hwnd
! return (Slider shandle hwnd)
set r props
return r
--- 430,435 ----
hslider :: [Prop Slider] -> Window -> IO Slider
hslider props w
! = do r <- do shandle <- Port.createHorzSlider (hwindow w)
! return (Slider shandle (hwindow w))
set r props
return r
***************
*** 447,453 ****
vslider :: [Prop Slider] -> Window -> IO Slider
vslider props w
! = do r <- do hwnd <- get w windowHandle
! shandle <- Port.createVertSlider hwnd
! return (Slider shandle hwnd)
set r props
return r
--- 438,443 ----
vslider :: [Prop Slider] -> Window -> IO Slider
vslider props w
! = do r <- do shandle <- Port.createVertSlider (hwindow w)
! return (Slider shandle (hwindow w))
set r props
return r
***************
*** 485,493 ****
hProgressBar :: Bool -> [Prop ProgressBar] -> Window -> IO ProgressBar
hProgressBar smooth props w
! = do r <- do hwnd <- get w windowHandle
! pbhandle <- Port.createHorzProgressBar hwnd smooth
pbrange <- newVar (0,100)
Port.setProgressBarFraction pbhandle 0 100 0
! return (ProgressBar pbhandle hwnd pbrange)
set r props
return r
--- 475,482 ----
hProgressBar :: Bool -> [Prop ProgressBar] -> Window -> IO ProgressBar
hProgressBar smooth props w
! = do r <- do pbhandle <- Port.createHorzProgressBar (hwindow w) smooth
pbrange <- newVar (0,100)
Port.setProgressBarFraction pbhandle 0 100 0
! return (ProgressBar pbhandle (hwindow w) pbrange)
set r props
return r
***************
*** 497,505 ****
vProgressBar :: Bool -> [Prop ProgressBar] -> Window -> IO ProgressBar
vProgressBar smooth props w
! = do r <- do hwnd <- get w windowHandle
! pbhandle <- Port.createVertProgressBar hwnd smooth
pbrange <- newVar (0,100)
Port.setProgressBarFraction pbhandle 0 100 0
! return (ProgressBar pbhandle hwnd pbrange)
set r props
return r
--- 486,493 ----
vProgressBar :: Bool -> [Prop ProgressBar] -> Window -> IO ProgressBar
vProgressBar smooth props w
! = do r <- do pbhandle <- Port.createVertProgressBar (hwindow w) smooth
pbrange <- newVar (0,100)
Port.setProgressBarFraction pbhandle 0 100 0
! return (ProgressBar pbhandle (hwindow w) pbrange)
set r props
return r
|
