[Bf-blender-cvs] [98f0333] input_method_editor: Cleanup: Use *win instead of *window (moar consistent)

[Severin]

Commit: 98f03331104c2e497c8553ec33fff666060345ab
Author: Severin
Date:   Mon Nov 17 18:30:01 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB98f03331104c2e497c8553ec33fff666060345ab

Cleanup: Use *win instead of *window (moar consistent)

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

M       source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c 
b/source/blender/editors/interface/interface_handlers.c
index 17d0383..c84c722 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2427,20 +2427,20 @@ static bool ui_textedit_copypaste(uiBut *but, 
uiHandleButtonData *data, const in
 }
 
 /* enable ime, and set up uibut ime data */
-static void ui_textedit_ime_enable(wmWindow *window, uiBut *UNUSED(but)) 
+static void ui_textedit_ime_enable(wmWindow *win, uiBut *UNUSED(but)) 
 {
        int x, y;
        /* enable IME and position to cursor, it's a trick */
-       x = window->eventstate->x;
+       x = win->eventstate->x;
        /* flip y and move down a bit, prevent the IME panel cover the edit 
button */
-       y = window->eventstate->y - 12;
-       wm_window_IME_enable(window, x, y, 0, 0, true);
+       y = win->eventstate->y - 12;
+       wm_window_IME_enable(win, x, y, 0, 0, true);
 }
 
 /* disable ime, and clear uibut ime data */
-static void ui_textedit_ime_disable(wmWindow *window, uiBut *UNUSED(but)) 
+static void ui_textedit_ime_disable(wmWindow *win, uiBut *UNUSED(but)) 
 {
-       wm_window_IME_disable(window);
+       wm_window_IME_disable(win);
 }
 
 void ui_but_ime_reposition(uiBut *but, int x, int y, int complete) 
@@ -2461,8 +2461,6 @@ static void ui_textedit_begin(bContext *C, uiBut *but, 
uiHandleButtonData *data)
 {
        int len;
 
-       wmWindow *window;
-
        if (data->str) {
                MEM_freeN(data->str);
                data->str = NULL;
@@ -2522,7 +2520,8 @@ static void ui_textedit_begin(bContext *C, uiBut *but, 
uiHandleButtonData *data)
 
 static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
 {
-       wmWindow *window;
+       wmWindow *win;
+
        if (but) {
                if (ui_but_is_utf8(but)) {
                        int strip = BLI_utf8_invalid_strip(but->editstr, 
strlen(but->editstr));
@@ -2553,10 +2552,10 @@ static void ui_textedit_end(bContext *C, uiBut *but, 
uiHandleButtonData *data)
                but->pos = -1;
        }
 
-       window = CTX_wm_window(C);
-       WM_cursor_modal_restore(window);
+       win = CTX_wm_window(C);
+       WM_cursor_modal_restore(win);
 
-       ui_textedit_ime_disable(window, but);
+       ui_textedit_ime_disable(win, but);
 }
 
 static void ui_textedit_next_but(uiBlock *block, uiBut *actbut, 
uiHandleButtonData *data)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs