Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve IME related comments in ScintillaWX

Browse Source
This commit is contained in:
wangqr
2020-05-12 23:03:43 -04:00
parent 59370f36c8
commit 2f74942eca
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/stc/ScintillaWX.cpp
View File

@@ -847,18 +847,12 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
#ifdef __WXMSW__
// ScintillaWin
case WM_IME_STARTCOMPOSITION: // dbcs
// TODO: We haven't ported WM_IME_COMPOSITION yet, so always use windowed IME to make it at least work
//if (KoreanIME() || imeInteraction == imeInline) {
if (false) {
return 0;
}
else {
ImeStartComposition();
return stc->wxControl::MSWWindowProc(iMessage, wParam, lParam);
}
case WM_IME_STARTCOMPOSITION:
// Always use windowed IME in ScintillaWX for now. Inline IME not implemented yet
ImeStartComposition();
return stc->wxControl::MSWWindowProc(iMessage, wParam, lParam);
case WM_IME_ENDCOMPOSITION: // dbcs
case WM_IME_ENDCOMPOSITION:
ImeEndComposition();
return stc->wxControl::MSWWindowProc(iMessage, wParam, lParam);
@@ -866,7 +860,7 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
case WM_IME_REQUEST:
case WM_IME_COMPOSITION:
case WM_IME_SETCONTEXT:
// TODO: Port event handling from ScintillaWin
// These events are forwarded here for future inline IME implementation
return stc->wxControl::MSWWindowProc(iMessage, wParam, lParam);
#endif