diff options
| author | Severin <julian_eisel@web.de> | 2015-03-26 23:24:01 +0300 |
|---|---|---|
| committer | Severin <julian_eisel@web.de> | 2015-03-26 23:24:01 +0300 |
| commit | 065e5896c4ecda26952770813696ca051ca7cd41 (patch) | |
| tree | d0834c4123e4610dd5ebfd449ce4ec56623d52ab /source/blender | |
| parent | 6e72f06069ae427a32501676c8b86e9e8c3ddb8c (diff) | |
IME: Minor API cleanup
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index dc8018cd11e..6ef414b88ea 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 03816a255ad..e337389f781 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 d95e9035207..1cf78e68315 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 */ |