diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-05-01 08:09:22 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-05-01 08:09:22 +1000 |
| commit | 99af317e21c93c9a4024d1e6140f1cbc902e47d6 (patch) | |
| tree | 2d9fb17401e92de2028c150479fd46bd5b3dabcd /gtk/ScintillaGTK.cxx | |
| parent | 617bf64ac0188db167fe7779b50b32d5dc10d664 (diff) | |
| download | scintilla-mirror-99af317e21c93c9a4024d1e6140f1cbc902e47d6.tar.gz | |
Backport: Replace deprecated function pango_script_for_unichar with g_unichar_get_script.
Backport of changeset 8215:f0300892ae62.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rwxr-xr-x | gtk/ScintillaGTK.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index a6b4f3aa8..e00d45a89 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -161,7 +161,7 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : atomSought(nullptr), preeditInitialized(false), im_context(nullptr), - lastNonCommonScript(PANGO_SCRIPT_INVALID_CODE), + lastNonCommonScript(G_UNICODE_SCRIPT_INVALID_CODE), lastWheelMouseTime(0), lastWheelMouseDirection(0), wheelMouseIntensity(0), @@ -417,13 +417,13 @@ public: gboolean validUTF8; glong uniStrLen; gunichar *uniStr; - PangoScript pscript; + GUnicodeScript pscript; explicit PreEditString(GtkIMContext *im_context) noexcept { gtk_im_context_get_preedit_string(im_context, &str, &attrs, &cursor_pos); validUTF8 = g_utf8_validate(str, strlen(str), nullptr); uniStr = g_utf8_to_ucs4_fast(str, strlen(str), &uniStrLen); - pscript = pango_script_for_unichar(uniStr[0]); + pscript = g_unichar_get_script(uniStr[0]); } // Deleted so PreEditString objects can not be copied. PreEditString(const PreEditString&) = delete; @@ -2239,9 +2239,9 @@ gboolean ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, Sci bool ScintillaGTK::KoreanIME() { PreEditString pes(im_context); - if (pes.pscript != PANGO_SCRIPT_COMMON) + if (pes.pscript != G_UNICODE_SCRIPT_COMMON) lastNonCommonScript = pes.pscript; - return lastNonCommonScript == PANGO_SCRIPT_HANGUL; + return lastNonCommonScript == G_UNICODE_SCRIPT_HANGUL; } void ScintillaGTK::MoveImeCarets(int pos) { |