diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-11-17 23:32:19 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-11-17 23:32:19 +1000 |
| commit | 7f1b78a067e11c2394d83dbbc9b0fc78f78af493 (patch) | |
| tree | cd49bed0ef2fb5469282f525c77e707620e7fbfb /drivers/multiple/Win32/gdisp_lld_Win32.c | |
| parent | 643670ecd1c4dc631b4073d2384ff7fa56cb564d (diff) | |
| download | uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.tar.gz uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.tar.bz2 uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.zip | |
Replace color format conversion macros with proper routines to prevent side effects with using the macro.
Also fix a number of compiler warnings.
Diffstat (limited to 'drivers/multiple/Win32/gdisp_lld_Win32.c')
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld_Win32.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 50f259b7..adeed579 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -286,9 +286,9 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) // Paint the toggle area #if GINPUT_NEED_TOGGLE if (ps.rcPaint.bottom >= GDISP_SCREEN_HEIGHT && (g->flags & GDISP_FLG_HASTOGGLE)) { - pen = CreatePen(PS_SOLID, 1, COLOR2NATIVE(Black)); - hbrOn = CreateSolidBrush(COLOR2NATIVE(Blue)); - hbrOff = CreateSolidBrush(COLOR2NATIVE(Gray)); + pen = CreatePen(PS_SOLID, 1, gdispColor2Native(Black)); + hbrOn = CreateSolidBrush(gdispColor2Native(Blue)); + hbrOff = CreateSolidBrush(gdispColor2Native(Gray)); old = SelectObject(dc, pen); MoveToEx(dc, 0, GDISP_SCREEN_HEIGHT, &p); LineTo(dc, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT); @@ -514,7 +514,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { COLORREF color; priv = g->priv; - color = COLOR2NATIVE(g->p.color); + color = gdispColor2Native(g->p.color); if (!(g->flags & GDISP_FLG_WSTREAM)) BAD_PARAMETER("write_color: not in streaming mode"); @@ -664,7 +664,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { } } - return NATIVE2COLOR(color); + return gdispNative2Color(color); } LLDSPEC void gdisp_lld_read_stop(GDisplay *g) { if (!(g->flags & GDISP_FLG_WSTREAM)) @@ -680,7 +680,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { COLORREF color; priv = g->priv; - color = COLOR2NATIVE(g->p.color); + color = gdispColor2Native(g->p.color); #if GDISP_NEED_CONTROL switch(g->g.Orientation) { @@ -740,7 +740,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { COLORREF color; priv = g->priv; - color = COLOR2NATIVE(g->p.color); + color = gdispColor2Native(g->p.color); hbr = CreateSolidBrush(color); #if GDISP_NEED_CONTROL @@ -975,7 +975,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif ReleaseMutex(drawMutex); - return NATIVE2COLOR(color); + return gdispNative2Color(color); } #endif |