Commit: a54d863a93348e19a06b6aa7978e7befd4ea89cc
Author: Severin
Date: Mon Dec 1 17:20:13 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rBa54d863a93348e19a06b6aa7978e7befd4ea89cc
IME: Fix IME not ending composition after region change
+ adding some asserts
===================================================================
M source/blender/editors/screen/CMakeLists.txt
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/screen/CMakeLists.txt
b/source/blender/editors/screen/CMakeLists.txt
index 413d40b..cce4f17 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -52,6 +52,12 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
+if(WIN32)
+ if(WITH_INPUT_IME)
+ add_definitions(-DWITH_INPUT_IME)
+ endif()
+endif()
+
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index b5d2d41..a8b5061 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1528,11 +1528,15 @@ bool WM_window_is_fullscreen(wmWindow *win)
#ifdef WITH_INPUT_IME
void wm_window_IME_begin(wmWindow *win, int x, int y, int w, int h, bool
complete)
{
+ BLI_assert(win && win->ime_data);
+
GHOST_BeginIME(win->ghostwin, x, win->sizey - y, w, h, complete);
}
void wm_window_IME_end(wmWindow *win)
{
+ BLI_assert(win && win->ime_data);
+
GHOST_EndIME(win->ghostwin);
}
#endif /* WITH_INPUT_IME */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
