diff --git a/xwords4/wince/ceblank.c b/xwords4/wince/ceblank.c index ac76b0513..7dea895ab 100755 --- a/xwords4/wince/ceblank.c +++ b/xwords4/wince/ceblank.c @@ -26,7 +26,7 @@ loadLettersList( HWND hDlg, BlankDialogState* bState ) { XP_U16 i; XP_U16 nTiles = bState->nTiles; - XP_UCHAR4* texts = bState->texts; + const XP_UCHAR4* texts = bState->texts; for ( i = 0; i < nTiles; ++i ) { XP_U16 len; @@ -49,7 +49,7 @@ static void showCurTray( HWND hDlg, BlankDialogState* bState ) { if ( bState->pi->why == PICK_FOR_CHEAT ) { - PickInfo* pi = bState->pi; + const PickInfo* pi = bState->pi; XP_U16 lenSoFar = 0; XP_U16 i; XP_UCHAR labelBuf[48]; diff --git a/xwords4/wince/cedraw.c b/xwords4/wince/cedraw.c index b96c0d9cf..3bed737ee 100755 --- a/xwords4/wince/cedraw.c +++ b/xwords4/wince/cedraw.c @@ -729,9 +729,9 @@ ce_draw_measureMiniWText( DrawCtx* p_dctx, XP_UCHAR* str, widebuf[len] = 0; GetTextExtentPoint32( hdc, widebuf, wcslen(widebuf), &size ); - maxWidth = XP_MAX( maxWidth, size.cx ); + maxWidth = (XP_U16)XP_MAX( maxWidth, size.cx ); height += size.cy + CE_INTERLINE_SPACE; - dctx->miniLineHt = size.cy; + dctx->miniLineHt = (XP_U16)size.cy; if ( nextStr == NULL ) { break;