[Bf-blender-cvs] [30654e1] input_method_editor: set up ime branch

[Severin]

Commit: 30654e186fb665024669c489bc4524c01ceb52d1
Author: Severin
Date:   Mon Nov 17 18:18:11 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB30654e186fb665024669c489bc4524c01ceb52d1

set up ime branch

===================================================================

M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/space_text/space_text.c

===================================================================

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 06a4541..e733366 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1273,9 +1273,6 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 			 * we rely on string being NULL terminated. */
 			drawstr_left_len = INT_MAX;
 
-#ifdef WITH_INPUT_IME
-			ime = ui_but_get_ime_data(but);
-
 			if (ime && ime->composite_len) {
 				/* insert composite string into cursor pos */
 				char *str;
@@ -1290,9 +1287,6 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 				drawstr = drawstr_edit = str;
 			}
 			else {
-#else
-			if (1) {
-#endif
 				drawstr = but->editstr;
 			}
 		}
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index daf5b3d..3131a12 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -430,12 +430,6 @@ static void text_main_area_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
 	SpaceText *st = CTX_wm_space_text(C);
-#ifdef WITH_INPUT_IME
-	wmWindow *win = CTX_wm_window(C);
-	wmImeData *ime = win->ime_data;
-	int ime_active = ime && ime->composite_len &&
-					 BLI_rcti_isect_pt_v(&ar->winrct, &win->eventstate->x);
-#endif
 	//View2D *v2d = &ar->v2d;
 	
 	/* clear and setup matrix */