1 files changed, 7 insertions, 16 deletions

diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index 5943e947b41..bd9a6464332 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -51,11 +51,9 @@
 #include "BIF_glutil.h"
 
 /* context checked on having screen, window and area */
-wmGesture *WM_gesture_new(bContext *C, const wmEvent *event, int type)
+wmGesture *WM_gesture_new(wmWindow *window, const ARegion *ar, const wmEvent *event, int type)
 {
   wmGesture *gesture = MEM_callocN(sizeof(wmGesture), "new gesture");
-  wmWindow *window = CTX_wm_window(C);
-  ARegion *ar = CTX_wm_region(C);
 
   BLI_addtail(&window->gesture, gesture);
 
@@ -97,7 +95,7 @@ wmGesture *WM_gesture_new(bContext *C, const wmEvent *event, int type)
   return gesture;
 }
 
-static void wm_gesture_end_with_window(wmWindow *win, wmGesture *gesture)
+void WM_gesture_end(wmWindow *win, wmGesture *gesture)
 {
   if (win->tweak == gesture) {
     win->tweak = NULL;
@@ -108,24 +106,17 @@ static void wm_gesture_end_with_window(wmWindow *win, wmGesture *gesture)
   MEM_freeN(gesture);
 }
 
-void WM_gesture_end(bContext *C, wmGesture *gesture)
-{
-  wm_gesture_end_with_window(CTX_wm_window(C), gesture);
-}
-
 void WM_gestures_free_all(wmWindow *win)
 {
   while (win->gesture.first) {
-    wm_gesture_end_with_window(win, win->gesture.first);
+    WM_gesture_end(win, win->gesture.first);
   }
 }
 
-void WM_gestures_remove(bContext *C)
+void WM_gestures_remove(wmWindow *win)
 {
-  wmWindow *win = CTX_wm_window(C);
-
   while (win->gesture.first) {
-    WM_gesture_end(C, win->gesture.first);
+    WM_gesture_end(win, win->gesture.first);
   }
 }
 
@@ -531,9 +522,9 @@ void wm_gesture_draw(wmWindow *win)
   }
 }
 
-void wm_gesture_tag_redraw(bContext *C)
+void wm_gesture_tag_redraw(wmWindow *win)
 {
-  bScreen *screen = CTX_wm_screen(C);
+  bScreen *screen = WM_window_get_active_screen(win);
 
   if (screen) {
     screen->do_draw_gesture = true;