diff options
| author | Ken Hughes <khughes@pacific.edu> | 2008-04-25 23:18:24 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2008-04-25 23:18:24 +0400 |
| commit | bc18e9e2908cad1d416c101f9aa07c29fdaed7c0 (patch) | |
| tree | cac2f554a27030780dfbc74917ab75b96d8d165a /source/blender/src/editfont.c | |
| parent | 2a72b986d4dc8b6bef845e5ca9bdbb6bbf0ff8f4 (diff) | |
Suggestion by GSR; move "extern C" into header file, remove "_" from
utf8towchar function name.
Diffstat (limited to 'source/blender/src/editfont.c')
| -rw-r--r-- | source/blender/src/editfont.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index 5ec0399a426..cb245867c89 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -319,7 +319,7 @@ void load_3dtext_fs(char *file) { int tmplen; wchar_t *mem = MEM_callocN((sizeof(wchar_t)*filelen)+(4*sizeof(wchar_t)), "temporary"); - tmplen = utf8towchar_(mem, strp); + tmplen = utf8towchar(mem, strp); wcscat(textbuf, mem); MEM_freeN(mem); cu->len += tmplen; @@ -686,7 +686,7 @@ void do_textedit(unsigned short event, short val, unsigned long _ascii) if(cu->len+filelen<MAXTEXT) { int tmplen; wchar_t *mem = MEM_callocN((sizeof(wchar_t)*filelen)+(4*sizeof(wchar_t)), "temporary"); - tmplen = utf8towchar_(mem, strp); + tmplen = utf8towchar(mem, strp); wcscat(textbuf, mem); MEM_freeN(mem); cu->len += tmplen; @@ -969,7 +969,7 @@ void paste_unicodeText(char *filename) { int tmplen; wchar_t *mem = MEM_callocN((sizeof(wchar_t)*filelen)+(4*sizeof(wchar_t)), "temporary"); - tmplen = utf8towchar_(mem, strp); + tmplen = utf8towchar(mem, strp); // mem =utf8s2wc(strp); wcscat(textbuf, mem); MEM_freeN(mem); @@ -1033,7 +1033,7 @@ void paste_editText(void) if(cu->len+filelen<MAXTEXT) { int tmplen; wchar_t *mem = MEM_callocN((sizeof(wchar_t) * filelen) + (4 * sizeof(wchar_t)), "temporary"); - tmplen = utf8towchar_(mem, strp); + tmplen = utf8towchar(mem, strp); wcscat(textbuf, mem); MEM_freeN(mem); cu->len += tmplen; @@ -1064,7 +1064,7 @@ void make_editText(void) if(oldstr==NULL) oldstr= MEM_callocN((MAXTEXT+4)*sizeof(wchar_t), "oldstrbuf"); // Convert the original text to wchar_t - utf8towchar_(textbuf, cu->str); + utf8towchar(textbuf, cu->str); wcscpy(oldstr, textbuf); cu->len= wcslen(textbuf); |