Fix builds without toolkit menu bars

* src/keyboard.c (make_lispy_event): Call x_y_to_column_row when
building internal menu bar events.

* src/xdisp.c (x_y_to_column_row): Provide DX and DY parameters
to x_y_to_column_row.

2 files changed, 3 insertions, 4 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index b1d523f580c..8ba9acd6ccc 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6948,9 +6948,8 @@ make_lispy_event (struct input_event *event)
 
             if (!NILP (f->menu_bar_window))
               {
-                x_y_to_hpos_vpos (XWINDOW (f->menu_bar_window), XFIXNUM (x),
-                                  XFIXNUM (y), &column, &row, NULL, NULL,
-                                  &dummy);
+                x_y_to_column_row (XWINDOW (f->menu_bar_window), XFIXNUM (x),
+                                  XFIXNUM (y), &column, &row);
 
                 if (row >= 0 && row < FRAME_MENU_BAR_LINES (f))
                   {
diff --git a/src/xdisp.c b/src/xdisp.c
index 233233415d1..06d5481acd3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2447,7 +2447,7 @@ void
 x_y_to_column_row (struct window *w, int x, int y, int *column, int *row)
 {
   int dummy;
-  x_y_to_hpos_vpos (w, x, y, column, row, &dummy);
+  x_y_to_hpos_vpos (w, x, y, column, row, NULL, NULL, &dummy);
 }
 #endif