Rename all remaining functions that don't start with fl_ to

fl_foo. (filename_xyz becomes fl_filename_xyz, down becomes
fl_down, define_FL_PLASTIC_BOX becomes fl_define_FL_PLASTIC_BOX,
etc.)


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

30 files changed, 120 insertions, 120 deletions

diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx
index 7cd87c63d..2a94d21ed 100644
--- a/src/Fl_Button.cxx
+++ b/src/Fl_Button.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Button.cxx,v 1.4.2.6.2.11 2002/03/05 00:46:39 easysw Exp $"
+// "$Id: Fl_Button.cxx,v 1.4.2.6.2.12 2002/03/25 21:08:41 easysw Exp $"
 //
 // Button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -54,7 +54,7 @@ void Fl_Button::draw() {
   if (type() == FL_HIDDEN_BUTTON) return;
   Fl_Color col = value() ? selection_color() : color();
 //if (col == FL_GRAY && Fl::belowmouse()==this) col = FL_LIGHT1;
-  draw_box(value() ? (down_box()?down_box():down(box())) : box(), col);
+  draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(), col);
   draw_label();
   if (Fl::focus() == this) draw_focus();
 }
@@ -149,5 +149,5 @@ Fl_Button::Fl_Button(int x,int y,int w,int h, const char *l)
 }
 
 //
-// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.11 2002/03/05 00:46:39 easysw Exp $".
+// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.12 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx
index b8f4f746b..1872fb34a 100644
--- a/src/Fl_Counter.cxx
+++ b/src/Fl_Counter.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.6 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.7 2002/03/25 21:08:41 easysw Exp $"
 //
 // Counter widget for the Fast Light Tool Kit (FLTK).
 //
@@ -35,7 +35,7 @@ void Fl_Counter::draw() {
   if (boxtype[0] == FL_UP_BOX) boxtype[0] = FL_DOWN_BOX;
   for (i=1; i<5; i++)
     if (mouseobj == i)
-      boxtype[i] = down(box());
+      boxtype[i] = fl_down(box());
     else
       boxtype[i] = box();
 
@@ -188,5 +188,5 @@ Fl_Counter::Fl_Counter(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.6 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.7 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx
index 01f3dd492..f81681214 100644
--- a/src/Fl_File_Browser.cxx
+++ b/src/Fl_File_Browser.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Browser.cxx,v 1.1.2.6 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_File_Browser.cxx,v 1.1.2.7 2002/03/25 21:08:41 easysw Exp $"
 //
 // Fl_File_Browser routines.
 //
@@ -500,9 +500,9 @@ Fl_File_Browser::load(const char *directory)// I - Directory to load
     else if (filename[i] != '/' && filename[i] != '\\')
       strcat(filename, "/");
 
-    num_files = filename_list(filename, &files);
+    num_files = fl_filename_list(filename, &files);
 #else
-    num_files = filename_list(directory_, &files);
+    num_files = fl_filename_list(directory_, &files);
 #endif /* WIN32 || __EMX__ */
 
     if (num_files <= 0)
@@ -516,7 +516,7 @@ Fl_File_Browser::load(const char *directory)// I - Directory to load
 	snprintf(filename, sizeof(filename), "%s/%s", directory_,
 	         files[i]->d_name);
 
-	if (filename_isdir(filename))
+	if (fl_filename_isdir(filename))
 	{
 	  char name[1024]; // Temporary directory name
 
@@ -526,7 +526,7 @@ Fl_File_Browser::load(const char *directory)// I - Directory to load
           insert(num_dirs, name, Fl_File_Icon::find(filename));
 	}
 	else if (filetype_ == FILES &&
-	         filename_match(files[i]->d_name, pattern_))
+	         fl_filename_match(files[i]->d_name, pattern_))
           add(files[i]->d_name, Fl_File_Icon::find(filename));
       }
 
@@ -559,5 +559,5 @@ Fl_File_Browser::filter(const char *pattern)	// I - Pattern string
 
 
 //
-// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.6 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.7 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index c31b280a3..08d7bb2c4 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.6 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.7 2002/03/25 21:08:41 easysw Exp $"
 //
 // More Fl_File_Chooser routines.
 //
@@ -88,7 +88,7 @@ Fl_File_Chooser::directory(const char *d)	// I - Directory to change to
 #else
     if (d[0] != '/' && d[0] != '\\')
 #endif /* WIN32 || __EMX__ */
-      filename_absolute(directory_, d);
+      fl_filename_absolute(directory_, d);
     else
     {
       strncpy(directory_, d, sizeof(directory_) - 1);
@@ -175,7 +175,7 @@ Fl_File_Chooser::count()
       pathname[sizeof(pathname) - 1] = '\0';
     }
 
-    if (filename_isdir(pathname))
+    if (fl_filename_isdir(pathname))
       return (0);
     else
       return (1);
@@ -194,7 +194,7 @@ Fl_File_Chooser::count()
 	pathname[sizeof(pathname) - 1] = '\0';
       }
 
-      if (!filename_isdir(pathname))
+      if (!fl_filename_isdir(pathname))
 	count ++;
     }
 
@@ -244,7 +244,7 @@ Fl_File_Chooser::value(int f)	// I - File number
 	pathname[sizeof(pathname) - 1] = '\0';
       }
 
-      if (!filename_isdir(pathname))
+      if (!fl_filename_isdir(pathname))
       {
         // Nope, see if this this is "the one"...
 	count ++;
@@ -273,7 +273,7 @@ Fl_File_Chooser::value(const char *filename)	// I - Filename + directory
 //  printf("Fl_File_Chooser::value(\"%s\")\n", filename == NULL ? "(null)" : filename);
 
   // See if the filename is actually a directory...
-  if (filename == NULL || !filename[0] || filename_isdir(filename))
+  if (filename == NULL || !filename[0] || fl_filename_isdir(filename))
   {
     // Yes, just change the current directory...
     directory(filename);
@@ -439,9 +439,9 @@ Fl_File_Chooser::fileListCB()
   {
 #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__)
     if ((strlen(pathname) == 2 && pathname[1] == ':') ||
-        filename_isdir(pathname))
+        fl_filename_isdir(pathname))
 #else
-    if (filename_isdir(pathname))
+    if (fl_filename_isdir(pathname))
 #endif /* WIN32 || __EMX__ */
     {
       directory(pathname);
@@ -461,7 +461,7 @@ Fl_File_Chooser::fileListCB()
   {
     fileName->value(filename);
 
-    if (!filename_isdir(pathname) || (type_ & DIRECTORY))
+    if (!fl_filename_isdir(pathname) || (type_ & DIRECTORY))
       okButton->activate();
   }
 }
@@ -554,9 +554,9 @@ Fl_File_Chooser::fileNameCB()
 
 #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__)
     if ((strlen(pathname) == 2 && pathname[1] == ':') ||
-        filename_isdir(pathname))
+        fl_filename_isdir(pathname))
 #else
-    if (filename_isdir(pathname))
+    if (fl_filename_isdir(pathname))
 #endif /* WIN32 || __EMX__ */
       directory(pathname);
     else if ((type_ & CREATE) || access(pathname, 0) == 0)
@@ -698,7 +698,7 @@ Fl_File_Chooser::fileNameCB()
     }
 
     if ((type_ & CREATE || access(pathname, 0) == 0) &&
-        (!filename_isdir(pathname) || type_ & DIRECTORY))
+        (!fl_filename_isdir(pathname) || type_ & DIRECTORY))
       okButton->activate();
     else
       okButton->deactivate();
@@ -707,5 +707,5 @@ Fl_File_Chooser::fileNameCB()
 
 
 //
-// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.6 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.7 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_File_Icon.cxx b/src/Fl_File_Icon.cxx
index e793211a3..66e11ba08 100644
--- a/src/Fl_File_Icon.cxx
+++ b/src/Fl_File_Icon.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Icon.cxx,v 1.1.2.7 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_File_Icon.cxx,v 1.1.2.8 2002/03/25 21:08:41 easysw Exp $"
 //
 // Fl_File_Icon routines.
 //
@@ -220,7 +220,7 @@ Fl_File_Icon::find(const char *filename,// I - Name of file */
   // is found...
   for (current = first_; current != (Fl_File_Icon *)0; current = current->next_)
     if ((current->type_ == filetype || current->type_ == ANY) &&
-        filename_match(filename, current->pattern_))
+        fl_filename_match(filename, current->pattern_))
       break;
 
   // Return the match (if any)...
@@ -466,5 +466,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o,	// I - Label data
 
 
 //
-// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.7 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.8 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_File_Icon2.cxx b/src/Fl_File_Icon2.cxx
index 17190adf4..f1bb7f1bf 100644
--- a/src/Fl_File_Icon2.cxx
+++ b/src/Fl_File_Icon2.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Icon2.cxx,v 1.1.2.12 2002/01/06 17:51:12 easysw Exp $"
+// "$Id: Fl_File_Icon2.cxx,v 1.1.2.13 2002/03/25 21:08:41 easysw Exp $"
 //
 // Fl_File_Icon system icon routines.
 //
@@ -91,7 +91,7 @@ Fl_File_Icon::load(const char *f)	// I - File to read from
   const char	*ext;			// File extension
 
 
-  ext = filename_ext(f);
+  ext = fl_filename_ext(f);
 
   if (ext && strcmp(ext, ".fti") == 0)
     i = load_fti(f);
@@ -758,7 +758,7 @@ load_kde_icons(const char *directory)	// I - Directory to load
 
 
   entries = (dirent **)0;
-  n       = filename_list(directory, &entries);
+  n       = fl_filename_list(directory, &entries);
 
   for (i = 0; i < n; i ++)
   {
@@ -768,7 +768,7 @@ load_kde_icons(const char *directory)	// I - Directory to load
       strcat(full,"/");
       strcat(full, entries[i]->d_name);
 
-      if (filename_isdir(full))
+      if (fl_filename_isdir(full))
 	load_kde_icons(full);
       else
 	load_kde_mimelnk(full);				
@@ -931,5 +931,5 @@ get_kde_val(char       *str,
 
 
 //
-// End of "$Id: Fl_File_Icon2.cxx,v 1.1.2.12 2002/01/06 17:51:12 easysw Exp $".
+// End of "$Id: Fl_File_Icon2.cxx,v 1.1.2.13 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx
index 7eeebb8e0..499dd470d 100644
--- a/src/Fl_Light_Button.cxx
+++ b/src/Fl_Light_Button.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.11 2002/02/15 17:30:29 easysw Exp $"
+// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.12 2002/03/25 21:08:41 easysw Exp $"
 //
 // Lighted button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -35,7 +35,7 @@
 #include <FL/fl_draw.H>
 
 void Fl_Light_Button::draw() {
-  if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
+  if (box()) draw_box(this==Fl::pushed() ? fl_down(box()) : box(), color());
   Fl_Color col = value() ? (active_r() ? selection_color() :
                             fl_inactive(selection_color())) : color();
   int W;
@@ -116,5 +116,5 @@ Fl_Light_Button::Fl_Light_Button(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.11 2002/02/15 17:30:29 easysw Exp $".
+// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.12 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_Return_Button.cxx b/src/Fl_Return_Button.cxx
index 6205445af..ade3bdbff 100644
--- a/src/Fl_Return_Button.cxx
+++ b/src/Fl_Return_Button.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.4 2002/03/25 21:08:41 easysw Exp $"
 //
 // Return button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -47,7 +47,7 @@ int fl_return_arrow(int x, int y, int w, int h) {
 
 void Fl_Return_Button::draw() {
   if (type() == FL_HIDDEN_BUTTON) return;
-  draw_box(value() ? (down_box()?down_box():down(box())) : box(),
+  draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(),
 	   value() ? selection_color() : color());
   int W = h();
   if (w()/3 < W) W = w()/3;
@@ -66,5 +66,5 @@ int Fl_Return_Button::handle(int event) {
 }
 
 //
-// End of "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.4 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_Scrollbar.cxx b/src/Fl_Scrollbar.cxx
index dec81950c..88cf8dd6e 100644
--- a/src/Fl_Scrollbar.cxx
+++ b/src/Fl_Scrollbar.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.7 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.8 2002/03/25 21:08:41 easysw Exp $"
 //
 // Scroll bar widget for the Fast Light Tool Kit (FLTK).
 //
@@ -197,9 +197,9 @@ void Fl_Scrollbar::draw() {
     if (W < 3*H) {Fl_Slider::draw(X,Y,W,H); return;}
     Fl_Slider::draw(X+H,Y,W-2*H,H);
     if (damage()&FL_DAMAGE_ALL) {
-      draw_box((pushed_==1) ? down(slider()) : slider(),
+      draw_box((pushed_==1) ? fl_down(slider()) : slider(),
 	       X, Y, H, H, selection_color());
-      draw_box((pushed_==2) ? down(slider()) : slider(),
+      draw_box((pushed_==2) ? fl_down(slider()) : slider(),
 		  X+W-H, Y, H, H, selection_color());
       if (active_r())
         fl_color(labelcolor());
@@ -216,9 +216,9 @@ void Fl_Scrollbar::draw() {
     if (H < 3*W) {Fl_Slider::draw(X,Y,W,H); return;}
     Fl_Slider::draw(X,Y+W,W,H-2*W);
     if (damage()&FL_DAMAGE_ALL) {
-      draw_box((pushed_==1) ? down(slider()) : slider(),
+      draw_box((pushed_==1) ? fl_down(slider()) : slider(),
 	       X, Y, W, W, selection_color());
-      draw_box((pushed_==2) ? down(slider()) : slider(),
+      draw_box((pushed_==2) ? fl_down(slider()) : slider(),
 	       X, Y+H-W, W, W, selection_color());
       if (active_r())
         fl_color(labelcolor());
@@ -246,5 +246,5 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L)
 }
 
 //
-// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.7 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.8 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index f7affad0e..3587a4c70 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_arg.cxx,v 1.5.2.8.2.6 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $"
 //
 // Optional argument initialization code for the Fast Light Tool Kit (FLTK).
 //
@@ -179,7 +179,7 @@ void Fl_Window::show(int argc, char **argv) {
 
   // set the class, which is used by X version of get_system_colors:
   if (name) {xclass(name); name = 0;}
-  else if (!xclass()) xclass(filename_name(argv[0]));
+  else if (!xclass()) xclass(fl_filename_name(argv[0]));
 
   if (title) {label(title); title = 0;}
   else if (!label()) label(xclass());
@@ -364,5 +364,5 @@ int XParseGeometry(const char* string, int* x, int* y,
 #endif // ifdef WIN32
 
 //
-// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.6 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index d807cc7d4..e19d91011 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_mac.cxx,v 1.1.2.15 2002/03/07 19:22:57 spitzak Exp $"
+// "$Id: Fl_mac.cxx,v 1.1.2.16 2002/03/25 21:08:41 easysw Exp $"
 //
 // MacOS specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -1163,7 +1163,7 @@ void Fl_Window::size_range_() {
 /**
  * returns pointer to the filename, or null if name ends with ':'
  */
-const char *filename_name( const char *name ) 
+const char *fl_filename_name( const char *name ) 
 {
   const char *p, *q;
   for ( p = q = name ; *p ; ) 
@@ -1357,6 +1357,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
 
 
 //
-// End of "$Id: Fl_mac.cxx,v 1.1.2.15 2002/03/07 19:22:57 spitzak Exp $".
+// End of "$Id: Fl_mac.cxx,v 1.1.2.16 2002/03/25 21:08:41 easysw Exp $".
 //
 
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index b399f50f9..ef007331c 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.21 2002/03/25 19:35:13 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.22 2002/03/25 21:08:41 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -1062,10 +1062,10 @@ void Fl_X::set_minmax(LPMINMAXINFO minmax)
 
 ////////////////////////////////////////////////////////////////
 
-#include <FL/filename.H> // need so FL_EXPORT filename_name works
+#include <FL/filename.H> // need so FL_EXPORT fl_filename_name works
 
 // returns pointer to the filename, or null if name ends with '/'
-const char *filename_name(const char *name) {
+const char *fl_filename_name(const char *name) {
   const char *p,*q;
   q = name;
   if (q[0] && q[1]==':') q += 2; // skip leading drive letter
@@ -1079,7 +1079,7 @@ void Fl_Window::label(const char *name,const char *iname) {
   if (shown() && !parent()) {
     if (!name) name = "";
     SetWindowText(i->xid, name);
-    // if (!iname) iname = filename_name(name);
+    // if (!iname) iname = fl_filename_name(name);
     // should do something with iname here...
   }
 }
@@ -1156,5 +1156,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.21 2002/03/25 19:35:13 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.22 2002/03/25 21:08:41 easysw Exp $".
 //
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 593e5156f..c246f9ac5 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.24.2.24.2.14 2002/03/25 02:36:59 easysw Exp $"
+// "$Id: Fl_x.cxx,v 1.24.2.24.2.15 2002/03/25 21:08:42 easysw Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -1147,7 +1147,7 @@ void Fl_Window::size_range_() {
 ////////////////////////////////////////////////////////////////
 
 // returns pointer to the filename, or null if name ends with '/'
-const char *filename_name(const char *name) {
+const char *fl_filename_name(const char *name) {
   const char *p,*q;
   for (p=q=name; *p;) if (*p++ == '/') q = p;
   return q;
@@ -1160,7 +1160,7 @@ void Fl_Window::label(const char *name,const char *iname) {
     if (!name) name = "";
     XChangeProperty(fl_display, i->xid, XA_WM_NAME,
 		    XA_STRING, 8, 0, (uchar*)name, strlen(name));
-    if (!iname) iname = filename_name(name);
+    if (!iname) iname = fl_filename_name(name);
     XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME, 
 		    XA_STRING, 8, 0, (uchar*)iname, strlen(iname));
   }
@@ -1215,5 +1215,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.14 2002/03/25 02:36:59 easysw Exp $".
+// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.15 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx
index d6dee8e0e..1bce5fa9d 100644
--- a/src/filename_absolute.cxx
+++ b/src/filename_absolute.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_absolute.cxx,v 1.5.2.4.2.6 2002/01/22 00:46:09 easysw Exp $"
+// "$Id: filename_absolute.cxx,v 1.5.2.4.2.7 2002/03/25 21:08:42 easysw Exp $"
 //
 // Filename expansion routines for the Fast Light Tool Kit (FLTK).
 //
@@ -49,7 +49,7 @@ inline int isdirsep(char c) {return c=='/' || c=='\\';}
 #define isdirsep(c) ((c)=='/')
 #endif
 
-int filename_absolute(char *to, int tolen, const char *from) {
+int fl_filename_absolute(char *to, int tolen, const char *from) {
   if (isdirsep(*from) || *from == '|'
 #if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__)
       || from[1]==':'
@@ -107,11 +107,11 @@ int filename_absolute(char *to, int tolen, const char *from) {
 }
 
 /*
- * 'filename_relative()' - Make a filename relative to the current working directory.
+ * 'fl_filename_relative()' - Make a filename relative to the current working directory.
  */
 
 int					// O - 0 if no change, 1 if changed
-filename_relative(char       *to,	// O - Relative filename
+fl_filename_relative(char       *to,	// O - Relative filename
                   int        tolen,	// I - Size of "to" buffer
                   const char *from) {	// I - Absolute filename
   const char	*newslash;		// Directory separator
@@ -175,5 +175,5 @@ filename_relative(char       *to,	// O - Relative filename
 
 
 //
-// End of "$Id: filename_absolute.cxx,v 1.5.2.4.2.6 2002/01/22 00:46:09 easysw Exp $".
+// End of "$Id: filename_absolute.cxx,v 1.5.2.4.2.7 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_expand.cxx b/src/filename_expand.cxx
index 3848a2d50..ea0775d15 100644
--- a/src/filename_expand.cxx
+++ b/src/filename_expand.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_expand.cxx,v 1.4.2.4.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $"
 //
 // Filename expansion routines for the Fast Light Tool Kit (FLTK).
 //
@@ -43,7 +43,7 @@ static inline int isdirsep(char c) {return c=='/' || c=='\\';}
 #define isdirsep(c) ((c)=='/')
 #endif
 
-int filename_expand(char *to,int tolen, const char *from) {
+int fl_filename_expand(char *to,int tolen, const char *from) {
 
   char *temp = new char[tolen];
   strncpy(temp,from, tolen - 1);
@@ -106,5 +106,5 @@ int filename_expand(char *to,int tolen, const char *from) {
 
 
 //
-// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_ext.cxx b/src/filename_ext.cxx
index 08670bbaa..609651b54 100644
--- a/src/filename_ext.cxx
+++ b/src/filename_ext.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_ext.cxx,v 1.4.2.4.2.1 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_ext.cxx,v 1.4.2.4.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Filename extension routines for the Fast Light Tool Kit (FLTK).
 //
@@ -27,7 +27,7 @@
 
 #include <FL/filename.H>
 
-const char *filename_ext(const char *buf) {
+const char *fl_filename_ext(const char *buf) {
   const char *q = 0;
   const char *p = buf;
   for (p=buf; *p; p++) {
@@ -41,5 +41,5 @@ const char *filename_ext(const char *buf) {
 }
 
 //
-// End of "$Id: filename_ext.cxx,v 1.4.2.4.2.1 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_ext.cxx,v 1.4.2.4.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_isdir.cxx b/src/filename_isdir.cxx
index 1aa08aa20..8ed6d4e21 100644
--- a/src/filename_isdir.cxx
+++ b/src/filename_isdir.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_isdir.cxx,v 1.4.2.5.2.6 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_isdir.cxx,v 1.4.2.5.2.7 2002/03/25 21:08:42 easysw Exp $"
 //
 // Directory detection routines for the Fast Light Tool Kit (FLTK).
 //
@@ -38,7 +38,7 @@ static inline int isdirsep(char c) {return c=='/' || c=='\\';}
 #define isdirsep(c) ((c)=='/')
 #endif
 
-int filename_isdir(const char* n) {
+int fl_filename_isdir(const char* n) {
   struct stat	s;
 
 #ifdef WIN32
@@ -68,5 +68,5 @@ int filename_isdir(const char* n) {
 }
 
 //
-// End of "$Id: filename_isdir.cxx,v 1.4.2.5.2.6 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_isdir.cxx,v 1.4.2.5.2.7 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_list.cxx b/src/filename_list.cxx
index 1ff1019ff..8856594b7 100644
--- a/src/filename_list.cxx
+++ b/src/filename_list.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_list.cxx,v 1.10.2.11.2.1 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_list.cxx,v 1.10.2.11.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Filename list routines for the Fast Light Tool Kit (FLTK).
 //
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 }
 
-int filename_list(const char *d, dirent ***list) {
+int fl_filename_list(const char *d, dirent ***list) {
 #if defined(__hpux)
   // HP-UX defines the comparison function like this:
   return scandir(d, list, 0, (int(*)(const dirent **, const dirent **))numericsort);
@@ -62,5 +62,5 @@ int filename_list(const char *d, dirent ***list) {
 }
 
 //
-// End of "$Id: filename_list.cxx,v 1.10.2.11.2.1 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_list.cxx,v 1.10.2.11.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_match.cxx b/src/filename_match.cxx
index 25cbd7f47..10153e63c 100644
--- a/src/filename_match.cxx
+++ b/src/filename_match.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_match.cxx,v 1.5.2.4.2.2 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_match.cxx,v 1.5.2.4.2.3 2002/03/25 21:08:42 easysw Exp $"
 //
 // Pattern matching routines for the Fast Light Tool Kit (FLTK).
 //
@@ -27,7 +27,7 @@
 #include <FL/filename.H>
 #include <ctype.h>
 
-int filename_match(const char *s, const char *p) {
+int fl_filename_match(const char *s, const char *p) {
   int matched;
 
   for (;;) {
@@ -39,7 +39,7 @@ int filename_match(const char *s, const char *p) {
 
     case '*' :	// match 0-n of any characters
       if (!*p) return 1; // do trailing * quickly
-      while (!filename_match(s, p)) if (!*s++) return 0;
+      while (!fl_filename_match(s, p)) if (!*s++) return 0;
       return 1;
 
     case '[': {	// match one character in set of form [abc-d] or [^a-b]
@@ -63,7 +63,7 @@ int filename_match(const char *s, const char *p) {
 
     case '{' : // {pattern1|pattern2|pattern3}
     NEXTCASE:
-    if (filename_match(s,p)) return 1;
+    if (fl_filename_match(s,p)) return 1;
     for (matched = 0;;) {
       switch (*p++) {
       case '\\': if (*p) p++; break;
@@ -104,5 +104,5 @@ int filename_match(const char *s, const char *p) {
 }
 
 //
-// End of "$Id: filename_match.cxx,v 1.5.2.4.2.2 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_match.cxx,v 1.5.2.4.2.3 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/filename_setext.cxx b/src/filename_setext.cxx
index 8d6c3b873..6db8bd297 100644
--- a/src/filename_setext.cxx
+++ b/src/filename_setext.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: filename_setext.cxx,v 1.4.2.3.2.2 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $"
 //
 // Filename extension routines for the Fast Light Tool Kit (FLTK).
 //
@@ -30,8 +30,8 @@
 #include <FL/filename.H>
 #include <string.h>
 
-char *filename_setext(char *buf, int buflen, const char *ext) {
-  char *q = (char *)filename_ext(buf);
+char *fl_filename_setext(char *buf, int buflen, const char *ext) {
+  char *q = (char *)fl_filename_ext(buf);
   if (ext) {
     strncpy(q,ext,buflen - (q - buf) - 1);
     buf[buflen - 1] = '\0';
@@ -41,5 +41,5 @@ char *filename_setext(char *buf, int buflen, const char *ext) {
 
 
 //
-// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.2 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_diamond_box.cxx b/src/fl_diamond_box.cxx
index 5fd44ce3d..8621e7247 100644
--- a/src/fl_diamond_box.cxx
+++ b/src/fl_diamond_box.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_diamond_box.cxx,v 1.5.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_diamond_box.cxx,v 1.5.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Diamond box code for the Fast Light Tool Kit (FLTK).
 //
@@ -67,12 +67,12 @@ static void fl_diamond_down_box(int x,int y,int w,int h,Fl_Color bgcolor) {
 }
 
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
-Fl_Boxtype define_FL_DIAMOND_BOX() {
+Fl_Boxtype fl_define_FL_DIAMOND_BOX() {
   fl_internal_boxtype(_FL_DIAMOND_DOWN_BOX, fl_diamond_down_box);
   fl_internal_boxtype(_FL_DIAMOND_UP_BOX,fl_diamond_up_box);
   return _FL_DIAMOND_UP_BOX;
 }
 
 //
-// End of "$Id: fl_diamond_box.cxx,v 1.5.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_diamond_box.cxx,v 1.5.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_engraved_label.cxx b/src/fl_engraved_label.cxx
index 31ade676d..2ea58f0e5 100644
--- a/src/fl_engraved_label.cxx
+++ b/src/fl_engraved_label.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_engraved_label.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_engraved_label.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Engraved label drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -73,19 +73,19 @@ static void fl_embossed_label(
   innards(o, X, Y, W, H, align, data, 7);
 }
 
-Fl_Labeltype define_FL_SHADOW_LABEL() {
+Fl_Labeltype fl_define_FL_SHADOW_LABEL() {
   Fl::set_labeltype(_FL_SHADOW_LABEL, fl_shadow_label, 0);
   return _FL_SHADOW_LABEL;
 }
-Fl_Labeltype define_FL_ENGRAVED_LABEL() {
+Fl_Labeltype fl_define_FL_ENGRAVED_LABEL() {
   Fl::set_labeltype(_FL_ENGRAVED_LABEL, fl_engraved_label, 0);
   return _FL_ENGRAVED_LABEL;
 }
-Fl_Labeltype define_FL_EMBOSSED_LABEL() {
+Fl_Labeltype fl_define_FL_EMBOSSED_LABEL() {
   Fl::set_labeltype(_FL_EMBOSSED_LABEL, fl_embossed_label, 0);
   return _FL_EMBOSSED_LABEL;
 }
 
 //
-// End of "$Id: fl_engraved_label.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_engraved_label.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_file_dir.cxx b/src/fl_file_dir.cxx
index 2e780a296..714d0e7f4 100644
--- a/src/fl_file_dir.cxx
+++ b/src/fl_file_dir.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_file_dir.cxx,v 1.1.2.6 2002/02/13 03:55:10 easysw Exp $"
+// "$Id: fl_file_dir.cxx,v 1.1.2.7 2002/03/25 21:08:42 easysw Exp $"
 //
 // File chooser widget for the Fast Light Tool Kit (FLTK).
 //
@@ -58,7 +58,7 @@ char* fl_file_chooser(const char* message, const char* pat, const char* fname)
           strcmp(pat, fc->filter()))) {
 	// if pattern is different, remove name but leave old directory:
 	char* p = (char *)fc->value();
-	const char* q = filename_name(p);
+	const char* q = fl_filename_name(p);
 	int i;
 
 	if (q == NULL) i = 0;
@@ -81,7 +81,7 @@ char* fl_file_chooser(const char* message, const char* pat, const char* fname)
     Fl::wait();
 
   if (fc->value()) {
-    filename_relative(retname, sizeof(retname), fc->value());
+    fl_filename_relative(retname, sizeof(retname), fc->value());
 
     return retname;
   } else return 0;
@@ -111,7 +111,7 @@ char* fl_dir_chooser(const char* message, const char* fname)
     Fl::wait();
 
   if (fc->value()) {
-    filename_relative(retname, sizeof(retname), fc->value());
+    fl_filename_relative(retname, sizeof(retname), fc->value());
 
     return retname;
   } else return 0;
@@ -119,5 +119,5 @@ char* fl_dir_chooser(const char* message, const char* fname)
 
 
 //
-// End of "$Id: fl_file_dir.cxx,v 1.1.2.6 2002/02/13 03:55:10 easysw Exp $".
+// End of "$Id: fl_file_dir.cxx,v 1.1.2.7 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_oval_box.cxx b/src/fl_oval_box.cxx
index daad43ac2..36edc13c5 100644
--- a/src/fl_oval_box.cxx
+++ b/src/fl_oval_box.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_oval_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_oval_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Oval box drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -51,7 +51,7 @@ static void fl_oval_shadow_box(int x, int y, int w, int h, Fl_Color c) {
 }
 
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
-Fl_Boxtype define_FL_OVAL_BOX() {
+Fl_Boxtype fl_define_FL_OVAL_BOX() {
   fl_internal_boxtype(_FL_OSHADOW_BOX,fl_oval_shadow_box);
   fl_internal_boxtype(_FL_OVAL_FRAME,fl_oval_frame);
   fl_internal_boxtype(_FL_OFLAT_BOX,fl_oval_flat_box);
@@ -60,5 +60,5 @@ Fl_Boxtype define_FL_OVAL_BOX() {
 }
 
 //
-// End of "$Id: fl_oval_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_oval_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx
index 07ff4a8c3..c2311165b 100644
--- a/src/fl_plastic.cxx
+++ b/src/fl_plastic.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_plastic.cxx,v 1.1.2.9 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $"
 //
 // "Plastic" drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -162,7 +162,7 @@ static void down_box(int x, int y, int w, int h, Fl_Color c) {
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
 
 
-Fl_Boxtype define_FL_PLASTIC_UP_BOX() {
+Fl_Boxtype fl_define_FL_PLASTIC_UP_BOX() {
   fl_internal_boxtype(_FL_PLASTIC_UP_BOX, up_box);
   fl_internal_boxtype(_FL_PLASTIC_DOWN_BOX, down_box);
   fl_internal_boxtype(_FL_PLASTIC_UP_FRAME, up_frame);
@@ -173,5 +173,5 @@ Fl_Boxtype define_FL_PLASTIC_UP_BOX() {
 
 
 //
-// End of "$Id: fl_plastic.cxx,v 1.1.2.9 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_round_box.cxx b/src/fl_round_box.cxx
index f1927f9a4..f020200ad 100644
--- a/src/fl_round_box.cxx
+++ b/src/fl_round_box.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_round_box.cxx,v 1.6.2.3.2.2 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_round_box.cxx,v 1.6.2.3.2.3 2002/03/25 21:08:42 easysw Exp $"
 //
 // Round box drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -109,12 +109,12 @@ void fl_round_up_box(int x, int y, int w, int h, Fl_Color bgcolor) {
 }
 
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
-Fl_Boxtype define_FL_ROUND_UP_BOX() {
+Fl_Boxtype fl_define_FL_ROUND_UP_BOX() {
   fl_internal_boxtype(_FL_ROUND_DOWN_BOX, fl_round_down_box);
   fl_internal_boxtype(_FL_ROUND_UP_BOX, fl_round_up_box);
   return _FL_ROUND_UP_BOX;
 }
 
 //
-// End of "$Id: fl_round_box.cxx,v 1.6.2.3.2.2 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_round_box.cxx,v 1.6.2.3.2.3 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_rounded_box.cxx b/src/fl_rounded_box.cxx
index 1b5af13b9..79330eded 100644
--- a/src/fl_rounded_box.cxx
+++ b/src/fl_rounded_box.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_rounded_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_rounded_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Rounded box drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -76,22 +76,22 @@ static void fl_rshadow_box(int x, int y, int w, int h, Fl_Color c) {
 
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
 
-Fl_Boxtype define_FL_ROUNDED_BOX() {
+Fl_Boxtype fl_define_FL_ROUNDED_BOX() {
   fl_internal_boxtype(_FL_ROUNDED_FRAME, fl_rounded_frame);
   fl_internal_boxtype(_FL_ROUNDED_BOX, fl_rounded_box);
   return _FL_ROUNDED_BOX;
 }
 
-Fl_Boxtype define_FL_RFLAT_BOX() {
+Fl_Boxtype fl_define_FL_RFLAT_BOX() {
   fl_internal_boxtype(_FL_RFLAT_BOX, fl_rflat_box);
   return _FL_RFLAT_BOX;
 }
 
-Fl_Boxtype define_FL_RSHADOW_BOX() {
+Fl_Boxtype fl_define_FL_RSHADOW_BOX() {
   fl_internal_boxtype(_FL_RSHADOW_BOX, fl_rshadow_box);
   return _FL_RSHADOW_BOX;
 }
 
 //
-// End of "$Id: fl_rounded_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_rounded_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/fl_shadow_box.cxx b/src/fl_shadow_box.cxx
index 279703ae7..167e7c161 100644
--- a/src/fl_shadow_box.cxx
+++ b/src/fl_shadow_box.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_shadow_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_shadow_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Shadow box drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -43,12 +43,12 @@ static void fl_shadow_box(int x, int y, int w, int h, Fl_Color c) {
 }
 
 extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*);
-Fl_Boxtype define_FL_SHADOW_BOX() {
+Fl_Boxtype fl_define_FL_SHADOW_BOX() {
   fl_internal_boxtype(_FL_SHADOW_FRAME, fl_shadow_frame);
   fl_internal_boxtype(_FL_SHADOW_BOX, fl_shadow_box);
   return _FL_SHADOW_BOX;
 }
 
 //
-// End of "$Id: fl_shadow_box.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_shadow_box.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/forms_fselect.cxx b/src/forms_fselect.cxx
index 1261b9a76..99c2ce397 100644
--- a/src/forms_fselect.cxx
+++ b/src/forms_fselect.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: forms_fselect.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: forms_fselect.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $"
 //
 // Forms file selection routines for the Fast Light Tool Kit (FLTK).
 //
@@ -47,7 +47,7 @@ char* fl_show_file_selector(const char *message,const char *dir,
   const char *q = fl_file_chooser(message,fl_pattern,fl_directory);
   if (!q) return 0;
   strcpy(fl_directory, q);
-  p = (char *)filename_name(fl_directory);
+  p = (char *)fl_filename_name(fl_directory);
   strcpy(fl_filename, p);
   if (p > fl_directory+1) p--;
   *p = 0;
@@ -61,5 +61,5 @@ char*	fl_get_pattern() {return (char *)fl_pattern;}
 char*	fl_get_filename() {return fl_filename;}
 
 //
-// End of "$Id: forms_fselect.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: forms_fselect.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $".
 //
diff --git a/src/makedepend b/src/makedepend
index 1c3559b2c..bf67e02dc 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -299,7 +299,7 @@ fl_ask.o: ../FL/Fl_Export.H ../FL/fl_ask.H ../FL/Fl_Box.H ../FL/Fl_Widget.H
 fl_ask.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 fl_ask.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Input.H
 fl_ask.o: ../FL/Fl_Input_.H ../FL/Fl_Secret_Input.H ../FL/Fl_Input.H
-fl_ask.o: ../FL/x.H ../FL/Fl_Window.H
+fl_ask.o: ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H
 fl_boxtype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_boxtype.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../config.h
 fl_color.o: Fl_XColor.H ../config.h ../FL/Enumerations.H ../FL/Fl_Export.H