From 01d7f9b344afda4ff7e8aee6ecd8e6fb61dbcc67 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 1 Apr 2006 21:25:58 +0000
Subject: [PATCH] Get rid of TALL_FONT macro, since it's permanently on anyway.

---
 palm/palmdict.c |  2 --
 palm/palmdraw.c | 18 ------------------
 palm/palmmain.h |  4 ----
 3 files changed, 24 deletions(-)

diff --git a/palm/palmdict.c b/palm/palmdict.c
index 688883e6e..f36aa86d7 100644
--- a/palm/palmdict.c
+++ b/palm/palmdict.c
@@ -186,9 +186,7 @@ palm_dictionary_make( MPFORMAL PalmAppGlobals* globals,
         charPtr = (unsigned char*)MemHandleLock(tmpH);
         XP_ASSERT( MemHandleLockCount( tmpH ) == 1 );
         // use 2; ARM thinks sizeof(Xloc_header) is 4.
-#ifdef TALL_FONTS
         ctxt->super.langCode = *charPtr;
-#endif
         ctxt->super.countsAndValues = charPtr + 2;
 
         /* for those dicts with special chars */
diff --git a/palm/palmdraw.c b/palm/palmdraw.c
index e1c540481..253a2ae2b 100644
--- a/palm/palmdraw.c
+++ b/palm/palmdraw.c
@@ -39,9 +39,7 @@
 
 static XP_Bool palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, 
                                           const XP_UCHAR* letters, XP_Bitmap bitmap,
-#ifdef TALL_FONTS
                                           Tile tile,
-#endif
                                           XP_S16 owner, XWBonusType bonus, 
                                           HintAtts hintAtts, XP_Bool isBlank, 
                                           XP_Bool isPending, XP_Bool isStar );
@@ -126,7 +124,6 @@ bitmapInRect( PalmDrawCtx* dctx, Int16 resID, const XP_Rect* rectP )
     drawBitmapAt( (DrawCtx*)dctx, resID, left, top );
 } /* bitmapInRect */
 
-#ifdef TALL_FONTS
 # define BMP_WIDTH 16
 # define BMP_HT 16
 
@@ -229,9 +226,6 @@ checkFontOffsets( PalmDrawCtx* dctx, const DictionaryCtxt* dict )
         dctx->fontLangCode = code;
     }
 }
-#else
-# define checkFontOffsets(a,b)
-#endif
 
 static XP_Bool
 palm_common_draw_boardBegin( DrawCtx* p_dctx, const DictionaryCtxt* dict,
@@ -277,9 +271,7 @@ palm_clr_draw_boardFinished( DrawCtx* p_dctx )
 static XP_Bool
 palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, 
                         const XP_UCHAR* letters, XP_Bitmap bitmap,
-#ifdef TALL_FONTS
                         Tile tile,
-#endif
                         XP_S16 owner, XWBonusType bonus, HintAtts hintAtts,
                         XP_Bool isBlank, 
                         XP_Bool isPending, XP_Bool isStar )
@@ -313,9 +305,7 @@ palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
     }
 
     return palm_common_draw_drawCell( p_dctx, rect, letters, bitmap, 
-#ifdef TALL_FONTS
                                       tile,
-#endif
                                       owner, bonus, hintAtts, isBlank, isPending, 
                                       isStar );
 } /* palm_clr_draw_drawCell */
@@ -374,9 +364,7 @@ palmDrawHintBorders( const XP_Rect* rect, HintAtts hintAtts )
 static XP_Bool
 palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, 
                            const XP_UCHAR* letters, XP_Bitmap bitmap,
-#ifdef TALL_FONTS
                            Tile tile,
-#endif
                            XP_S16 owner, XWBonusType bonus, HintAtts hintAtts,
                            XP_Bool isBlank, XP_Bool isPending, XP_Bool isStar )
 {
@@ -431,12 +419,8 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
             XP_S16 strWidth = FntCharsWidth( (const char*)letters, len );
             XP_U16 x, y;
             x = localR.left + ((localR.width-strWidth) / 2);
-#ifdef TALL_FONTS
             y = localR.top - dctx->fontHtInfo[tile].topOffset;
             y += (localR.height - dctx->fontHtInfo[tile].height) / 2;
-#else
-            y = localR.top-1;
-#endif
             if ( len == 1 ) {
                 ++x;
             }
@@ -1456,10 +1440,8 @@ palm_drawctxt_destroy( DrawCtx* p_dctx )
     PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
 
     XP_FREE( dctx->mpool, p_dctx->vtable );
-#ifdef TALL_FONTS
     if ( !!dctx->fontHtInfo ) {
         XP_FREE( dctx->mpool, dctx->fontHtInfo );
     }
-#endif
     XP_FREE( dctx->mpool, dctx );
 } /* palm_drawctxt_destroy */
diff --git a/palm/palmmain.h b/palm/palmmain.h
index 8c72f8910..2dd9e4ded 100644
--- a/palm/palmmain.h
+++ b/palm/palmmain.h
@@ -57,14 +57,12 @@ typedef struct PalmAppGlobals PalmAppGlobals;
 typedef XP_UCHAR* (*GetResStringFunc)( PalmAppGlobals* globals, 
                                        XP_U16 strID );
 
-#ifdef TALL_FONTS
 typedef struct {
     XP_S16 topOffset;           /* how many pixels from the top of the
                                    drawing area is the first pixel set in
                                    the glyph */
     XP_U16 height;              /* How many rows tall is the image? */
 } PalmFontHtInfo;
-#endif
 
 typedef struct PalmDrawCtx {
     DrawCtxVTable* vtable;
@@ -87,10 +85,8 @@ typedef struct PalmDrawCtx {
     XP_Bool doHiRes;
     XP_Bool oneDotFiveAvail;
 
-#ifdef TALL_FONTS
     XP_LangCode fontLangCode;
     PalmFontHtInfo* fontHtInfo;
-#endif
 
     union {
         struct {