Author: manolo
Date: 2011-08-08 08:24:19 -0700 (Mon, 08 Aug 2011)
New Revision: 8935
Log:
Fix STR #2695 (continued). Use of Fl::x() is appropriate only under Mac OS.

Modified:
   branches/branch-1.3/src/Fl_Menu.cxx

Modified: branches/branch-1.3/src/Fl_Menu.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu.cxx 2011-08-08 15:17:08 UTC (rev 8934)
+++ branches/branch-1.3/src/Fl_Menu.cxx 2011-08-08 15:24:19 UTC (rev 8935)
@@ -279,8 +279,11 @@
   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;

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to