diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2007-08-01 14:33:01 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2007-08-01 14:33:01 +0400 |
| commit | 9df1b7d1fb1c6ce320cfedfcfe54a39d05253273 (patch) | |
| tree | f7b440e0157804816c5b07551ada899e17aa88c4 | |
| parent | 311d7e31cc51cb2f5a10bb53727f9036272d0f96 (diff) | |
=Lack of #ifdef INTERNATIONAL=
Recent font preview commit didn't have the proper enclosing #ifdef INTERNATIONAL
blocks. Honestly, I have no idea why we bother, but added them anyway.
| -rw-r--r-- | source/blender/src/filesel.c | 4 | ||||
| -rw-r--r-- | source/blender/src/header_filesel.c | 2 | ||||
| -rw-r--r-- | source/blender/src/interface_draw.c | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index f3d7add8b8d..036e13f3f3b 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -111,7 +111,9 @@ #include "BIF_fsmenu.h" /* include ourselves */ +#ifdef INTERNATIONAL #include "FTF_Api.h" +#endif #if defined WIN32 || defined __BeOS int fnmatch(const char *pattern, const char *string, int flags) @@ -2027,8 +2029,10 @@ void winqreadfilespace(ScrArea *sa, void *spacedata, BWinEvent *evt) if (sfile->f_fp) { sprintf (tmpstr, "%s%s", sfile->dir, sfile->file); /* printf ("%s\n", tmpstr); */ + #ifdef INTERNATIONAL if (!FTF_GetNewFont ((const unsigned char *)tmpstr, 0, U.fontsize)) error ("No font file"); + #endif } } if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile); diff --git a/source/blender/src/header_filesel.c b/source/blender/src/header_filesel.c index f8a90f9ba03..8ef4ed9dc24 100644 --- a/source/blender/src/header_filesel.c +++ b/source/blender/src/header_filesel.c @@ -158,6 +158,7 @@ void file_buttons(void) xco+= 100; // scroll } + #ifdef INTERNATIONAL else if(sfile->type==FILE_LOADFONT) { uiDefIconButBitS(block, TOG, FILE_SHOWSHORT, B_SORTFILELIST, ICON_FONTPREVIEW, xco+= XIC, 0, XIC, YIC, &sfile->f_fp, 0, 0, 0, 0, "Activate font preview"); if (sfile->f_fp) @@ -165,6 +166,7 @@ void file_buttons(void) xco+= 100; // scroll } + #endif uiDrawBlock(block); diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index 374cc72a59f..2af1892de1c 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -1604,11 +1604,15 @@ static void ui_draw_text_icon(uiBut *but) ui_rasterpos_safe(x, (but->y1+but->y2- 9.0)/2.0, but->aspect); if(but->type==IDPOIN) transopts= 0; // no translation, of course! else transopts= (U.transopts & USER_TR_BUTTONS); - + + #ifdef INTERNATIONAL if (but->type == FTPREVIEW) FTF_DrawNewFontString (but->drawstr+but->ofs, FTF_INPUT_UTF8); else BIF_DrawString(but->font, but->drawstr+but->ofs, transopts); + #else + BIF_DrawString(but->font, but->drawstr+but->ofs, transopts); + #endif /* part text right aligned */ if(cpoin) { |