-#define pager_popup_size(p, w, h) popup_size((p)->popup,(w),(h))
-#define pager_popup_size_to_string(p, s) popup_size_to_string((p)->popup,(s))
+#define pager_popup_width(p, w) popup_width((p)->popup,(w))
+#define pager_popup_height(p, h) popup_height((p)->popup,(h))
+#define pager_popup_width_to_string(p, s, n, m) \
+ popup_width_to_string((p)->popup,(s),(n),(m))
+#define pager_popup_width_to_strings(p, s, n, m) \
+ popup_width_to_strings((p)->popup,(s),(n),(m))