Mercurial > dwindows
diff win/dw.c @ 1275:0b34e2cf0706
Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
The fill parameter has been replaced by flags which should be backwards compatible.
Also updated the source comments to reflect these changes.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 30 Oct 2011 10:14:49 +0000 |
parents | 24f1dc19601d |
children | b99b0b2c2826 |
line wrap: on
line diff
--- a/win/dw.c Sun Oct 30 02:13:47 2011 +0000 +++ b/win/dw.c Sun Oct 30 10:14:49 2011 +0000 @@ -8727,12 +8727,12 @@ * Parameters: * handle: Handle to the window. * pixmap: Handle to the pixmap. (choose only one of these) - * fill: if true filled + * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0). * number of points * x[]: X coordinates. * y[]: Y coordinates. */ -void API dw_draw_polygon(HWND handle, HPIXMAP pixmap, int fill, int npoints, int *x, int *y) +void API dw_draw_polygon(HWND handle, HPIXMAP pixmap, int flags, int npoints, int *x, int *y) { HDC hdcPaint; HBRUSH oldBrush; @@ -8775,7 +8775,7 @@ oldBrush = SelectObject( hdcPaint, TlsGetValue(_hBrush) ); oldPen = SelectObject( hdcPaint, TlsGetValue(_hPen) ); - if ( fill ) + if ( flags & DW_DRAW_FILL ) Polygon( hdcPaint, points, npoints ); else Polyline( hdcPaint, points, npoints ); @@ -8790,12 +8790,13 @@ * Parameters: * handle: Handle to the window. * pixmap: Handle to the pixmap. (choose only one of these) + * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0). * x: X coordinate. * y: Y coordinate. * width: Width of rectangle. * height: Height of rectangle. */ -void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height) +void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height) { HDC hdcPaint; RECT Rect; @@ -8808,7 +8809,7 @@ return; SetRect(&Rect, x, y, x + width , y + height ); - if(fill) + if(flags & DW_DRAW_FILL) FillRect(hdcPaint, &Rect, TlsGetValue(_hBrush)); else FrameRect(hdcPaint, &Rect, TlsGetValue(_hBrush)); @@ -8820,7 +8821,8 @@ * Parameters: * handle: Handle to the window. * pixmap: Handle to the pixmap. (choose only one of these) - * flags: For future use. + * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0). + * DW_DRAW_FULL will draw a complete circle/elipse. * xorigin: X coordinate of center of arc. * yorigin: Y coordinate of center of arc. * x1: X coordinate of first segment of arc.