diff options
| author | Manolo Gouy <Manolo> | 2011-08-08 15:24:19 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-08-08 15:24:19 +0000 |
| commit | 2beb43cf85f6d22e398458b3260e4e1b4d88f5db (patch) | |
| tree | 19e1c204c15b2671b2020199eccdf28fd13ee896 | |
| parent | 59fdc24b167edd2524579d14144021b093c1d3f5 (diff) | |
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
| -rw-r--r-- | src/Fl_Menu.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
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; |