Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

stop compiler warnings

Browse source
This commit is contained in:
ehouse 2005-01-13 02:25:01 +00:00
parent 231e8bb815
commit b99f326465
1 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
symbian/src/symdraw.cpp
View file

@ -129,7 +129,7 @@ drawFocusRect( SymDrawCtxt* sctx, XP_Rect* rect, XP_Bool hasfocus )
sctx->iGC->SetBrushStyle( CGraphicsContext::ENullBrush ); sctx->iGC->SetBrushStyle( CGraphicsContext::ENullBrush );
sctx->iGC->SetPenStyle( CGraphicsContext::EDottedPen ); sctx->iGC->SetPenStyle( CGraphicsContext::EDottedPen );
XP_U16 index = static_cast<XP_U16>(hasfocus? COLOR_BLACK : COLOR_WHITE); XP_U16 index = SC(XP_U16,(hasfocus? COLOR_BLACK : COLOR_WHITE));
sctx->iGC->SetPenColor( sctx->colors[index] ); sctx->iGC->SetPenColor( sctx->colors[index] );
sctx->iGC->DrawRect( lRect ); sctx->iGC->DrawRect( lRect );
} // drawFocusRect } // drawFocusRect
@ -237,7 +237,7 @@ makeRemText( XP_UCHAR* buf, XP_U16 bufLen, XP_S16 nLeft )
} // makeRemText } // makeRemText
static void static void
sym_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* r, sym_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* /*r*/,
XP_S16 nTilesLeft, XP_S16 nTilesLeft,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
@ -254,7 +254,7 @@ sym_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* r,
static void static void
sym_draw_drawRemText(DrawCtx* p_dctx, XP_Rect* rInner, sym_draw_drawRemText(DrawCtx* p_dctx, XP_Rect* rInner,
XP_Rect* rOuter, XP_S16 nTilesLeft) XP_Rect* /*rOuter*/, XP_S16 nTilesLeft)
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
XP_UCHAR buf[64]; XP_UCHAR buf[64];
@ -276,7 +276,7 @@ sym_draw_drawRemText(DrawCtx* p_dctx, XP_Rect* rInner,
static void static void
sym_draw_scoreBegin( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_scoreBegin( DrawCtx* p_dctx, XP_Rect* rect,
XP_U16 numPlayers, XP_Bool hasfocus ) XP_U16 /*numPlayers*/, XP_Bool hasfocus )
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
drawFocusRect( sctx, rect, hasfocus ); drawFocusRect( sctx, rect, hasfocus );
@ -295,7 +295,7 @@ figureScoreText( XP_UCHAR* buf, XP_U16 bufLen, DrawScoreInfo* dsi )
} // figureScoreText } // figureScoreText
static void static void
sym_draw_measureScoreText( DrawCtx* p_dctx, XP_Rect* r, sym_draw_measureScoreText( DrawCtx* p_dctx, XP_Rect* /*r*/,
DrawScoreInfo* dsi, DrawScoreInfo* dsi,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
@ -309,8 +309,8 @@ sym_draw_measureScoreText( DrawCtx* p_dctx, XP_Rect* r,
TInt width = font->TextWidthInPixels( tbuf ); TInt width = font->TextWidthInPixels( tbuf );
TInt height = font->HeightInPixels(); TInt height = font->HeightInPixels();
*widthP = width; *widthP = SC( XP_U16, width);
*heightP = height; *heightP = SC( XP_U16, height );
} }
static void static void
@ -358,7 +358,7 @@ sym_draw_score_drawPlayer( DrawCtx* p_dctx,
static void static void
sym_draw_score_pendingScore( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_score_pendingScore( DrawCtx* p_dctx, XP_Rect* rect,
XP_S16 score, XP_U16 playerNum ) XP_S16 score, XP_U16 /*playerNum*/ )
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
TRect lRect; TRect lRect;
@ -396,8 +396,9 @@ sym_draw_scoreFinished( DrawCtx* /*dctx*/ )
} }
static void static void
sym_draw_drawTimer( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter, sym_draw_drawTimer( DrawCtx* /*p_dctx*/, XP_Rect* /*rInner*/,
XP_U16 player, XP_S16 secondsLeft ) XP_Rect* /*rOuter*/,
XP_U16 /*player*/, XP_S16 /*secondsLeft*/ )
{ {
} }
@ -432,9 +433,9 @@ static XP_Bool
sym_draw_drawCell( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_drawCell( DrawCtx* p_dctx, XP_Rect* rect,
/* at least one of these two will be null */ /* at least one of these two will be null */
XP_UCHAR* text, XP_Bitmap bitmap, XP_UCHAR* text, XP_Bitmap bitmap,
XP_S16 owner, /* -1 means don't use */ XP_S16 /*owner*/, /* -1 means don't use */
XWBonusType bonus, HintAtts hintAtts, XWBonusType bonus, HintAtts /*hintAtts*/,
XP_Bool isBlank, XP_Bool highlight, XP_Bool /*isBlank*/, XP_Bool highlight,
XP_Bool isStar ) XP_Bool isStar )
{ {
TRect lRect; TRect lRect;
@ -443,7 +444,6 @@ sym_draw_drawCell( DrawCtx* p_dctx, XP_Rect* rect,
symLocalRect( &lRect, rect ); symLocalRect( &lRect, rect );
sctx->iGC->SetClippingRect( lRect ); sctx->iGC->SetClippingRect( lRect );
XP_U16 index = COLOR_TILE;
TRgb rgb; TRgb rgb;
if ( highlight ) { if ( highlight ) {
rgb = sctx->colors[COLOR_BLACK]; rgb = sctx->colors[COLOR_BLACK];
@ -472,18 +472,18 @@ sym_draw_drawCell( DrawCtx* p_dctx, XP_Rect* rect,
} }
static void static void
sym_draw_invertCell( DrawCtx* p_dctx, XP_Rect* rect ) sym_draw_invertCell( DrawCtx* /*p_dctx*/, XP_Rect* /*rect*/ )
{ {
} }
static void static void
sym_draw_drawTile( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_drawTile( DrawCtx* p_dctx, XP_Rect* rect,
/* at least 1 of these two will be null*/ /* at least 1 of these two will be null*/
XP_UCHAR* text, XP_Bitmap bitmap, XP_UCHAR* text, XP_Bitmap /*bitmap*/,
XP_S16 val, XP_Bool highlighted ) XP_S16 val, XP_Bool highlighted )
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
XP_U16 index = COLOR_PLAYER1 + sctx->iTrayOwner; XP_U16 index = SC(XP_U16,COLOR_PLAYER1 + sctx->iTrayOwner);
TRect lRect; TRect lRect;
symLocalRect( &lRect, rect ); symLocalRect( &lRect, rect );
@ -532,7 +532,6 @@ sym_draw_drawTile( DrawCtx* p_dctx, XP_Rect* rect,
txtbuf.Copy( tmpDesc ); txtbuf.Copy( tmpDesc );
TInt width = font->TextWidthInPixels( txtbuf ); TInt width = font->TextWidthInPixels( txtbuf );
TInt ht = font->HeightInPixels();
TPoint point( lRect.iBr.iX - width, lRect.iBr.iY ); TPoint point( lRect.iBr.iX - width, lRect.iBr.iY );
sctx->iGC->DrawText( txtbuf, point ); sctx->iGC->DrawText( txtbuf, point );
sctx->iGC->DiscardFont(); sctx->iGC->DiscardFont();
@ -547,7 +546,7 @@ sym_draw_drawTileBack( DrawCtx* p_dctx, XP_Rect* rect )
static void static void
sym_draw_drawTrayDivider( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_drawTrayDivider( DrawCtx* p_dctx, XP_Rect* rect,
XP_Bool selected ) XP_Bool /*selected*/ )
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
TRect lRect; TRect lRect;
@ -577,7 +576,7 @@ sym_draw_clearRect( DrawCtx* p_dctx, XP_Rect* rect )
static void static void
sym_draw_drawBoardArrow( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_drawBoardArrow( DrawCtx* p_dctx, XP_Rect* rect,
XWBonusType bonus, XP_Bool vert, XWBonusType bonus, XP_Bool vert,
HintAtts hintAtts ) HintAtts /*hintAtts*/ )
{ {
SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx; SymDrawCtxt* sctx = (SymDrawCtxt*)p_dctx;
@ -629,28 +628,28 @@ sym_draw_drawBoardCursor( DrawCtx* p_dctx, XP_Rect* rect )
#endif #endif
static XP_UCHAR* static XP_UCHAR*
sym_draw_getMiniWText( DrawCtx* p_dctx, sym_draw_getMiniWText( DrawCtx* /*p_dctx*/,
XWMiniTextType textHint ) XWMiniTextType /*textHint*/ )
{ {
return (XP_UCHAR*)""; return (XP_UCHAR*)"";
} }
static void static void
sym_draw_measureMiniWText( DrawCtx* p_dctx, XP_UCHAR* textP, sym_draw_measureMiniWText( DrawCtx* /*p_dctx*/, XP_UCHAR* /*textP*/,
XP_U16* width, XP_U16* height ) XP_U16* /*width*/, XP_U16* /*height*/ )
{ {
} }
static void static void
sym_draw_drawMiniWindow( DrawCtx* p_dctx, XP_UCHAR* text, sym_draw_drawMiniWindow( DrawCtx* /*p_dctx*/, XP_UCHAR* /*text*/,
XP_Rect* rect, void** closure ) XP_Rect* /*rect*/, void** /*closure*/ )
{ {
} }
static void static void
sym_draw_eraseMiniWindow( DrawCtx* p_dctx, XP_Rect* rect, sym_draw_eraseMiniWindow( DrawCtx* /*p_dctx*/, XP_Rect* /*rect*/,
XP_Bool lastTime, void** closure, XP_Bool /*lastTime*/, void** /*closure*/,
XP_Bool* invalUnder ) XP_Bool* /*invalUnder*/ )
{ {
} }
@ -803,11 +802,11 @@ sym_drawctxt_make( MPFORMAL CWindowGc* aGC, CCoeEnv* aCoeEnv,
figureFonts( sctx ); figureFonts( sctx );
#if defined DEBUG && defined SERIES_80 #if defined SERIES_80
/* this path will change for other platforms/devices!!! */ /* this path will change for other platforms/devices!!! */
#if defined SYM_WINS #if defined __WINS__
_LIT( kBitmapsPath, "z:\\system\\apps\\XWORDS\\xwbitmaps.mbm" ); _LIT( kBitmapsPath, "z:\\system\\apps\\XWORDS\\xwbitmaps.mbm" );
#elif defined SYM_ARMI #elif defined __MARM__
_LIT( kBitmapsPath, "c:\\system\\apps\\XWORDS\\xwbitmaps.mbm" ); _LIT( kBitmapsPath, "c:\\system\\apps\\XWORDS\\xwbitmaps.mbm" );
#endif #endif
TFileName bitmapFile( kBitmapsPath ); TFileName bitmapFile( kBitmapsPath );