[Bf-blender-cvs] [065e589] master: IME: Minor API cleanup

Severin noreply at git.blender.org
Thu Mar 26 22:19:26 CET 2015


Commit: 065e5896c4ecda26952770813696ca051ca7cd41
Author: Severin
Date:   Thu Mar 26 21:24:01 2015 +0100
Branches: master
https://developer.blender.org/rB065e5896c4ecda26952770813696ca051ca7cd41

IME: Minor API cleanup

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

M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_widgets.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index dc8018c..6ef414b 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2476,8 +2476,7 @@ void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete)
 	wm_window_IME_begin(but->active->window, x, y - 4, 0, 0, complete);
 }
 
-/* should be ui_but_ime_data_get */
-wmIMEData *ui_but_get_ime_data(uiBut *but)
+wmIMEData *ui_but_ime_data_get(uiBut *but)
 {
 	if (but->active && but->active->window) {
 		return but->active->window->ime_data;
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 03816a2..e337389 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -635,7 +635,7 @@ uiBut *ui_but_find_new(uiBlock *block_old, const uiBut *but_new);
 
 #ifdef WITH_INPUT_IME
 void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete);
-struct wmIMEData *ui_but_get_ime_data(uiBut *but);
+struct wmIMEData *ui_but_ime_data_get(uiBut *but);
 #endif
 
 /* interface_widgets.c */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index d95e903..1cf78e6 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1318,7 +1318,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 
 #ifdef WITH_INPUT_IME
 			/* FIXME, IME is modifying 'const char *drawstr! */
-			ime_data = ui_but_get_ime_data(but);
+			ime_data = ui_but_ime_data_get(but);
 
 			if (ime_data && ime_data->composite_len) {
 				/* insert composite string into cursor pos */




More information about the Bf-blender-cvs mailing list