patch 8.0.1136: W_WIDTH() is always the same

Problem:    W_WIDTH() is always the same.
Solution:   Expand the macro.
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 0467c39..c2b3e73 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -190,7 +190,7 @@
     /* Calculate column */
 #ifdef FEAT_RIGHTLEFT
     if (curwin->w_p_rl)
-	col = curwin->w_wincol + W_WIDTH(curwin) - curwin->w_wcol - 1;
+	col = curwin->w_wincol + curwin->w_width - curwin->w_wcol - 1;
     else
 #endif
 	col = curwin->w_wincol + curwin->w_wcol;
@@ -312,7 +312,7 @@
 #ifdef FEAT_RIGHTLEFT
 	if (curwin->w_p_rl)
 	{
-	    if (pum_col < curwin->w_wincol + W_WIDTH(curwin) - 1)
+	    if (pum_col < curwin->w_wincol + curwin->w_width - 1)
 		screen_putchar(' ', row, pum_col + 1, attr);
 	}
 	else