From 2beb43cf85f6d22e398458b3260e4e1b4d88f5db Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 8 Aug 2011 15:24:19 +0000
Subject: Fix STR #2695 (continued). Use of Fl::x() is appropriate only under
 Mac OS.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8935 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Menu.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Fl_Menu.cxx')

diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index a4fd085ff..39d7dc173 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -279,8 +279,11 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp,
   int scr_x, scr_y, scr_w, scr_h;
   int tx = X, ty = Y;
 
+  Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h);
+#ifdef __APPLE__
   scr_x = Fl::x();
   scr_w = Fl::w();
+#endif
   scr_y = Fl::y();
   scr_h = Fl::h();
   if (!right_edge || right_edge > scr_x+scr_w) right_edge = scr_x+scr_w;
-- 
cgit v1.2.3