diff options
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 3a62faeab8a..3a0e5eab143 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -448,7 +448,7 @@ typedef struct wmOperatorType { /* for modal temporary operators, initially invoke is called. then * any further events are handled in modal. if the operation is - * cancelled due to some external reason, cancel is called + * canceled due to some external reason, cancel is called * - see defines below for return values */ int (*invoke)(struct bContext *, struct wmOperator *, struct wmEvent *); int (*cancel)(struct bContext *, struct wmOperator *); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 1d2252b7ceb..7bc0557b631 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1365,7 +1365,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand handler->op= NULL; } - /* remove modal handler, operator itself should have been cancelled and freed */ + /* remove modal handler, operator itself should have been canceled and freed */ if(retval & (OPERATOR_CANCELLED|OPERATOR_FINISHED)) { WM_cursor_ungrab(CTX_wm_window(C)); @@ -2337,7 +2337,7 @@ void WM_event_add_mousemove(bContext *C) int WM_modal_tweak_exit(wmEvent *evt, int tweak_event) { /* if the release-confirm userpref setting is enabled, - * tweak events can be cancelled when mouse is released + * tweak events can be canceled when mouse is released */ if (U.flag & USER_RELEASECONFIRM) { /* option on, so can exit with km-release */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f9cbfc88301..290046d59ab 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3387,7 +3387,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, wmEvent *event) case ESCKEY: case RIGHTMOUSE: - /* cancelled; restore original value */ + /* canceled; restore original value */ radial_control_set_value(rc, rc->initial_value); ret = OPERATOR_CANCELLED; break; |