Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv2042/gio/src/Graphics/UI/GIO
Modified Files:
Canvas.hs Layout.hs Types.hs Window.hs
Log Message:
Make HToolkit compatible with GHC-6.0
Index: Canvas.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Canvas.hs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Canvas.hs 1 Jun 2003 14:04:12 -0000 1.12
--- Canvas.hs 8 Jun 2003 19:42:13 -0000 1.13
***************
*** 29,33 ****
(
-- * Canvas
! Canvas, CanvasPen, Pen(..)
, setCanvasPen, getCanvasPen
--- 29,33 ----
(
-- * Canvas
! Canvas, CanvasPen
, setCanvasPen, getCanvasPen
Index: Layout.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Layout.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Layout.hs 30 Jan 2003 23:58:33 -0000 1.4
--- Layout.hs 8 Jun 2003 19:42:13 -0000 1.5
***************
*** 118,122 ****
) where
! import List( transpose, intersperse )
import qualified Graphics.UI.Port as Port
import Graphics.UI.GIO.Types
--- 118,122 ----
) where
! import Data.List( transpose, intersperse )
import qualified Graphics.UI.Port as Port
import Graphics.UI.GIO.Types
***************
*** 495,497 ****
loop n (stretch:xs) | stretch && n > 0 = (delta+1):loop (n-1) xs
| stretch = delta:loop 0 xs
! | otherwise = 0:loop (n-1) xs
\ No newline at end of file
--- 495,497 ----
loop n (stretch:xs) | stretch && n > 0 = (delta+1):loop (n-1) xs
| stretch = delta:loop 0 xs
! | otherwise = 0:loop (n-1) xs
Index: Types.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Types.hs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Types.hs 1 Jun 2003 15:06:54 -0000 1.11
--- Types.hs 8 Jun 2003 19:42:13 -0000 1.12
***************
*** 11,28 ****
-}
-----------------------------------------------------------------------------------------
! module Graphics.UI.GIO.Types
! (
-- * Geometry
-- ** Size
! Size(..), sz, sw, sh
, sizeEncloses
-- ** Point
! , Point(..), pt, px, py
, pointFromVec
, pointMove
-- ** Vector
! , Vector(..), vc, vx, vy
, vecNegate, vecFromPoint
--- 11,28 ----
-}
-----------------------------------------------------------------------------------------
! module Graphics.UI.GIO.Types
! (
-- * Geometry
-- ** Size
! Size(..), sz
, sizeEncloses
-- ** Point
! , Point(..), pt
, pointFromVec
, pointMove
-- ** Vector
! , Vector(..), vc
, vecNegate, vecFromPoint
***************
*** 35,51 ****
, disjointRects
, rectsDiff
!
-- *** Construction
, rect
, rectAt
, rectOfSize
!
-- *** Access
- , left, right, top, bottom
, topLeft, topRight, bottomLeft, bottomRight
, rectSize, rectIsEmpty, pointInRect, pointToRect
, centralPoint, centralRect
!
!
-- * Events
--- 35,50 ----
, disjointRects
, rectsDiff
!
-- *** Construction
, rect
, rectAt
, rectOfSize
!
-- *** Access
, topLeft, topRight, bottomLeft, bottomRight
, rectSize, rectIsEmpty, pointInRect, pointToRect
, centralPoint, centralRect
!
!
-- * Events
***************
*** 151,153 ****
getColorRGB :: Color -> (Int,Int,Int)
getColorRGB c
! = (fromIntegral $ colorRed c, fromIntegral $ colorGreen c, fromIntegral $ colorBlue c)
\ No newline at end of file
--- 150,152 ----
getColorRGB :: Color -> (Int,Int,Int)
getColorRGB c
! = (fromIntegral $ colorRed c, fromIntegral $ colorGreen c, fromIntegral $ colorBlue c)
Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Window.hs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Window.hs 8 Jun 2003 11:19:13 -0000 1.18
--- Window.hs 8 Jun 2003 19:42:13 -0000 1.19
***************
*** 12,16 ****
-----------------------------------------------------------------------------------------
module Graphics.UI.GIO.Window
! ( Window, window, domain, resizeable, view, layout, autosize, bufferMode
, dialog, runDialog
, drawInWindow
--- 12,16 ----
-----------------------------------------------------------------------------------------
module Graphics.UI.GIO.Window
! ( Window, window, domain, resizeable, view, layout, autosize
, dialog, runDialog
, drawInWindow
|
