Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-06 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drawBegin sig change

Browse source
This commit is contained in:
ehouse 2004-02-13 13:54:52 +00:00
parent 71c91188e0
commit 4c693e0bb8
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linux/gtkdraw.c
View file

@ -185,7 +185,7 @@ gtk_draw_destroyCtxt( DrawCtx* p_dctx )
} /* draw_setup */ } /* draw_setup */
#endif #endif
static void static XP_Bool
gtk_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus ) gtk_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
{ {
GdkRectangle gdkrect; GdkRectangle gdkrect;
@ -198,10 +198,7 @@ gtk_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
++gdkrect.height; ++gdkrect.height;
gdk_gc_set_clip_rectangle( dctx->drawGC, &gdkrect ); gdk_gc_set_clip_rectangle( dctx->drawGC, &gdkrect );
/* gdk_draw_rectangle( DRAW_WHAT(dctx), */ return XP_TRUE;
/* dctx->drawGC, FALSE, */
/* rect->left, rect->top, rect->width, rect->height ); */
} /* draw_finish */ } /* draw_finish */
static void static void

10
palm/palmdraw.c
View file

@ -95,7 +95,7 @@ bitmapInRect( PalmDrawCtx* dctx, Int16 resID, XP_Rect* rectP )
drawBitmapAt( (DrawCtx*)dctx, resID, left, top ); drawBitmapAt( (DrawCtx*)dctx, resID, left, top );
} /* bitmapInRect */ } /* bitmapInRect */
static void static XP_Bool
palm_common_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus ) palm_common_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
{ {
PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx; PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
@ -103,10 +103,11 @@ palm_common_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
if ( !globals->gState.showGrid ) { if ( !globals->gState.showGrid ) {
WinDrawRectangleFrame(rectangleFrame, (RectangleType*)rect); WinDrawRectangleFrame(rectangleFrame, (RectangleType*)rect);
} }
return XP_TRUE;
} /* palm_common_draw_boardBegin */ } /* palm_common_draw_boardBegin */
#ifdef COLOR_SUPPORT #ifdef COLOR_SUPPORT
static void static XP_Bool
palm_clr_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus ) palm_clr_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
{ {
PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx; PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
@ -118,6 +119,7 @@ palm_clr_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, XP_Bool hasfocus )
WinSetForeColor( dctx->drawingPrefs->drawColors[COLOR_BLACK] ); WinSetForeColor( dctx->drawingPrefs->drawColors[COLOR_BLACK] );
WinSetTextColor( dctx->drawingPrefs->drawColors[COLOR_BLACK] ); WinSetTextColor( dctx->drawingPrefs->drawColors[COLOR_BLACK] );
WinSetBackColor( dctx->drawingPrefs->drawColors[COLOR_WHITE] ); WinSetBackColor( dctx->drawingPrefs->drawColors[COLOR_WHITE] );
return XP_TRUE;
} /* palm_clr_draw_boardBegin */ } /* palm_clr_draw_boardBegin */
static void static void
@ -933,11 +935,13 @@ static void
palm_draw_drawMiniWindow( DrawCtx* p_dctx, unsigned char* text, palm_draw_drawMiniWindow( DrawCtx* p_dctx, unsigned char* text,
XP_Rect* rect, void** closureP ) XP_Rect* rect, void** closureP )
{ {
PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
RectangleType localR = *(RectangleType*)rect; RectangleType localR = *(RectangleType*)rect;
XP_U16 ignoreErr; XP_U16 ignoreErr;
XP_Bool hasClosure = !!closureP; XP_Bool hasClosure = !!closureP;
MiniWinData* data = (MiniWinData*)(hasClosure? *closureP: NULL); MiniWinData* data = (MiniWinData*)(hasClosure? *closureP: NULL);
#ifdef MEM_DEBUG
PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
#endif
if ( hasClosure ) { if ( hasClosure ) {
if ( !data ) { if ( !data ) {