archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

=Lack of #ifdef INTERNATIONAL=

Browse Source 
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.
This commit is contained in:
Joseph Eagar
2007-08-01 10:33:01 +00:00
parent 311d7e31cc
commit 9df1b7d1fb
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/filesel.c
View File

@@ -111,7 +111,9 @@
#include "BIF_fsmenu.h" /* include ourselves */ #include "BIF_fsmenu.h" /* include ourselves */
#ifdef INTERNATIONAL
#include "FTF_Api.h" #include "FTF_Api.h"
#endif
#if defined WIN32 || defined __BeOS #if defined WIN32 || defined __BeOS
int fnmatch(const char *pattern, const char *string, int flags) 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) { if (sfile->f_fp) {
sprintf (tmpstr, "%s%s", sfile->dir, sfile->file); sprintf (tmpstr, "%s%s", sfile->dir, sfile->file);
/* printf ("%s\n", tmpstr); */ /* printf ("%s\n", tmpstr); */
#ifdef INTERNATIONAL
if (!FTF_GetNewFont ((const unsigned char *)tmpstr, 0, U.fontsize)) if (!FTF_GetNewFont ((const unsigned char *)tmpstr, 0, U.fontsize))
error ("No font file"); error ("No font file");
#endif
} }
} }
if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile); if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile);

2
source/blender/src/header_filesel.c
View File

@@ -158,6 +158,7 @@ void file_buttons(void)
xco+= 100; // scroll xco+= 100; // scroll
} }
#ifdef INTERNATIONAL
else if(sfile->type==FILE_LOADFONT) { 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"); 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) if (sfile->f_fp)
@@ -165,6 +166,7 @@ void file_buttons(void)
xco+= 100; // scroll xco+= 100; // scroll
} }
#endif
uiDrawBlock(block); uiDrawBlock(block);

6
source/blender/src/interface_draw.c
View File

@@ -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); ui_rasterpos_safe(x, (but->y1+but->y2- 9.0)/2.0, but->aspect);
if(but->type==IDPOIN) transopts= 0; // no translation, of course! if(but->type==IDPOIN) transopts= 0; // no translation, of course!
else transopts= (U.transopts & USER_TR_BUTTONS); else transopts= (U.transopts & USER_TR_BUTTONS);
#ifdef INTERNATIONAL
if (but->type == FTPREVIEW) if (but->type == FTPREVIEW)
FTF_DrawNewFontString (but->drawstr+but->ofs, FTF_INPUT_UTF8); FTF_DrawNewFontString (but->drawstr+but->ofs, FTF_INPUT_UTF8);
else else
BIF_DrawString(but->font, but->drawstr+but->ofs, transopts); BIF_DrawString(but->font, but->drawstr+but->ofs, transopts);
#else
BIF_DrawString(but->font, but->drawstr+but->ofs, transopts);
#endif
/* part text right aligned */ /* part text right aligned */
if(cpoin) { if(cpoin) {