From acbd41334f5863b0259e184cc6c32b61bf941816 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 27 Nov 2005 20:05:33 +0000
Subject: [PATCH] fix syntax errors; other catch up with changes

---
 wince/cedraw.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/wince/cedraw.c b/wince/cedraw.c
index 3bed737ee..23d036d30 100755
--- a/wince/cedraw.c
+++ b/wince/cedraw.c
@@ -19,7 +19,7 @@
 /* #include <stdlib.h> */
 /* #include <stdio.h> */
 
-#include <Windowsx.h>
+#include <windowsx.h>
 
 #include <stdio.h>              /* for sprintf, etc. */
 
@@ -94,7 +94,8 @@ makeAndDrawBitmap( CEDrawCtx* dctx, HDC hdc, XP_U32 x, XP_U32 y,
 } /* makeAndDrawBitmap */
 
 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;
     CEAppGlobals* globals = dctx->globals;
@@ -163,7 +164,7 @@ ceDrawHintBorders( HDC hdc, XP_Rect* xprect, HintAtts hintAtts )
 
 static XP_Bool
 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_Bool isBlank, XP_Bool isPending, XP_Bool isStar )
 {
@@ -290,7 +291,7 @@ ce_draw_trayFinished( DrawCtx* p_dctx )
 
 static void
 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;
     CEAppGlobals* globals = dctx->globals;
@@ -341,7 +342,7 @@ drawDrawTileGuts( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters,
 
 static void
 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 );
 } /* ce_draw_drawTile */
@@ -497,7 +498,7 @@ ce_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* r,
     *height = (XP_U16)size.cy;
 } /* ce_draw_measureRemText */
 
-static XP_U16
+static void
 ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter, 
                      XP_S16 nTilesLeft )
 {
@@ -513,8 +514,6 @@ ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter,
     XPRtoRECT( &rt, rInner );
     ++rt.left;                  /* 1: don't write up against edge */
     DrawText( hdc, buf, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER);
-
-    return (XP_U16)size.cx;
 } /* ce_draw_drawRemText */
 
 static void