Commit 72a43281 authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

Renamed Rect to OSRect

parent 3c0b2323
...@@ -165,24 +165,24 @@ pictdrawcurve :: !Bool !Point2 !Curve !*Picture -> *Picture ...@@ -165,24 +165,24 @@ pictdrawcurve :: !Bool !Point2 !Curve !*Picture -> *Picture
pictundrawcurve :: !Bool !Point2 !Curve !*Picture -> *Picture pictundrawcurve :: !Bool !Point2 !Curve !*Picture -> *Picture
pictfillcurve :: !Bool !Point2 !Curve !*Picture -> *Picture pictfillcurve :: !Bool !Point2 !Curve !*Picture -> *Picture
pictunfillcurve :: !Bool !Point2 !Curve !*Picture -> *Picture pictunfillcurve :: !Bool !Point2 !Curve !*Picture -> *Picture
getcurve_rect_begin_end :: !Point2 !Curve -> (!Rect,!Point2,!Point2) getcurve_rect_begin_end :: !Point2 !Curve -> (!OSRect,!Point2,!Point2)
/* Rect drawing operations. /* OSRect drawing operations.
pict(draw/fill)rect rect pict(draw/fill)rect rect
draws/fills a rect. The pen position is not changed. draws/fills a rect. The pen position is not changed.
pictun(draw/fill)rect pictun(draw/fill)rect
is equal to pict(draw/fill)rect, using the background colour temporarily. is equal to pict(draw/fill)rect, using the background colour temporarily.
*/ */
pictdrawrect :: !Rect !*Picture -> *Picture pictdrawrect :: !OSRect !*Picture -> *Picture
pictundrawrect :: !Rect !*Picture -> *Picture pictundrawrect :: !OSRect !*Picture -> *Picture
pictfillrect :: !Rect !*Picture -> *Picture pictfillrect :: !OSRect !*Picture -> *Picture
pictunfillrect :: !Rect !*Picture -> *Picture pictunfillrect :: !OSRect !*Picture -> *Picture
/* Scrolling operation (handle with care). /* Scrolling operation (handle with care).
*/ */
pictscroll :: !Rect !Vector2 !*Picture -> (!Rect,!*Picture) pictscroll :: !OSRect !Vector2 !*Picture -> (!OSRect,!*Picture)
/* Polygon drawing operations. /* Polygon drawing operations.
......
...@@ -443,7 +443,7 @@ pictunfilloval center oval picture=:{pictContext,pictToolbox,pictOrigin,pictPen} ...@@ -443,7 +443,7 @@ pictunfilloval center oval picture=:{pictContext,pictToolbox,pictOrigin,pictPen}
where where
rect = ovalToRect (center-pictOrigin) oval rect = ovalToRect (center-pictOrigin) oval
ovalToRect :: !Point2 !Oval -> Rect ovalToRect :: !Point2 !Oval -> OSRect
ovalToRect {x,y} {oval_rx,oval_ry} ovalToRect {x,y} {oval_rx,oval_ry}
= {rleft=x-rx,rtop=y-ry,rright=x+rx,rbottom=y+ry} = {rleft=x-rx,rtop=y-ry,rright=x+rx,rbottom=y+ry}
where where
...@@ -505,7 +505,7 @@ where ...@@ -505,7 +505,7 @@ where
(wrect,wstart,wend) = getcurve_rect_begin_end start` curve (wrect,wstart,wend) = getcurve_rect_begin_end start` curve
end = wend+pictOrigin end = wend+pictOrigin
getcurve_rect_begin_end :: !Point2 !Curve -> (!Rect,!Point2,!Point2) getcurve_rect_begin_end :: !Point2 !Curve -> (!OSRect,!Point2,!Point2)
getcurve_rect_begin_end start=:{x,y} {curve_oval={oval_rx,oval_ry},curve_from,curve_to,curve_clockwise} getcurve_rect_begin_end start=:{x,y} {curve_oval={oval_rx,oval_ry},curve_from,curve_to,curve_clockwise}
| curve_clockwise = (rect,end,start) | curve_clockwise = (rect,end,start)
| otherwise = (rect,start,end) | otherwise = (rect,start,end)
...@@ -520,28 +520,28 @@ where ...@@ -520,28 +520,28 @@ where
rect = {rleft=cx-oval_rx,rtop=cy-oval_ry,rright=cx+oval_rx,rbottom=cy+oval_ry} rect = {rleft=cx-oval_rx,rtop=cy-oval_ry,rright=cx+oval_rx,rbottom=cy+oval_ry}
/* Rect drawing operations. /* OSRect drawing operations.
pict(draw/fill)rect rect pict(draw/fill)rect rect
draws/fills a rect. The pen position is not changed. draws/fills a rect. The pen position is not changed.
*/ */
pictdrawrect :: !Rect !*Picture -> *Picture pictdrawrect :: !OSRect !*Picture -> *Picture
pictdrawrect r picture=:{pictContext,pictToolbox,pictOrigin} pictdrawrect r picture=:{pictContext,pictToolbox,pictOrigin}
# (context,tb) = winDrawRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox) # (context,tb) = winDrawRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox)
= {picture & pictContext=context,pictToolbox=tb} = {picture & pictContext=context,pictToolbox=tb}
pictundrawrect :: !Rect !*Picture -> *Picture pictundrawrect :: !OSRect !*Picture -> *Picture
pictundrawrect r picture=:{pictContext,pictToolbox,pictOrigin,pictPen={penForeColour,penBackColour}} pictundrawrect r picture=:{pictContext,pictToolbox,pictOrigin,pictPen={penForeColour,penBackColour}}
# (context,tb) = winSetPenColor (toRGBtriple penBackColour) (pictContext,pictToolbox) # (context,tb) = winSetPenColor (toRGBtriple penBackColour) (pictContext,pictToolbox)
# (context,tb) = winDrawRectangle (subVector (toVector pictOrigin) r) (context,tb) # (context,tb) = winDrawRectangle (subVector (toVector pictOrigin) r) (context,tb)
# (context,tb) = winSetPenColor (toRGBtriple penForeColour) (context,tb) # (context,tb) = winSetPenColor (toRGBtriple penForeColour) (context,tb)
= {picture & pictContext=context,pictToolbox=tb} = {picture & pictContext=context,pictToolbox=tb}
pictfillrect :: !Rect !*Picture -> *Picture pictfillrect :: !OSRect !*Picture -> *Picture
pictfillrect r picture=:{pictContext,pictToolbox,pictOrigin} pictfillrect r picture=:{pictContext,pictToolbox,pictOrigin}
# (context,tb) = winFillRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox) # (context,tb) = winFillRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox)
= {picture & pictContext=context,pictToolbox=tb} = {picture & pictContext=context,pictToolbox=tb}
pictunfillrect :: !Rect !*Picture -> *Picture pictunfillrect :: !OSRect !*Picture -> *Picture
pictunfillrect r picture=:{pictContext,pictToolbox,pictOrigin} pictunfillrect r picture=:{pictContext,pictToolbox,pictOrigin}
# (context,tb) = winEraseRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox) # (context,tb) = winEraseRectangle (subVector (toVector pictOrigin) r) (pictContext,pictToolbox)
= {picture & pictContext=context,pictToolbox=tb} = {picture & pictContext=context,pictToolbox=tb}
...@@ -549,7 +549,7 @@ pictunfillrect r picture=:{pictContext,pictToolbox,pictOrigin} ...@@ -549,7 +549,7 @@ pictunfillrect r picture=:{pictContext,pictToolbox,pictOrigin}
/* Scrolling operation (handle with care). /* Scrolling operation (handle with care).
*/ */
pictscroll :: !Rect !Vector2 !*Picture -> (!Rect,!*Picture) pictscroll :: !OSRect !Vector2 !*Picture -> (!OSRect,!*Picture)
pictscroll r v picture=:{pictContext,pictToolbox,pictOrigin} pictscroll r v picture=:{pictContext,pictToolbox,pictOrigin}
# (updRect,(context,tb)) = winScrollRectangle (subVector (toVector pictOrigin) r) (toTuple v) (pictContext,pictToolbox) # (updRect,(context,tb)) = winScrollRectangle (subVector (toVector pictOrigin) r) (toTuple v) (pictContext,pictToolbox)
= (updRect,{picture & pictContext=context,pictToolbox=tb}) = (updRect,{picture & pictContext=context,pictToolbox=tb})
......
...@@ -9,12 +9,12 @@ import ostoolbox, ostypes ...@@ -9,12 +9,12 @@ import ostoolbox, ostypes
// Region creation and disposal operations. // Region creation and disposal operations.
osnewrgn :: !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) osnewrgn :: !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
osnewrectrgn:: !Rect !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) osnewrectrgn:: !OSRect !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
osdisposergn:: !OSRgnHandle !*OSToolbox -> *OSToolbox osdisposergn:: !OSRgnHandle !*OSToolbox -> *OSToolbox
// Setting the shape of a region to a rectangle or a polygon. // Setting the shape of a region to a rectangle or a polygon.
/* PA: used nowhere. /* PA: used nowhere.
osrectrgn :: !Rect !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) osrectrgn :: !OSRect !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
*/ */
ospolyrgn :: !(!Int,!Int) ![(Int,Int)] !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) ospolyrgn :: !(!Int,!Int) ![(Int,Int)] !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
...@@ -30,5 +30,5 @@ osdiffrgn :: !OSRgnHandle !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) ...@@ -30,5 +30,5 @@ osdiffrgn :: !OSRgnHandle !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
the bounding box equals the region. the bounding box equals the region.
osisemptyrgn determines whether the region is empty (its bounding box is empty). osisemptyrgn determines whether the region is empty (its bounding box is empty).
*/ */
osgetrgnbox :: !OSRgnHandle !*OSToolbox -> (!Bool,!Rect,!*OSToolbox) osgetrgnbox :: !OSRgnHandle !*OSToolbox -> (!Bool,!OSRect,!*OSToolbox)
osisemptyrgn:: !OSRgnHandle !*OSToolbox -> (!Bool, !*OSToolbox) osisemptyrgn:: !OSRgnHandle !*OSToolbox -> (!Bool, !*OSToolbox)
...@@ -3,7 +3,7 @@ implementation module osrgn ...@@ -3,7 +3,7 @@ implementation module osrgn
// Clean Object I/O library, version 1.2 // Clean Object I/O library, version 1.2
import StdBool, StdInt, StdList import StdBool, StdInt, StdList
from ostypes import Rect from ostypes import OSRect
import pictCCall_12, rgnCCall_12 import pictCCall_12, rgnCCall_12
:: OSRgnHandle :: OSRgnHandle
...@@ -16,7 +16,7 @@ osnewrgn :: !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) ...@@ -16,7 +16,7 @@ osnewrgn :: !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
osnewrgn tb osnewrgn tb
= winCreateRectRgn 0 0 1 1 tb = winCreateRectRgn 0 0 1 1 tb
osnewrectrgn :: !Rect !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) osnewrectrgn :: !OSRect !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
osnewrectrgn {rleft,rtop,rright,rbottom} tb osnewrectrgn {rleft,rtop,rright,rbottom} tb
= winCreateRectRgn rleft rtop rright rbottom tb = winCreateRectRgn rleft rtop rright rbottom tb
...@@ -26,7 +26,7 @@ osdisposergn osrgn tb ...@@ -26,7 +26,7 @@ osdisposergn osrgn tb
// Setting the shape of a Region. // Setting the shape of a Region.
osrectrgn :: !Rect !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox) osrectrgn :: !OSRect !OSRgnHandle !*OSToolbox -> (!OSRgnHandle,!*OSToolbox)
osrectrgn {rleft,rtop,rright,rbottom} osrgn tb osrectrgn {rleft,rtop,rright,rbottom} osrgn tb
= winSetRgnToRect rleft rtop rright rbottom osrgn tb = winSetRgnToRect rleft rtop rright rbottom osrgn tb
...@@ -76,7 +76,7 @@ osdiffrgn rgn1 rgn2 tb ...@@ -76,7 +76,7 @@ osdiffrgn rgn1 rgn2 tb
// Region property access functions. // Region property access functions.
osgetrgnbox :: !OSRgnHandle !*OSToolbox -> (!Bool,!Rect,!*OSToolbox) osgetrgnbox :: !OSRgnHandle !*OSToolbox -> (!Bool,!OSRect,!*OSToolbox)
osgetrgnbox rgn tb osgetrgnbox rgn tb
# (l,t, r,b, isRect,_,tb) = winGetRgnBox rgn tb # (l,t, r,b, isRect,_,tb) = winGetRgnBox rgn tb
= (isRect,{rleft=l,rtop=t,rright=r,rbottom=b}, tb) = (isRect,{rleft=l,rtop=t,rright=r,rbottom=b}, tb)
......
...@@ -30,12 +30,12 @@ osMMtoHPixels :: !Real -> Int ...@@ -30,12 +30,12 @@ osMMtoHPixels :: !Real -> Int
osMMtoVPixels :: !Real -> Int osMMtoVPixels :: !Real -> Int
osMaxScrollWindowSize :: (!Int,!Int) osMaxScrollWindowSize :: (!Int,!Int)
osMaxFixedWindowSize :: (!Int,!Int) osMaxFixedWindowSize :: (!Int,!Int)
osScreenrect :: !*OSToolbox -> (!Rect,!*OSToolbox) osScreenrect :: !*OSToolbox -> (!OSRect,!*OSToolbox)
osPrintSetupTypical :: Bool osPrintSetupTypical :: Bool
// osGetProcessWindowDimensions returns Rect of process window in terms of screen coordinates // osGetProcessWindowDimensions returns OSRect of process window in terms of screen coordinates
osGetProcessWindowDimensions :: !OSDInfo !*OSToolbox -> (!Rect,!*OSToolbox) osGetProcessWindowDimensions :: !OSDInfo !*OSToolbox -> (!OSRect,!*OSToolbox)
osDefaultWindowMetrics :: !*OSToolbox -> (!OSWindowMetrics,!*OSToolbox) osDefaultWindowMetrics :: !*OSToolbox -> (!OSWindowMetrics,!*OSToolbox)
......
...@@ -6,7 +6,7 @@ import StdBool, StdInt, StdReal, StdString ...@@ -6,7 +6,7 @@ import StdBool, StdInt, StdReal, StdString
import StdMaybe import StdMaybe
import clCCall_12, clCrossCall_12, windowCrossCall_12 import clCCall_12, clCrossCall_12, windowCrossCall_12
import osdocumentinterface, osfont import osdocumentinterface, osfont
from ostypes import Rect from ostypes import OSRect
:: OSWindowMetrics :: OSWindowMetrics
...@@ -50,7 +50,7 @@ osMaxScrollWindowSize = winMaxScrollWindowSize ...@@ -50,7 +50,7 @@ osMaxScrollWindowSize = winMaxScrollWindowSize
osMaxFixedWindowSize :: (!Int,!Int) osMaxFixedWindowSize :: (!Int,!Int)
osMaxFixedWindowSize = winMaxFixedWindowSize osMaxFixedWindowSize = winMaxFixedWindowSize
osScreenrect :: !*OSToolbox -> (!Rect,!*OSToolbox) osScreenrect :: !*OSToolbox -> (!OSRect,!*OSToolbox)
osScreenrect tb osScreenrect tb
# (screenWidth, tb) = winScreenXSize tb # (screenWidth, tb) = winScreenXSize tb
# (screenHeight,tb) = winScreenYSize tb # (screenHeight,tb) = winScreenYSize tb
...@@ -59,7 +59,7 @@ osScreenrect tb ...@@ -59,7 +59,7 @@ osScreenrect tb
osPrintSetupTypical :: Bool // MW11++ osPrintSetupTypical :: Bool // MW11++
osPrintSetupTypical = False osPrintSetupTypical = False
osGetProcessWindowDimensions :: !OSDInfo !*OSToolbox -> (!Rect,!*OSToolbox) osGetProcessWindowDimensions :: !OSDInfo !*OSToolbox -> (!OSRect,!*OSToolbox)
osGetProcessWindowDimensions osdinfo tb osGetProcessWindowDimensions osdinfo tb
# maybeOSInfo = getOSDInfoOSInfo osdinfo # maybeOSInfo = getOSDInfoOSInfo osdinfo
| isNothing maybeOSInfo | isNothing maybeOSInfo
......
...@@ -8,7 +8,7 @@ definition module ostypes ...@@ -8,7 +8,7 @@ definition module ostypes
:== HDC :== HDC
:: HDC // PA: moved from pictCCall_12 :: HDC // PA: moved from pictCCall_12
:== Int :== Int
:: Rect // A Rect is supposed to be an ordered rectangle with :: OSRect // A OSRect is supposed to be an ordered rectangle with
= { rleft :: !Int // rleft<=rright && rtop<=rbottom = { rleft :: !Int // rleft<=rright && rtop<=rbottom
, rtop :: !Int , rtop :: !Int
, rright :: !Int , rright :: !Int
......
...@@ -8,7 +8,7 @@ implementation module ostypes ...@@ -8,7 +8,7 @@ implementation module ostypes
:== HDC :== HDC
:: HDC // PA: moved from pictCCall_12 :: HDC // PA: moved from pictCCall_12
:== Int :== Int
:: Rect // A Rect is supposed to be an ordered rectangle with :: OSRect // A OSRect is supposed to be an ordered rectangle with
= { rleft :: !Int // rleft<=rright && rtop<=rbottom = { rleft :: !Int // rleft<=rright && rtop<=rbottom
, rtop :: !Int , rtop :: !Int
, rright :: !Int , rright :: !Int
......
This diff is collapsed.
This diff is collapsed.
...@@ -3,7 +3,7 @@ definition module pictCCall_12 ...@@ -3,7 +3,7 @@ definition module pictCCall_12
from rgnCCall_12 import HRGN from rgnCCall_12 import HRGN
from ostoolbox import OSToolbox from ostoolbox import OSToolbox
from ostypes import Rect, HDC from ostypes import OSRect, HDC
:: *PIC :: *PIC
...@@ -94,10 +94,10 @@ winSetPolyPoint :: !Int !Int !Int !Int !*OSToolbox -> *OSToolbox ...@@ -94,10 +94,10 @@ winSetPolyPoint :: !Int !Int !Int !Int !*OSToolbox -> *OSToolbox
winFreePolyShape :: !Int !*OSToolbox -> *OSToolbox winFreePolyShape :: !Int !*OSToolbox -> *OSToolbox
winInvertWedge :: !Rect !Pt !Pt !PIC -> PIC winInvertWedge :: !OSRect !Pt !Pt !PIC -> PIC
winEraseWedge :: !Rect !Pt !Pt !PIC -> PIC winEraseWedge :: !OSRect !Pt !Pt !PIC -> PIC
winFillWedge :: !Rect !Pt !Pt !PIC -> PIC winFillWedge :: !OSRect !Pt !Pt !PIC -> PIC
winDrawWedge :: !Rect !Pt !Pt !PIC -> PIC winDrawWedge :: !OSRect !Pt !Pt !PIC -> PIC
winInvertCircle :: !Pt !Int !PIC -> PIC winInvertCircle :: !Pt !Int !PIC -> PIC
...@@ -106,39 +106,39 @@ winFillCircle :: !Pt !Int !PIC -> PIC ...@@ -106,39 +106,39 @@ winFillCircle :: !Pt !Int !PIC -> PIC
winDrawCircle :: !Pt !Int !PIC -> PIC winDrawCircle :: !Pt !Int !PIC -> PIC
winInvertOval :: !Rect !PIC -> PIC winInvertOval :: !OSRect !PIC -> PIC
winEraseOval :: !Rect !PIC -> PIC winEraseOval :: !OSRect !PIC -> PIC
winFillOval :: !Rect !PIC -> PIC winFillOval :: !OSRect !PIC -> PIC
winDrawOval :: !Rect !PIC -> PIC winDrawOval :: !OSRect !PIC -> PIC
winInvertRoundRectangle :: !Rect !Int !Int !PIC -> PIC winInvertRoundRectangle :: !OSRect !Int !Int !PIC -> PIC
winEraseRoundRectangle :: !Rect !Int !Int !PIC -> PIC winEraseRoundRectangle :: !OSRect !Int !Int !PIC -> PIC
winFillRoundRectangle :: !Rect !Int !Int !PIC -> PIC winFillRoundRectangle :: !OSRect !Int !Int !PIC -> PIC
winDrawRoundRectangle :: !Rect !Int !Int !PIC -> PIC winDrawRoundRectangle :: !OSRect !Int !Int !PIC -> PIC
winScrollRectangle :: !Rect !Pt !PIC -> (!Rect,!PIC) winScrollRectangle :: !OSRect !Pt !PIC -> (!OSRect,!PIC)
winCopyRectangle :: !Rect !Pt !PIC -> PIC winCopyRectangle :: !OSRect !Pt !PIC -> PIC
winCopyRectangleTo :: !Rect !Pt !PIC -> PIC winCopyRectangleTo :: !OSRect !Pt !PIC -> PIC
winMoveRectangle :: !Rect !Pt !PIC -> PIC winMoveRectangle :: !OSRect !Pt !PIC -> PIC
winMoveRectangleTo :: !Rect !Pt !PIC -> PIC winMoveRectangleTo :: !OSRect !Pt !PIC -> PIC
winInvertRectangle :: !Rect !PIC -> PIC winInvertRectangle :: !OSRect !PIC -> PIC
winEraseRectangle :: !Rect !PIC -> PIC winEraseRectangle :: !OSRect !PIC -> PIC
winFillRectangle :: !Rect !PIC -> PIC winFillRectangle :: !OSRect !PIC -> PIC
winDrawRectangle :: !Rect !PIC -> PIC winDrawRectangle :: !OSRect !PIC -> PIC
winDrawChar :: !Int !PIC -> PIC winDrawChar :: !Int !PIC -> PIC
winDrawString :: !{#Char} !PIC -> PIC winDrawString :: !{#Char} !PIC -> PIC
winDrawCCurve :: !Rect !Pt !Pt !RGBcolor !PIC -> PIC winDrawCCurve :: !OSRect !Pt !Pt !RGBcolor !PIC -> PIC
winDrawCLine :: !Pt !Pt !RGBcolor !PIC -> PIC winDrawCLine :: !Pt !Pt !RGBcolor !PIC -> PIC
winDrawCPoint :: !Pt !RGBcolor !PIC -> PIC winDrawCPoint :: !Pt !RGBcolor !PIC -> PIC
winDrawCurve :: !Rect !Pt !Pt !PIC -> PIC winDrawCurve :: !OSRect !Pt !Pt !PIC -> PIC
winDrawLine :: !Pt !Pt !PIC -> PIC winDrawLine :: !Pt !Pt !PIC -> PIC
winDrawPoint :: !Pt !PIC -> PIC winDrawPoint :: !Pt !PIC -> PIC
...@@ -156,7 +156,7 @@ winSetMode :: !Int !PIC -> PIC ...@@ -156,7 +156,7 @@ winSetMode :: !Int !PIC -> PIC
winSetBackColor :: !RGBcolor !PIC -> PIC winSetBackColor :: !RGBcolor !PIC -> PIC
winSetPenColor :: !RGBcolor !PIC -> PIC winSetPenColor :: !RGBcolor !PIC -> PIC
winClipPicture :: !Rect !PIC -> PIC winClipPicture :: !OSRect !PIC -> PIC
winClipRgnPicture :: !HRGN !PIC -> PIC // Operation to set the clipping region winClipRgnPicture :: !HRGN !PIC -> PIC // Operation to set the clipping region
winSetClipRgnPicture :: !HRGN !PIC -> PIC // Operation to completely set the clipping region winSetClipRgnPicture :: !HRGN !PIC -> PIC // Operation to completely set the clipping region
winGetClipRgnPicture :: !PIC -> (!HRGN,!PIC) // Operation to retrieve the current clipping region winGetClipRgnPicture :: !PIC -> (!HRGN,!PIC) // Operation to retrieve the current clipping region
......
implementation module pictCCall_12 implementation module pictCCall_12
from ostypes import Rect, HDC from ostypes import OSRect, HDC
import rgnCCall_12//, intrface_12 import rgnCCall_12//, intrface_12
...@@ -295,7 +295,7 @@ winFreePolyShape _ _ ...@@ -295,7 +295,7 @@ winFreePolyShape _ _
} }
winInvertWedge :: !Rect !Pt !Pt !PIC -> PIC winInvertWedge :: !OSRect !Pt !Pt !PIC -> PIC
winInvertWedge _ _ _ _ winInvertWedge _ _ _ _
= code = code
{ {
...@@ -304,7 +304,7 @@ winInvertWedge _ _ _ _ ...@@ -304,7 +304,7 @@ winInvertWedge _ _ _ _
.end .end
} }
winEraseWedge :: !Rect !Pt !Pt !PIC -> PIC winEraseWedge :: !OSRect !Pt !Pt !PIC -> PIC
winEraseWedge _ _ _ _ winEraseWedge _ _ _ _
= code = code
{ {
...@@ -313,7 +313,7 @@ winEraseWedge _ _ _ _ ...@@ -313,7 +313,7 @@ winEraseWedge _ _ _ _
.end .end
} }
winFillWedge :: !Rect !Pt !Pt !PIC -> PIC winFillWedge :: !OSRect !Pt !Pt !PIC -> PIC
winFillWedge _ _ _ _ winFillWedge _ _ _ _
= code = code
{ {
...@@ -322,7 +322,7 @@ winFillWedge _ _ _ _ ...@@ -322,7 +322,7 @@ winFillWedge _ _ _ _
.end .end
} }
winDrawWedge :: !Rect !Pt !Pt !PIC -> PIC winDrawWedge :: !OSRect !Pt !Pt !PIC -> PIC
winDrawWedge _ _ _ _ winDrawWedge _ _ _ _
= code = code
{ {
...@@ -369,7 +369,7 @@ winDrawCircle _ _ _ ...@@ -369,7 +369,7 @@ winDrawCircle _ _ _
} }
winInvertOval :: !Rect !PIC -> PIC winInvertOval :: !OSRect !PIC -> PIC
winInvertOval _ _ winInvertOval _ _
= code = code
{ {
...@@ -378,7 +378,7 @@ winInvertOval _ _ ...@@ -378,7 +378,7 @@ winInvertOval _ _
.end .end
} }
winEraseOval :: !Rect !PIC -> PIC winEraseOval :: !OSRect !PIC -> PIC
winEraseOval _ _ winEraseOval _ _
= code = code
{ {
...@@ -387,7 +387,7 @@ winEraseOval _ _ ...@@ -387,7 +387,7 @@ winEraseOval _ _
.end .end
} }
winFillOval :: !Rect !PIC -> PIC winFillOval :: !OSRect !PIC -> PIC
winFillOval _ _ winFillOval _ _
= code = code
{ {
...@@ -396,7 +396,7 @@ winFillOval _ _ ...@@ -396,7 +396,7 @@ winFillOval _ _
.end .end
} }
winDrawOval :: !Rect !PIC -> PIC winDrawOval :: !OSRect !PIC -> PIC
winDrawOval _ _