fix syntax errors; other catch up with changes

This commit is contained in:
ehouse 2005-11-27 20:05:33 +00:00
parent 0b96f001a5
commit acbd41334f

View file

@ -19,7 +19,7 @@
/* #include <stdlib.h> */ /* #include <stdlib.h> */
/* #include <stdio.h> */ /* #include <stdio.h> */
#include <Windowsx.h> #include <windowsx.h>
#include <stdio.h> /* for sprintf, etc. */ #include <stdio.h> /* for sprintf, etc. */
@ -94,7 +94,8 @@ makeAndDrawBitmap( CEDrawCtx* dctx, HDC hdc, XP_U32 x, XP_U32 y,
} /* makeAndDrawBitmap */ } /* makeAndDrawBitmap */
static XP_Bool static XP_Bool
ce_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus ) ce_draw_boardBegin( DrawCtx* p_dctx, DictionaryCtxt* dict, XP_Rect* rect,
XP_Bool hasfocus )
{ {
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals; CEAppGlobals* globals = dctx->globals;
@ -163,7 +164,7 @@ ceDrawHintBorders( HDC hdc, XP_Rect* xprect, HintAtts hintAtts )
static XP_Bool static XP_Bool
ce_draw_drawCell( DrawCtx* p_dctx, XP_Rect* xprect, ce_draw_drawCell( DrawCtx* p_dctx, XP_Rect* xprect,
XP_UCHAR* letters, XP_Bitmap* bitmap, XP_UCHAR* letters, XP_Bitmap bitmap,
XP_S16 owner, XWBonusType bonus, HintAtts hintAtts, XP_S16 owner, XWBonusType bonus, HintAtts hintAtts,
XP_Bool isBlank, XP_Bool isPending, XP_Bool isStar ) XP_Bool isBlank, XP_Bool isPending, XP_Bool isStar )
{ {
@ -290,7 +291,7 @@ ce_draw_trayFinished( DrawCtx* p_dctx )
static void static void
drawDrawTileGuts( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters, drawDrawTileGuts( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters,
XP_Bitmap* bitmap, XP_S16 val, XP_Bool highlighted ) XP_Bitmap bitmap, XP_S16 val, XP_Bool highlighted )
{ {
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals; CEAppGlobals* globals = dctx->globals;
@ -341,7 +342,7 @@ drawDrawTileGuts( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters,
static void static void
ce_draw_drawTile( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters, ce_draw_drawTile( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters,
XP_Bitmap* bitmap, XP_S16 val, XP_Bool highlighted ) XP_Bitmap bitmap, XP_S16 val, XP_Bool highlighted )
{ {
drawDrawTileGuts( p_dctx, xprect, letters, bitmap, val, highlighted ); drawDrawTileGuts( p_dctx, xprect, letters, bitmap, val, highlighted );
} /* ce_draw_drawTile */ } /* ce_draw_drawTile */
@ -497,7 +498,7 @@ ce_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* r,
*height = (XP_U16)size.cy; *height = (XP_U16)size.cy;
} /* ce_draw_measureRemText */ } /* ce_draw_measureRemText */
static XP_U16 static void
ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter, ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter,
XP_S16 nTilesLeft ) XP_S16 nTilesLeft )
{ {
@ -513,8 +514,6 @@ ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter,
XPRtoRECT( &rt, rInner ); XPRtoRECT( &rt, rInner );
++rt.left; /* 1: don't write up against edge */ ++rt.left; /* 1: don't write up against edge */
DrawText( hdc, buf, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER); DrawText( hdc, buf, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER);
return (XP_U16)size.cx;
} /* ce_draw_drawRemText */ } /* ce_draw_drawRemText */
static void static void