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

CHANGES

@@ -1,11 +1,17 @@
 CHANGES IN FLTK 1.1.0b12
 
+	- Documentation updates.
+	- Renamed down() and frame() to fl_down() and
+	  fl_frame(), filename_xyz() to fl_filename_xyz(), and
+	  all of the define_FL_FOO() functions for the custom
+	  boxtypes to fl_define_FL_FOO() to avoid namespace
+	  clashes.
 	- Stereo OpenGL support (patch from Stuart Levy)
 	- All of the convenience functions defined in fl_ask.H
 	  now resize the widgets and dialog window as needed for
 	  the labels and prompt.
-	- Backported FLTK 2.0 dual cut/paste buffer.
-	- Added support for Xft library to support anti-aliased
+	- Backported FLTK 2.0 dual cut/paste buffer code.
+	- Added support for Xft library to provide anti-aliased
 	  text on X11.
 	- Fl_Help_View didn't keep track of the background color
 	  of cells properly.

FL/Enumerations.H

@@ -1,5 +1,5 @@
 //
-// "$Id: Enumerations.H,v 1.18.2.14.2.20 2002/03/25 16:41:01 easysw Exp $"
+// "$Id: Enumerations.H,v 1.18.2.14.2.21 2002/03/25 21:08:41 easysw Exp $"
 //
 // Enumerations for the Fast Light Tool Kit (FLTK).
 //
@@ -167,37 +167,37 @@ enum Fl_Boxtype { // boxtypes (if you change these you must fix fl_boxtype.C):
   _FL_PLASTIC_UP_FRAME,	_FL_PLASTIC_DOWN_FRAME,
   FL_FREE_BOXTYPE
 };
-extern FL_EXPORT Fl_Boxtype define_FL_ROUND_UP_BOX();
-#define FL_ROUND_UP_BOX define_FL_ROUND_UP_BOX()
-#define FL_ROUND_DOWN_BOX (Fl_Boxtype)(define_FL_ROUND_UP_BOX()+1)
-extern FL_EXPORT Fl_Boxtype define_FL_SHADOW_BOX();
-#define FL_SHADOW_BOX define_FL_SHADOW_BOX()
-#define FL_SHADOW_FRAME (Fl_Boxtype)(define_FL_SHADOW_BOX()+2)
-extern FL_EXPORT Fl_Boxtype define_FL_ROUNDED_BOX();
-#define FL_ROUNDED_BOX define_FL_ROUNDED_BOX()
-#define FL_ROUNDED_FRAME (Fl_Boxtype)(define_FL_ROUNDED_BOX()+2)
-extern FL_EXPORT Fl_Boxtype define_FL_RFLAT_BOX();
-#define FL_RFLAT_BOX define_FL_RFLAT_BOX()
-extern FL_EXPORT Fl_Boxtype define_FL_RSHADOW_BOX();
-#define FL_RSHADOW_BOX define_FL_RSHADOW_BOX()
-extern FL_EXPORT Fl_Boxtype define_FL_DIAMOND_BOX();
-#define FL_DIAMOND_UP_BOX define_FL_DIAMOND_BOX()
-#define FL_DIAMOND_DOWN_BOX (Fl_Boxtype)(define_FL_DIAMOND_BOX()+1)
-extern FL_EXPORT Fl_Boxtype define_FL_OVAL_BOX();
-#define FL_OVAL_BOX define_FL_OVAL_BOX()
-#define FL_OSHADOW_BOX (Fl_Boxtype)(define_FL_OVAL_BOX()+1)
-#define FL_OVAL_FRAME (Fl_Boxtype)(define_FL_OVAL_BOX()+2)
-#define FL_OFLAT_BOX (Fl_Boxtype)(define_FL_OVAL_BOX()+3)
-
-extern FL_EXPORT Fl_Boxtype define_FL_PLASTIC_UP_BOX();
-#define FL_PLASTIC_UP_BOX define_FL_PLASTIC_UP_BOX()
-#define FL_PLASTIC_DOWN_BOX (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+1)
-#define FL_PLASTIC_UP_FRAME (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+2)
-#define FL_PLASTIC_DOWN_FRAME (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+3)
+extern FL_EXPORT Fl_Boxtype fl_define_FL_ROUND_UP_BOX();
+#define FL_ROUND_UP_BOX fl_define_FL_ROUND_UP_BOX()
+#define FL_ROUND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_ROUND_UP_BOX()+1)
+extern FL_EXPORT Fl_Boxtype fl_define_FL_SHADOW_BOX();
+#define FL_SHADOW_BOX fl_define_FL_SHADOW_BOX()
+#define FL_SHADOW_FRAME (Fl_Boxtype)(fl_define_FL_SHADOW_BOX()+2)
+extern FL_EXPORT Fl_Boxtype fl_define_FL_ROUNDED_BOX();
+#define FL_ROUNDED_BOX fl_define_FL_ROUNDED_BOX()
+#define FL_ROUNDED_FRAME (Fl_Boxtype)(fl_define_FL_ROUNDED_BOX()+2)
+extern FL_EXPORT Fl_Boxtype fl_define_FL_RFLAT_BOX();
+#define FL_RFLAT_BOX fl_define_FL_RFLAT_BOX()
+extern FL_EXPORT Fl_Boxtype fl_define_FL_RSHADOW_BOX();
+#define FL_RSHADOW_BOX fl_define_FL_RSHADOW_BOX()
+extern FL_EXPORT Fl_Boxtype fl_define_FL_DIAMOND_BOX();
+#define FL_DIAMOND_UP_BOX fl_define_FL_DIAMOND_BOX()
+#define FL_DIAMOND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_DIAMOND_BOX()+1)
+extern FL_EXPORT Fl_Boxtype fl_define_FL_OVAL_BOX();
+#define FL_OVAL_BOX fl_define_FL_OVAL_BOX()
+#define FL_OSHADOW_BOX (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+1)
+#define FL_OVAL_FRAME (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+2)
+#define FL_OFLAT_BOX (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+3)
+
+extern FL_EXPORT Fl_Boxtype fl_define_FL_PLASTIC_UP_BOX();
+#define FL_PLASTIC_UP_BOX fl_define_FL_PLASTIC_UP_BOX()
+#define FL_PLASTIC_DOWN_BOX (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+1)
+#define FL_PLASTIC_UP_FRAME (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+2)
+#define FL_PLASTIC_DOWN_FRAME (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+3)
 
 // conversions of box types to other boxtypes:
-inline Fl_Boxtype down(Fl_Boxtype b) {return (Fl_Boxtype)(b|1);}
-inline Fl_Boxtype frame(Fl_Boxtype b) {return (Fl_Boxtype)(b|2);}
+inline Fl_Boxtype fl_down(Fl_Boxtype b) {return (Fl_Boxtype)(b|1);}
+inline Fl_Boxtype fl_frame(Fl_Boxtype b) {return (Fl_Boxtype)(b|2);}
 
 // back-compatability box types:
 #define FL_FRAME FL_ENGRAVED_FRAME
@@ -217,12 +217,12 @@ enum Fl_Labeltype {	// labeltypes:
   FL_FREE_LABELTYPE
 };
 #define FL_SYMBOL_LABEL FL_NORMAL_LABEL
-extern Fl_Labeltype FL_EXPORT define_FL_SHADOW_LABEL();
-#define FL_SHADOW_LABEL define_FL_SHADOW_LABEL()
-extern Fl_Labeltype FL_EXPORT define_FL_ENGRAVED_LABEL();
-#define FL_ENGRAVED_LABEL define_FL_ENGRAVED_LABEL()
-extern Fl_Labeltype FL_EXPORT define_FL_EMBOSSED_LABEL();
-#define FL_EMBOSSED_LABEL define_FL_EMBOSSED_LABEL()
+extern Fl_Labeltype FL_EXPORT fl_define_FL_SHADOW_LABEL();
+#define FL_SHADOW_LABEL fl_define_FL_SHADOW_LABEL()
+extern Fl_Labeltype FL_EXPORT fl_define_FL_ENGRAVED_LABEL();
+#define FL_ENGRAVED_LABEL fl_define_FL_ENGRAVED_LABEL()
+extern Fl_Labeltype FL_EXPORT fl_define_FL_EMBOSSED_LABEL();
+#define FL_EMBOSSED_LABEL fl_define_FL_EMBOSSED_LABEL()
 
 enum Fl_Align {	// align() values
   FL_ALIGN_CENTER		= 0,
@@ -378,5 +378,5 @@ enum Fl_Damage {
 #endif
 
 //
-// End of "$Id: Enumerations.H,v 1.18.2.14.2.20 2002/03/25 16:41:01 easysw Exp $".
+// End of "$Id: Enumerations.H,v 1.18.2.14.2.21 2002/03/25 21:08:41 easysw Exp $".
 //

FL/filename.H

@@ -1,5 +1,5 @@
 //
-// "$Id: filename.H,v 1.11.2.4.2.4 2002/01/01 15:11:28 easysw Exp $"
+// "$Id: filename.H,v 1.11.2.4.2.5 2002/03/25 21:08:41 easysw Exp $"
 //
 // Filename header file for the Fast Light Tool Kit (FLTK).
 //
@@ -30,21 +30,21 @@
 
 #  define FL_PATH_MAX 256 // all buffers are this length
 
-FL_EXPORT const char *filename_name(const char *); // return pointer to name
-FL_EXPORT const char *filename_ext(const char *); // return pointer to .ext
-FL_EXPORT char *filename_setext(char *to, int tolen, const char *ext); // clobber .ext
-FL_EXPORT int filename_expand(char *to, int tolen, const char *from); // do $x and ~x
-FL_EXPORT int filename_absolute(char *to, int tolen, const char *from); // prepend getcwd()
-FL_EXPORT int filename_relative(char *to, int tolen, const char *from); // make local to getcwd()
-FL_EXPORT int filename_match(const char *name, const char *pattern); // glob match
-FL_EXPORT int filename_isdir(const char *name);
+FL_EXPORT const char *fl_filename_name(const char *); // return pointer to name
+FL_EXPORT const char *fl_filename_ext(const char *); // return pointer to .ext
+FL_EXPORT char *fl_filename_setext(char *to, int tolen, const char *ext); // clobber .ext
+FL_EXPORT int fl_filename_expand(char *to, int tolen, const char *from); // do $x and ~x
+FL_EXPORT int fl_filename_absolute(char *to, int tolen, const char *from); // prepend getcwd()
+FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from); // make local to getcwd()
+FL_EXPORT int fl_filename_match(const char *name, const char *pattern); // glob match
+FL_EXPORT int fl_filename_isdir(const char *name);
 
 #  ifdef __cplusplus
 // Under WIN32, we include filename.H from numericsort.c; this should probably change
-inline char *filename_setext(char *to, const char *ext) { return filename_setext(to, FL_PATH_MAX, ext); }
-inline int filename_expand(char *to, const char *from) { return filename_expand(to, FL_PATH_MAX, from); }
-inline int filename_absolute(char *to, const char *from) { return filename_absolute(to, FL_PATH_MAX, from); }
-inline int filename_relative(char *to, const char *from) { return filename_relative(to, FL_PATH_MAX, from); }
+inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); }
+inline int fl_filename_expand(char *to, const char *from) { return fl_filename_expand(to, FL_PATH_MAX, from); }
+inline int fl_filename_absolute(char *to, const char *from) { return fl_filename_absolute(to, FL_PATH_MAX, from); }
+inline int fl_filename_relative(char *to, const char *from) { return fl_filename_relative(to, FL_PATH_MAX, from); }
 #  endif // __cplusplus
 
 
@@ -69,10 +69,10 @@ struct dirent {char d_name[1];};
 
 #  endif
 
-FL_EXPORT int filename_list(const char *d, struct dirent ***list);
+FL_EXPORT int fl_filename_list(const char *d, struct dirent ***list);
 
 #endif
 
 //
-// End of "$Id: filename.H,v 1.11.2.4.2.4 2002/01/01 15:11:28 easysw Exp $".
+// End of "$Id: filename.H,v 1.11.2.4.2.5 2002/03/25 21:08:41 easysw Exp $".
 //

FL/forms.H

@@ -1,5 +1,5 @@
 //
-// "$Id: forms.H,v 1.7.2.7.2.3 2002/01/01 15:11:28 easysw Exp $"
+// "$Id: forms.H,v 1.7.2.7.2.4 2002/03/25 21:08:41 easysw Exp $"
 //
 // Forms emulation header file for the Fast Light Tool Kit (FLTK).
 //
@@ -669,7 +669,7 @@ inline int fl_show_choices(const char* c,int n,const char* b1,const char* b2,
 
 #include "filename.H"
 #include "Fl_File_Chooser.H"
-inline int do_matching(char* a, const char* b) {return filename_match(a,b);}
+inline int do_matching(char* a, const char* b) {return fl_filename_match(a,b);}
 
 // Forms-compatable file chooser (implementation in fselect.C):
 FL_EXPORT char* fl_show_file_selector(const char* message,const char* dir,
@@ -838,5 +838,5 @@ inline void fl_draw() {Fl::flush();}
 #endif	/* define __FORMS_H__ */
 
 //
-// End of "$Id: forms.H,v 1.7.2.7.2.3 2002/01/01 15:11:28 easysw Exp $".
+// End of "$Id: forms.H,v 1.7.2.7.2.4 2002/03/25 21:08:41 easysw Exp $".
 //

documentation/Fl_File_Browser.html

@@ -56,8 +56,10 @@ <H4><A NAME="Fl_File_Browser.iconsize">void iconsize(uchar s)<BR>
 <H4><A NAME="Fl_File_Browser.filter">void filter(const char *pattern)<BR>
 const char *filter() const</A></H4>
 
-<P>Sets or gets the filename filter. The pattern matching uses the
-<CODE>filename_match()</CODE> function in FLTK.
+<P>Sets or gets the filename filter. The pattern matching uses
+the <A
+HREF="functions.html#fl_filename_match"><CODE>fl_filename_match()</CODE></A>
+function in FLTK.
 
 <H4><A NAME="Fl_File_Browser.filetype">void filetype(int type)<BR>
 int filetype() const</A></H4>

documentation/Fl_File_Chooser.html

@@ -59,9 +59,11 @@ <H4><A NAME="Fl_File_Chooser.Fl_File_Chooser">Fl_File_Chooser(const char *pathna
 complete file name (in which case the corresponding file is highlighted
 in the list and in the filename input field.)
 
-<P>The <CODE>pattern</CODE> argument can be a <CODE>NULL</CODE> string or
-<CODE>"*"</CODE> to list all files. See the FLTK documentation on
-<CODE>filename_match()</CODE> for other kinds of patterns.
+<P>The <CODE>pattern</CODE> argument can be a <CODE>NULL</CODE>
+string or <CODE>"*"</CODE> to list all files. See the FLTK
+documentation on <A
+HREF="functions.html#fl_filename_match"><CODE>fl_filename_match()</CODE></A>
+for other kinds of patterns.
 
 <P>The <CODE>type</CODE> argument can be one of the following:
 

documentation/functions.html

@@ -128,8 +128,8 @@ <h3><A name=fl_file_chooser>char *fl_file_chooser(const char * message,
 <P><tt>message</tt> is a string used to title the window.
 
 <P><tt>pattern</tt> is used to limit the files listed in a directory to
-those matching the pattern.  This matching is done by <A href=#filename_match>
-<tt>filename_match()</tt></A>.  Use <tt>NULL</tt> to show all files.
+those matching the pattern.  This matching is done by <A href=#fl_filename_match>
+<tt>fl_filename_match()</tt></A>.  Use <tt>NULL</tt> to show all files.
 
 <P><tt>fname</tt> is a default filename to fill in the chooser with.
 If this is <tt>NULL</tt> then the last filename that was choosen is
@@ -148,7 +148,7 @@ <h3><A name=fl_file_chooser_callback>void fl_file_chooser_callback(void
 contents of the file.  It has to be reasonably fast, and cannot create
 FLTK windows.
 
-<h3><A name=filename_list>int filename_list(const char *d, dirent
+<h3><A name=fl_filename_list>int fl_filename_list(const char *d, dirent
 ***list)</A></h3>
 
 This is a portable and const-correct wrapper for the
@@ -169,27 +169,27 @@ <h3><A name=filename_list>int filename_list(const char *d, dirent
 <ul><pre>for (int i = return_value; i &gt; 0;) free((void*)(list[--i]));
 free((void*)list);</pre></ul>
 
-<h3><A name=filename_isdir>int filename_isdir(const char *f)</A></h3>
+<h3><A name=fl_filename_isdir>int fl_filename_isdir(const char *f)</A></h3>
 
 Returns non-zero if the file exists and is a directory.
 
-<h3><A name=filename_name>const char *filename_name(const char *f)</A></h3>
+<h3><A name=fl_filename_name>const char *fl_filename_name(const char *f)</A></h3>
 
 Returns a pointer to the character after the last slash, or to the
 start of the filename if there is none.
 
-<h3><A name=filename_ext>const char *filename_ext(const char *f)</A></h3>
+<h3><A name=fl_filename_ext>const char *fl_filename_ext(const char *f)</A></h3>
 
-Returns a pointer to the last period in <tt>filename_name(f)</tt>, or
+Returns a pointer to the last period in <tt>fl_filename_name(f)</tt>, or
 a pointer to the trailing nul if none.
 
-<h3><A name=filename_setext>char *filename_setext(char *f, const char
+<h3><A name=fl_filename_setext>char *fl_filename_setext(char *f, const char
 *ext)</A></h3>
 
-Does <tt>strcpy(filename_ext(f), ext ? ext : &quot;&quot;)</tt>.  Returns a
+Does <tt>strcpy(fl_filename_ext(f), ext ? ext : &quot;&quot;)</tt>.  Returns a
 pointer to <tt>f</tt>.
 
-<h3><A name=filename_expand>int filename_expand(char *out, const char
+<h3><A name=fl_filename_expand>int fl_filename_expand(char *out, const char
 *in)</A></h3>
 
 Splits <tt>in</tt> at each slash character.  Replaces any occurrance
@@ -203,7 +203,7 @@ <h3><A name=filename_expand>int filename_expand(char *out, const char
 true retro programming style, it is up to you to provide a buffer big
 enough for the result.  1024 characters should be enough.</I>
 
-<h3><A name=filename_absolute>int filename_absolute(char *out, const
+<h3><A name=fl_filename_absolute>int fl_filename_absolute(char *out, const
 char *in)</A></h3>
 
 If <tt>in</tt> does not start with a slash, this prepends the current
@@ -214,7 +214,7 @@ <h3><A name=filename_absolute>int filename_absolute(char *out, const
 to provide a buffer big enough for the result.  1024 characters should
 be enough.</I>
 
-<h3><A name=filename_match>int filename_match(const char *f, const char
+<h3><A name=fl_filename_match>int fl_filename_match(const char *f, const char
 *pattern)</A></h3>
 
 Returns true if <tt>f</tt> matches <tt>pattern</tt>.  The following

documentation/migration.html

@@ -29,6 +29,67 @@ <H2>File Chooser</H2>
 HREF="Fl_File_Chooser.html"><TT>Fl_File_Chooser</TT></A>
 class.</P>
 
+<H2>Function Names</H2>
+
+<P>Some function names have changed from FLTK 1.0.x to 1.1.x in
+order to avoid name space collisions. The following table shows
+the old and new function names:</P>
+
+<CENTER><TABLE WIDTH="80%" BORDER="1">
+<TR>
+	<TH>Old 1.0.x Name</TH>
+	<TH>New 1.1.x Name</TH>
+</TR>
+<TR>
+	<TD>contrast()</TD>
+	<TD>fl_contrast()</TD>
+</TR>
+<TR>
+	<TD>down()</TD>
+	<TD>fl_down()</TD>
+</TR>
+<TR>
+	<TD>filename_absolute()</TD>
+	<TD>fl_filename_absolute()</TD>
+</TR>
+<TR>
+	<TD>filename_expand()</TD>
+	<TD>fl_filename_expand()</TD>
+</TR>
+<TR>
+	<TD>filename_ext()</TD>
+	<TD>fl_filename_ext()</TD>
+</TR>
+<TR>
+	<TD>filename_isdir()</TD>
+	<TD>fl_filename_isdir()</TD>
+</TR>
+<TR>
+	<TD>filename_list()</TD>
+	<TD>fl_filename_list()</TD>
+</TR>
+<TR>
+	<TD>filename_match()</TD>
+	<TD>fl_filename_match()</TD>
+</TR>
+<TR>
+	<TD>filename_name()</TD>
+	<TD>fl_filename_name()</TD>
+</TR>
+<TR>
+	<TD>filename_relative()</TD>
+	<TD>fl_filename_relative()</TD>
+</TR>
+<TR>
+	<TD>frame()</TD>
+	<TD>fl_frame()</TD>
+</TR>
+<TR>
+	<TD>inactive()</TD>
+	<TD>fl_inactive()</TD>
+</TR>
+</TABLE></CENTER>
+
 <H2>Image Support</H2>
 
 <P>Image support in FLTK has been significantly revamped in