Changes for FXCursor