modify rectangle, remove marco define
update row and column