diff options
| author | nyamatongwe <unknown> | 2007-04-19 04:38:53 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2007-04-19 04:38:53 +0000 |
| commit | 476e533e7277cfd122f3ca3472783831c9e47ca5 (patch) | |
| tree | 1f7678e4a7fa68f9f761bd4650b9a84339841db8 /gtk/PlatGTK.cxx | |
| parent | 101ccc292a2a2623d6680e8f488f762bd5c9a091 (diff) | |
| download | scintilla-mirror-476e533e7277cfd122f3ca3472783831c9e47ca5.tar.gz | |
All Unicode planes supported, not just the Basic Multilingual Plane.
Diffstat (limited to 'gtk/PlatGTK.cxx')
| -rw-r--r-- | gtk/PlatGTK.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 59e4d9dca..e361b3e17 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1293,7 +1293,7 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char len = maxLengthTextRun-1; int wclen; if (et == UTF8) { - wclen = UCS2FromUTF8(s, len, + wclen = UTF16FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcs, so convert using current locale char sMeasure[maxLengthTextRun]; @@ -1468,7 +1468,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positi len = maxLengthTextRun-1; int wclen; if (et == UTF8) { - wclen = UCS2FromUTF8(s, len, + wclen = UTF16FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcsMode, so convert using current locale char sDraw[maxLengthTextRun]; @@ -1554,7 +1554,7 @@ int SurfaceImpl::WidthText(Font &font_, const char *s, int len) { #endif if (et == UTF8) { GdkWChar wctext[maxLengthTextRun]; - size_t wclen = UCS2FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), + size_t wclen = UTF16FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), sizeof(wctext) / sizeof(GdkWChar) - 1); wctext[wclen] = L'\0'; return gdk_text_width_wc(PFont(font_)->pfont, wctext, wclen); |