TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes what I was trying to fix for the last checkin

Browse Source
This commit is contained in:
Asad M. Zaman 2004-04-28 02:41:39 +00:00
parent 79a7b7c5da
commit 31ff26b6f4
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -1126,11 +1126,15 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
case WM_IME_COMPOSITION:
if (ime_aware) {
// If the ime window is not marked as active at this point, we
// must be in the process of closing it down (in close_ime), and
// we don't want to send the current composition string in that
// case. But we do need to return 0 to tell windows not to try
// to send the composition string through WM_CHAR messages.
if (!_ime_active)
return 0;
HIMC hIMC = ImmGetContext(hwnd);
nassertr(hIMC != 0, 0);
@ -1150,7 +1154,6 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
// functions to use.
if (lparam & GCS_RESULTSTR) {
if (_ime_active) {
windisplay_cat.debug() << "GCS_RESULTSTR\n";
result_size = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR,
ime_result, max_ime_result);
@ -1169,7 +1172,6 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].keystroke(result);
}
}
}
if (lparam & GCS_COMPSTR) {
windisplay_cat.debug() << "GCS_COMPSTR\n";
/*
@ -1204,7 +1206,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].candidate(can_t, min(cursor_pos, delta_start), max(cursor_pos, delta_start), cursor_pos);
}
} else {
if ((lparam & GCS_RESULTSTR) && _ime_active) {
if (lparam & GCS_RESULTSTR) {
// On the other hand, ImmGetCompositionStringW() doesn't
// work on Win95 or Win98; for these OS's we must use
// ImmGetCompositionStringA().