Make Fl_Screen_Driver::get_mouse(int&, int&) return the number of the mouse-containing screen.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12264 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 1 insertions, 17 deletions

diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx
index ec1474cc5..54581c551 100644
--- a/src/Fl_Screen_Driver.cxx
+++ b/src/Fl_Screen_Driver.cxx
@@ -54,28 +54,12 @@ int Fl_Screen_Driver::visual(int) {
 }
 
 
-void Fl_Screen_Driver::screen_xywh(int &X, int &Y, int &W, int &H)
-{
-  int x, y;
-  get_mouse(x, y);
-  screen_xywh(X, Y, W, H, x, y);
-}
-
-
 void Fl_Screen_Driver::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my)
 {
   screen_xywh(X, Y, W, H, screen_num(mx, my));
 }
 
 
-void Fl_Screen_Driver::screen_work_area(int &X, int &Y, int &W, int &H)
-{
-  int x, y;
-  get_mouse(x, y);
-  screen_work_area(X, Y, W, H, x, y);
-}
-
-
 void Fl_Screen_Driver::screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my)
 {
   screen_work_area(X, Y, W, H, screen_num(mx, my));
@@ -103,7 +87,7 @@ int Fl_Screen_Driver::screen_num(int x, int y)
 
   for (int i = 0; i < num_screens; i ++) {
     int sx, sy, sw, sh;
-    Fl::screen_xywh(sx, sy, sw, sh, i);
+    screen_xywh(sx, sy, sw, sh, i);
     if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) {
       screen = i;
       break;