gkey.cpp (gambas-3.16.2.tar.bz2) | : | gkey.cpp (gambas-3.16.3.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 240 | skipping to change at line 240 | |||
} | } | |||
return f || _canceled; | return f || _canceled; | |||
} | } | |||
bool gKey::mustIgnoreEvent(GdkEventKey *event) | bool gKey::mustIgnoreEvent(GdkEventKey *event) | |||
{ | { | |||
if (!_im_has_input_method) | if (!_im_has_input_method) | |||
return false; | return false; | |||
else | else | |||
return (event->type == GDK_KEY_PRESS) && (event->keyval == 0 || ! event->string || (uchar)*event->string >= 32); | return (event->type == GDK_KEY_PRESS) && (event->keyval == 0 || ! event->string || ((uchar)*event->string >= 32 && ((event->keyval & 0xFF00) != 0x FF00))); | |||
} | } | |||
void gcb_im_commit(GtkIMContext *context, const char *str, gControl *control) | void gcb_im_commit(GtkIMContext *context, const char *str, gControl *control) | |||
{ | { | |||
bool disable = false; | bool disable = false; | |||
if (!control) | if (!control) | |||
control = _im_control; | control = _im_control; | |||
// Not called from a key press event! | // Not called from a key press event! | |||
skipping to change at line 377 | skipping to change at line 377 | |||
else | else | |||
{ | { | |||
_im_is_xim = FALSE; | _im_is_xim = FALSE; | |||
} | } | |||
} | } | |||
_im_ignore_event = FALSE; | _im_ignore_event = FALSE; | |||
#if DEBUG_IM | #if DEBUG_IM | |||
fprintf(stderr,"\n------------------------\n"); | fprintf(stderr,"\n------------------------\n"); | |||
fprintf(stderr, "gtk_im_context_focus_in: _im_has_input_method = %d\n", _im_has_input_method); | fprintf(stderr, "gtk_im_context_focus_in: %s _im_has_input_method = %d\n", control ? control->name() : "-", _im_has_input_method); | |||
#endif | #endif | |||
} | } | |||
} | } | |||
static bool raise_key_event_to_parent_window(gControl *control, int type) | static bool raise_key_event_to_parent_window(gControl *control, int type) | |||
{ | { | |||
gMainWindow *win; | gMainWindow *win; | |||
while (control->parent()) | while (control->parent()) | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |