From 7e95acb7310d83284288a6e89a6b3fe4bf4e8668 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 10:43:30 +1000 Subject: Change point and point_t to gPoint --- src/gwin/gwin.c | 4 ++-- src/gwin/gwin.h | 4 ++-- src/gwin/gwin_button.c | 8 ++++---- src/gwin/gwin_graph.c | 4 ++-- src/gwin/gwin_graph.h | 2 +- src/gwin/gwin_list.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/gwin') diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 7bc257bf..9fbc304e 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -384,13 +384,13 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor #endif #if GDISP_NEED_CONVEX_POLYGON - void gwinDrawPoly(GHandle gh, coord_t tx, coord_t ty, const point *pntarray, unsigned cnt) { + void gwinDrawPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt) { if (!_gwinDrawStart(gh)) return; gdispGDrawPoly(gh->display, tx+gh->x, ty+gh->y, pntarray, cnt, gh->color); _gwinDrawEnd(gh); } - void gwinFillConvexPoly(GHandle gh, coord_t tx, coord_t ty, const point *pntarray, unsigned cnt) { + void gwinFillConvexPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt) { if (!_gwinDrawStart(gh)) return; gdispGFillConvexPoly(gh->display, tx+gh->x, ty+gh->y, pntarray, cnt, gh->color); _gwinDrawEnd(gh); diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index 79768366..e313743a 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -987,7 +987,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawPoly(GHandle gh, coord_t tx, coord_t ty, const point *pntarray, unsigned cnt); + void gwinDrawPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt); /** * @brief Fill a convex polygon @@ -1010,7 +1010,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillConvexPoly(GHandle gh, coord_t tx, coord_t ty, const point *pntarray, unsigned cnt); + void gwinFillConvexPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt); /** * @brief Draw a thick line in the window diff --git a/src/gwin/gwin_button.c b/src/gwin/gwin_button.c index 618c78b2..2c4b598e 100644 --- a/src/gwin/gwin_button.c +++ b/src/gwin/gwin_button.c @@ -247,7 +247,7 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) { #if GDISP_NEED_CONVEX_POLYGON void gwinButtonDraw_ArrowUp(GWidgetObject *gw, void *param) { const GColorSet * pcol; - point arw[7]; + gPoint arw[7]; (void) param; @@ -298,7 +298,7 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) { void gwinButtonDraw_ArrowDown(GWidgetObject *gw, void *param) { const GColorSet * pcol; - point arw[7]; + gPoint arw[7]; (void) param; @@ -349,7 +349,7 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) { void gwinButtonDraw_ArrowLeft(GWidgetObject *gw, void *param) { const GColorSet * pcol; - point arw[7]; + gPoint arw[7]; (void) param; @@ -400,7 +400,7 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) { void gwinButtonDraw_ArrowRight(GWidgetObject *gw, void *param) { const GColorSet * pcol; - point arw[7]; + gPoint arw[7]; (void) param; diff --git a/src/gwin/gwin_graph.c b/src/gwin/gwin_graph.c index c729103d..217f1755 100644 --- a/src/gwin/gwin_graph.c +++ b/src/gwin/gwin_graph.c @@ -301,10 +301,10 @@ void gwinGraphDrawPoint(GHandle gh, coord_t x, coord_t y) { #undef gg } -void gwinGraphDrawPoints(GHandle gh, const point *points, unsigned count) { +void gwinGraphDrawPoints(GHandle gh, const gPoint *points, unsigned count) { #define gg ((GGraphObject *)gh) unsigned i; - const point *p; + const gPoint *p; if (gh->vmt != &graphVMT || !_gwinDrawStart(gh)) return; diff --git a/src/gwin/gwin_graph.h b/src/gwin/gwin_graph.h index 7c893d5b..d13fd1c5 100644 --- a/src/gwin/gwin_graph.h +++ b/src/gwin/gwin_graph.h @@ -174,7 +174,7 @@ void gwinGraphDrawPoint(GHandle gh, coord_t x, coord_t y); * * @api */ -void gwinGraphDrawPoints(GHandle gh, const point *points, unsigned count); +void gwinGraphDrawPoints(GHandle gh, const gPoint *points, unsigned count); #endif /* _GWIN_GRAPH_H */ /** @} */ diff --git a/src/gwin/gwin_list.c b/src/gwin/gwin_list.c index a14da805..8b161238 100644 --- a/src/gwin/gwin_list.c +++ b/src/gwin/gwin_list.c @@ -710,8 +710,8 @@ void gwinListDefaultDraw(GWidgetObject* gw, void* param) { coord_t sy; #endif #if GDISP_NEED_CONVEX_POLYGON - static const point upArrow[] = { {0, LST_ARROW_SZ}, {LST_ARROW_SZ, LST_ARROW_SZ}, {LST_ARROW_SZ/2, 0} }; - static const point downArrow[] = { {0, 0}, {LST_ARROW_SZ, 0}, {LST_ARROW_SZ/2, LST_ARROW_SZ} }; + static const gPoint upArrow[] = { {0, LST_ARROW_SZ}, {LST_ARROW_SZ, LST_ARROW_SZ}, {LST_ARROW_SZ/2, 0} }; + static const gPoint downArrow[] = { {0, 0}, {LST_ARROW_SZ, 0}, {LST_ARROW_SZ/2, LST_ARROW_SZ} }; #endif (void)param; -- cgit v1.2.3