Remove fl_wait() that is not part of the public API.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11953 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 3 insertions, 7 deletions

diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H
index 234f429d7..8f3638718 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.H
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.H
@@ -43,6 +43,7 @@ protected:
   FLScreenInfo screens[MAX_SCREENS];
   float dpi[MAX_SCREENS][2];
   int poll_or_select();
+  int poll_or_select_with_delay(double time_to_wait);
 
 public:
   static int ewmh_supported();
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 9cda68eb5..05280cd79 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -48,11 +48,6 @@
 extern Atom fl_NET_WORKAREA;
 extern XIC fl_xim_ic; // in Fl_x.cxx
 
-// Add these externs to allow X11 port to build - same as Fl_WinAPI_Screen_Driver.cxx.
-// These should be in an internal header somewhere?
-// AlbrechtS (Comment by Ian, modified...)
-extern int fl_wait(double time); // in Fl_x.cxx
-
 // these are set by Fl::args() and override any system colors: from Fl_get_system_colors.cxx
 extern const char *fl_fg;
 extern const char *fl_bg;
@@ -464,7 +459,7 @@ double Fl_X11_Screen_Driver::wait(double time_to_wait)
     time_to_wait = first_timeout->time;
   if (time_to_wait <= 0.0) {
     // do flush second so that the results of events are visible:
-    int ret = fl_wait(0.0);
+    int ret = this->poll_or_select_with_delay(0.0);
     Fl::flush();
     return ret;
   } else {
@@ -472,7 +467,7 @@ double Fl_X11_Screen_Driver::wait(double time_to_wait)
     Fl::flush();
     if (Fl::idle && !in_idle) // 'idle' may have been set within flush()
       time_to_wait = 0.0;
-    return fl_wait(time_to_wait);
+    return this->poll_or_select_with_delay(time_to_wait);
   }
 }