Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-30 21:25:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael R Sweet
2002-03-25 21:08:42 +00:00
parent d7f353ddd1
commit 6c796f88c7
42 changed files with 297 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+8 -2
View File
@@ -1,11 +1,17 @@
CHANGES IN FLTK 1.1.0b12 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) - Stereo OpenGL support (patch from Stuart Levy)
- All of the convenience functions defined in fl_ask.H - All of the convenience functions defined in fl_ask.H
now resize the widgets and dialog window as needed for now resize the widgets and dialog window as needed for
the labels and prompt. the labels and prompt.
- Backported FLTK 2.0 dual cut/paste buffer. - Backported FLTK 2.0 dual cut/paste buffer code.
- Added support for Xft library to support anti-aliased - Added support for Xft library to provide anti-aliased
text on X11. text on X11.
- Fl_Help_View didn't keep track of the background color - Fl_Help_View didn't keep track of the background color
of cells properly. of cells properly.
FL/Enumerations.H
+36 -36
View File
@@ -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). // 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_PLASTIC_UP_FRAME, _FL_PLASTIC_DOWN_FRAME,
FL_FREE_BOXTYPE FL_FREE_BOXTYPE
}; };
extern FL_EXPORT Fl_Boxtype define_FL_ROUND_UP_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_ROUND_UP_BOX();
#define FL_ROUND_UP_BOX define_FL_ROUND_UP_BOX() #define FL_ROUND_UP_BOX fl_define_FL_ROUND_UP_BOX()
#define FL_ROUND_DOWN_BOX (Fl_Boxtype)(define_FL_ROUND_UP_BOX()+1) #define FL_ROUND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_ROUND_UP_BOX()+1)
extern FL_EXPORT Fl_Boxtype define_FL_SHADOW_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_SHADOW_BOX();
#define FL_SHADOW_BOX define_FL_SHADOW_BOX() #define FL_SHADOW_BOX fl_define_FL_SHADOW_BOX()
#define FL_SHADOW_FRAME (Fl_Boxtype)(define_FL_SHADOW_BOX()+2) #define FL_SHADOW_FRAME (Fl_Boxtype)(fl_define_FL_SHADOW_BOX()+2)
extern FL_EXPORT Fl_Boxtype define_FL_ROUNDED_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_ROUNDED_BOX();
#define FL_ROUNDED_BOX define_FL_ROUNDED_BOX() #define FL_ROUNDED_BOX fl_define_FL_ROUNDED_BOX()
#define FL_ROUNDED_FRAME (Fl_Boxtype)(define_FL_ROUNDED_BOX()+2) #define FL_ROUNDED_FRAME (Fl_Boxtype)(fl_define_FL_ROUNDED_BOX()+2)
extern FL_EXPORT Fl_Boxtype define_FL_RFLAT_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_RFLAT_BOX();
#define FL_RFLAT_BOX define_FL_RFLAT_BOX() #define FL_RFLAT_BOX fl_define_FL_RFLAT_BOX()
extern FL_EXPORT Fl_Boxtype define_FL_RSHADOW_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_RSHADOW_BOX();
#define FL_RSHADOW_BOX define_FL_RSHADOW_BOX() #define FL_RSHADOW_BOX fl_define_FL_RSHADOW_BOX()
extern FL_EXPORT Fl_Boxtype define_FL_DIAMOND_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_DIAMOND_BOX();
#define FL_DIAMOND_UP_BOX define_FL_DIAMOND_BOX() #define FL_DIAMOND_UP_BOX fl_define_FL_DIAMOND_BOX()
#define FL_DIAMOND_DOWN_BOX (Fl_Boxtype)(define_FL_DIAMOND_BOX()+1) #define FL_DIAMOND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_DIAMOND_BOX()+1)
extern FL_EXPORT Fl_Boxtype define_FL_OVAL_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_OVAL_BOX();
#define FL_OVAL_BOX define_FL_OVAL_BOX() #define FL_OVAL_BOX fl_define_FL_OVAL_BOX()
#define FL_OSHADOW_BOX (Fl_Boxtype)(define_FL_OVAL_BOX()+1) #define FL_OSHADOW_BOX (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+1)
#define FL_OVAL_FRAME (Fl_Boxtype)(define_FL_OVAL_BOX()+2) #define FL_OVAL_FRAME (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+2)
#define FL_OFLAT_BOX (Fl_Boxtype)(define_FL_OVAL_BOX()+3) #define FL_OFLAT_BOX (Fl_Boxtype)(fl_define_FL_OVAL_BOX()+3)
extern FL_EXPORT Fl_Boxtype define_FL_PLASTIC_UP_BOX(); extern FL_EXPORT Fl_Boxtype fl_define_FL_PLASTIC_UP_BOX();
#define FL_PLASTIC_UP_BOX define_FL_PLASTIC_UP_BOX() #define FL_PLASTIC_UP_BOX fl_define_FL_PLASTIC_UP_BOX()
#define FL_PLASTIC_DOWN_BOX (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+1) #define FL_PLASTIC_DOWN_BOX (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+1)
#define FL_PLASTIC_UP_FRAME (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+2) #define FL_PLASTIC_UP_FRAME (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+2)
#define FL_PLASTIC_DOWN_FRAME (Fl_Boxtype)(define_FL_PLASTIC_UP_BOX()+3) #define FL_PLASTIC_DOWN_FRAME (Fl_Boxtype)(fl_define_FL_PLASTIC_UP_BOX()+3)
// conversions of box types to other boxtypes: // conversions of box types to other boxtypes:
inline Fl_Boxtype down(Fl_Boxtype b) {return (Fl_Boxtype)(b|1);} inline Fl_Boxtype fl_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_frame(Fl_Boxtype b) {return (Fl_Boxtype)(b|2);}
// back-compatability box types: // back-compatability box types:
#define FL_FRAME FL_ENGRAVED_FRAME #define FL_FRAME FL_ENGRAVED_FRAME
@@ -217,12 +217,12 @@ enum Fl_Labeltype { // labeltypes:
FL_FREE_LABELTYPE FL_FREE_LABELTYPE
}; };
#define FL_SYMBOL_LABEL FL_NORMAL_LABEL #define FL_SYMBOL_LABEL FL_NORMAL_LABEL
extern Fl_Labeltype FL_EXPORT define_FL_SHADOW_LABEL(); extern Fl_Labeltype FL_EXPORT fl_define_FL_SHADOW_LABEL();
#define FL_SHADOW_LABEL define_FL_SHADOW_LABEL() #define FL_SHADOW_LABEL fl_define_FL_SHADOW_LABEL()
extern Fl_Labeltype FL_EXPORT define_FL_ENGRAVED_LABEL(); extern Fl_Labeltype FL_EXPORT fl_define_FL_ENGRAVED_LABEL();
#define FL_ENGRAVED_LABEL define_FL_ENGRAVED_LABEL() #define FL_ENGRAVED_LABEL fl_define_FL_ENGRAVED_LABEL()
extern Fl_Labeltype FL_EXPORT define_FL_EMBOSSED_LABEL(); extern Fl_Labeltype FL_EXPORT fl_define_FL_EMBOSSED_LABEL();
#define FL_EMBOSSED_LABEL define_FL_EMBOSSED_LABEL() #define FL_EMBOSSED_LABEL fl_define_FL_EMBOSSED_LABEL()
enum Fl_Align { // align() values enum Fl_Align { // align() values
FL_ALIGN_CENTER = 0, FL_ALIGN_CENTER = 0,
@@ -378,5 +378,5 @@ enum Fl_Damage {
#endif #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
+15 -15
View File
@@ -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). // Filename header file for the Fast Light Tool Kit (FLTK).
// //
@@ -30,21 +30,21 @@
# define FL_PATH_MAX 256 // all buffers are this length # 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 *fl_filename_name(const char *); // return pointer to name
FL_EXPORT const char *filename_ext(const char *); // return pointer to .ext FL_EXPORT const char *fl_filename_ext(const char *); // return pointer to .ext
FL_EXPORT char *filename_setext(char *to, int tolen, const char *ext); // clobber .ext FL_EXPORT char *fl_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 fl_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 fl_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 fl_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 fl_filename_match(const char *name, const char *pattern); // glob match
FL_EXPORT int filename_isdir(const char *name); FL_EXPORT int fl_filename_isdir(const char *name);
# ifdef __cplusplus # ifdef __cplusplus
// Under WIN32, we include filename.H from numericsort.c; this should probably change // 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 char *fl_filename_setext(char *to, const char *ext) { return fl_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 fl_filename_expand(char *to, const char *from) { return fl_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 fl_filename_absolute(char *to, const char *from) { return fl_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 int fl_filename_relative(char *to, const char *from) { return fl_filename_relative(to, FL_PATH_MAX, from); }
# endif // __cplusplus # endif // __cplusplus
@@ -69,10 +69,10 @@ struct dirent {char d_name[1];};
# endif # 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 #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
+3 -3
View File
@@ -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). // 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 "filename.H"
#include "Fl_File_Chooser.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): // Forms-compatable file chooser (implementation in fselect.C):
FL_EXPORT char* fl_show_file_selector(const char* message,const char* dir, 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__ */ #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
+4 -2
View File
@@ -56,8 +56,10 @@ uchar iconsize() const</A></H4>
<H4><A NAME="Fl_File_Browser.filter">void filter(const char *pattern)<BR> <H4><A NAME="Fl_File_Browser.filter">void filter(const char *pattern)<BR>
const char *filter() const</A></H4> const char *filter() const</A></H4>
<P>Sets or gets the filename filter. The pattern matching uses the <P>Sets or gets the filename filter. The pattern matching uses
<CODE>filename_match()</CODE> function in FLTK. 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> <H4><A NAME="Fl_File_Browser.filetype">void filetype(int type)<BR>
int filetype() const</A></H4> int filetype() const</A></H4>
documentation/Fl_File_Chooser.html
+5 -3
View File
@@ -59,9 +59,11 @@ above. The <CODE>pathname</CODE> argument can be a directory name or a
complete file name (in which case the corresponding file is highlighted complete file name (in which case the corresponding file is highlighted
in the list and in the filename input field.) in the list and in the filename input field.)
<P>The <CODE>pattern</CODE> argument can be a <CODE>NULL</CODE> string or <P>The <CODE>pattern</CODE> argument can be a <CODE>NULL</CODE>
<CODE>"*"</CODE> to list all files. See the FLTK documentation on string or <CODE>"*"</CODE> to list all files. See the FLTK
<CODE>filename_match()</CODE> for other kinds of patterns. 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: <P>The <CODE>type</CODE> argument can be one of the following:
documentation/functions.html
+12 -12
View File
@@ -128,8 +128,8 @@ or <tt>NULL</tt> if Cancel is chosen.
<P><tt>message</tt> is a string used to title the window. <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 <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> those matching the pattern. This matching is done by <A href=#fl_filename_match>
<tt>filename_match()</tt></A>. Use <tt>NULL</tt> to show all files. <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. <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 If this is <tt>NULL</tt> then the last filename that was choosen is
@@ -148,7 +148,7 @@ currently popped-up file chooser. This could be used to preview the
contents of the file. It has to be reasonably fast, and cannot create contents of the file. It has to be reasonably fast, and cannot create
FLTK windows. 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> ***list)</A></h3>
This is a portable and const-correct wrapper for the This is a portable and const-correct wrapper for the
@@ -169,27 +169,27 @@ an attempt is made to put unpadded numbers in consecutive order.
<ul><pre>for (int i = return_value; i &gt; 0;) free((void*)(list[--i])); <ul><pre>for (int i = return_value; i &gt; 0;) free((void*)(list[--i]));
free((void*)list);</pre></ul> 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. 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 Returns a pointer to the character after the last slash, or to the
start of the filename if there is none. 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. 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> *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>. 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> *in)</A></h3>
Splits <tt>in</tt> at each slash character. Replaces any occurrance Splits <tt>in</tt> at each slash character. Replaces any occurrance
@@ -203,7 +203,7 @@ be the same buffer). Returns non-zero if any changes were made. <I>In
true retro programming style, it is up to you to provide a buffer big true retro programming style, it is up to you to provide a buffer big
enough for the result. 1024 characters should be enough.</I> 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> char *in)</A></h3>
If <tt>in</tt> does not start with a slash, this prepends the current If <tt>in</tt> does not start with a slash, this prepends the current
@@ -214,7 +214,7 @@ changes were made. <I>In true retro programming style, it is up to you
to provide a buffer big enough for the result. 1024 characters should to provide a buffer big enough for the result. 1024 characters should
be enough.</I> 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> *pattern)</A></h3>
Returns true if <tt>f</tt> matches <tt>pattern</tt>. The following Returns true if <tt>f</tt> matches <tt>pattern</tt>. The following
documentation/migration.html
+61
View File
@@ -29,6 +29,67 @@ to be ported to the new <A
HREF="Fl_File_Chooser.html"><TT>Fl_File_Chooser</TT></A> HREF="Fl_File_Chooser.html"><TT>Fl_File_Chooser</TT></A>
class.</P> 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> <H2>Image Support</H2>
<P>Image support in FLTK has been significantly revamped in <P>Image support in FLTK has been significantly revamped in
fluid/Fluid_Image.cxx
+12 -12
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.7 2002/01/06 17:51:12 easysw Exp $" // "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $"
// //
// Pixmap label support for the Fast Light Tool Kit (FLTK). // Pixmap label support for the Fast Light Tool Kit (FLTK).
// //
@@ -59,7 +59,7 @@ void Fluid_Image::write_static() {
pixmap_header_written = write_number; pixmap_header_written = write_number;
} }
write_c("static const char *%s[] = {\n", write_c("static const char *%s[] = {\n",
unique_id(this, "idata", filename_name(name()), 0)); unique_id(this, "idata", fl_filename_name(name()), 0));
write_cstring(img->data()[0], strlen(img->data()[0])); write_cstring(img->data()[0], strlen(img->data()[0]));
int i; int i;
@@ -82,8 +82,8 @@ void Fluid_Image::write_static() {
} }
write_c("\n};\n"); write_c("\n};\n");
write_c("static Fl_Pixmap %s(%s);\n", write_c("static Fl_Pixmap %s(%s);\n",
unique_id(this, "image", filename_name(name()), 0), unique_id(this, "image", fl_filename_name(name()), 0),
unique_id(this, "idata", filename_name(name()), 0)); unique_id(this, "idata", fl_filename_name(name()), 0));
} else if (img->d() == 0) { } else if (img->d() == 0) {
// Write Bitmap data... // Write Bitmap data...
write_c("\n"); write_c("\n");
@@ -92,12 +92,12 @@ void Fluid_Image::write_static() {
bitmap_header_written = write_number; bitmap_header_written = write_number;
} }
write_c("static unsigned char %s[] =\n", write_c("static unsigned char %s[] =\n",
unique_id(this, "idata", filename_name(name()), 0)); unique_id(this, "idata", fl_filename_name(name()), 0));
write_cstring(img->data()[0], ((img->w() + 7) / 8) * img->h()); write_cstring(img->data()[0], ((img->w() + 7) / 8) * img->h());
write_c(";\n"); write_c(";\n");
write_c("static Fl_Bitmap %s(%s, %d, %d);\n", write_c("static Fl_Bitmap %s(%s, %d, %d);\n",
unique_id(this, "image", filename_name(name()), 0), unique_id(this, "image", fl_filename_name(name()), 0),
unique_id(this, "idata", filename_name(name()), 0), unique_id(this, "idata", fl_filename_name(name()), 0),
img->w(), img->h()); img->w(), img->h());
} else { } else {
// Write image data... // Write image data...
@@ -107,12 +107,12 @@ void Fluid_Image::write_static() {
image_header_written = write_number; image_header_written = write_number;
} }
write_c("static unsigned char %s[] =\n", write_c("static unsigned char %s[] =\n",
unique_id(this, "idata", filename_name(name()), 0)); unique_id(this, "idata", fl_filename_name(name()), 0));
write_cstring(img->data()[0], (img->w() * img->d() + img->ld()) * img->h()); write_cstring(img->data()[0], (img->w() * img->d() + img->ld()) * img->h());
write_c(";\n"); write_c(";\n");
write_c("static Fl_RGB_Image %s(%s, %d, %d, %d, %d);\n", write_c("static Fl_RGB_Image %s(%s, %d, %d, %d, %d);\n",
unique_id(this, "image", filename_name(name()), 0), unique_id(this, "image", fl_filename_name(name()), 0),
unique_id(this, "idata", filename_name(name()), 0), unique_id(this, "idata", fl_filename_name(name()), 0),
img->w(), img->h(), img->d(), img->ld()); img->w(), img->h(), img->d(), img->ld());
} }
} }
@@ -120,7 +120,7 @@ void Fluid_Image::write_static() {
void Fluid_Image::write_code(int inactive) { void Fluid_Image::write_code(int inactive) {
if (!img) return; if (!img) return;
write_c("%so->%s(%s);\n", indent(), inactive ? "deimage" : "image", write_c("%so->%s(%s);\n", indent(), inactive ? "deimage" : "image",
unique_id(this, "image", filename_name(name()), 0)); unique_id(this, "image", fl_filename_name(name()), 0));
} }
@@ -220,5 +220,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
// //
// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.7 2002/01/06 17:51:12 easysw Exp $". // End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $".
// //
fluid/code.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: code.cxx,v 1.9.2.9.2.3 2002/01/01 15:11:29 easysw Exp $" // "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $"
// //
// Code output routines for the Fast Light Tool Kit (FLTK). // Code output routines for the Fast Light Tool Kit (FLTK).
// //
@@ -278,7 +278,7 @@ int write_code(const char *s, const char *t) {
fprintf(code_file, hdr, FL_VERSION); fprintf(code_file, hdr, FL_VERSION);
{char define_name[102]; {char define_name[102];
const char* a = filename_name(t); const char* a = fl_filename_name(t);
char* b = define_name; char* b = define_name;
if (!isalpha(*a)) {*b++ = '_';} if (!isalpha(*a)) {*b++ = '_';}
while (*a) {*b++ = isalnum(*a) ? *a : '_'; a++;} while (*a) {*b++ = isalnum(*a) ? *a : '_'; a++;}
@@ -307,7 +307,7 @@ int write_code(const char *s, const char *t) {
} }
if (t && include_H_from_C) { if (t && include_H_from_C) {
if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) { if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) {
write_c("#include \"%s\"\n", filename_name(t)); write_c("#include \"%s\"\n", fl_filename_name(t));
} else { } else {
write_c("#include \"%s\"\n", t); write_c("#include \"%s\"\n", t);
} }
@@ -464,5 +464,5 @@ void Fl_Type::write_code1() {
void Fl_Type::write_code2() {} void Fl_Type::write_code2() {}
// //
// End of "$Id: code.cxx,v 1.9.2.9.2.3 2002/01/01 15:11:29 easysw Exp $". // End of "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $".
// //
fluid/fluid.cxx
+12 -12
View File
@@ -1,5 +1,5 @@
// //
// "$Id: fluid.cxx,v 1.15.2.13.2.11 2002/01/01 15:11:29 easysw Exp $" // "$Id: fluid.cxx,v 1.15.2.13.2.12 2002/03/25 21:08:41 easysw Exp $"
// //
// FLUID main entry for the Fast Light Tool Kit (FLTK). // FLUID main entry for the Fast Light Tool Kit (FLTK).
// //
@@ -82,7 +82,7 @@ static char in_source_dir;
void goto_source_dir() { void goto_source_dir() {
if (in_source_dir) return; if (in_source_dir) return;
if (!filename || !*filename) return; if (!filename || !*filename) return;
const char *p = filename_name(filename); const char *p = fl_filename_name(filename);
if (p <= filename) return; // it is in the current directory if (p <= filename) return; // it is in the current directory
char buffer[1024]; char buffer[1024];
strcpy(buffer,filename); strcpy(buffer,filename);
@@ -178,17 +178,17 @@ void write_cb(Fl_Widget *, void *) {
} }
char cname[1024]; char cname[1024];
char hname[1024]; char hname[1024];
strcpy(i18n_program, filename_name(filename)); strcpy(i18n_program, fl_filename_name(filename));
filename_setext(i18n_program, ""); fl_filename_setext(i18n_program, "");
if (*code_file_name == '.' && strchr(code_file_name, '/') == NULL) { if (*code_file_name == '.' && strchr(code_file_name, '/') == NULL) {
strcpy(cname,filename_name(filename)); strcpy(cname,fl_filename_name(filename));
filename_setext(cname, code_file_name); fl_filename_setext(cname, code_file_name);
} else { } else {
strcpy(cname, code_file_name); strcpy(cname, code_file_name);
} }
if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) { if (*header_file_name == '.' && strchr(header_file_name, '/') == NULL) {
strcpy(hname,filename_name(filename)); strcpy(hname,fl_filename_name(filename));
filename_setext(hname, header_file_name); fl_filename_setext(hname, header_file_name);
} else { } else {
strcpy(hname, header_file_name); strcpy(hname, header_file_name);
} }
@@ -214,8 +214,8 @@ void write_strings_cb(Fl_Widget *, void *) {
if (!filename) return; if (!filename) return;
} }
char sname[1024]; char sname[1024];
strcpy(sname,filename_name(filename)); strcpy(sname,fl_filename_name(filename));
filename_setext(sname, exts[i18n_type]); fl_filename_setext(sname, exts[i18n_type]);
if (!compile_only) goto_source_dir(); if (!compile_only) goto_source_dir();
int x = write_strings(sname); int x = write_strings(sname);
if (!compile_only) leave_source_dir(); if (!compile_only) leave_source_dir();
@@ -267,7 +267,7 @@ static char* cutfname() {
#else #else
static char name[256] = "~/.fluid_cut_buffer"; static char name[256] = "~/.fluid_cut_buffer";
static char beenhere; static char beenhere;
if (!beenhere) {beenhere = 1; filename_expand(name,name);} if (!beenhere) {beenhere = 1; fl_filename_expand(name,name);}
return name; return name;
#endif #endif
} }
@@ -511,5 +511,5 @@ int main(int argc,char **argv) {
} }
// //
// End of "$Id: fluid.cxx,v 1.15.2.13.2.11 2002/01/01 15:11:29 easysw Exp $". // End of "$Id: fluid.cxx,v 1.15.2.13.2.12 2002/03/25 21:08:41 easysw Exp $".
// //
src/Fl_Button.cxx
+3 -3
View File
@@ -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). // Button widget for the Fast Light Tool Kit (FLTK).
// //
@@ -54,7 +54,7 @@ void Fl_Button::draw() {
if (type() == FL_HIDDEN_BUTTON) return; if (type() == FL_HIDDEN_BUTTON) return;
Fl_Color col = value() ? selection_color() : color(); Fl_Color col = value() ? selection_color() : color();
//if (col == FL_GRAY && Fl::belowmouse()==this) col = FL_LIGHT1; //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(); draw_label();
if (Fl::focus() == this) draw_focus(); 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 $".
// //
src/Fl_Counter.cxx
+3 -3
View File
@@ -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). // 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; if (boxtype[0] == FL_UP_BOX) boxtype[0] = FL_DOWN_BOX;
for (i=1; i<5; i++) for (i=1; i<5; i++)
if (mouseobj == i) if (mouseobj == i)
boxtype[i] = down(box()); boxtype[i] = fl_down(box());
else else
boxtype[i] = box(); 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 $".
// //
src/Fl_File_Browser.cxx
+6 -6
View File
@@ -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. // 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] != '\\') else if (filename[i] != '/' && filename[i] != '\\')
strcat(filename, "/"); strcat(filename, "/");
num_files = filename_list(filename, &files); num_files = fl_filename_list(filename, &files);
#else #else
num_files = filename_list(directory_, &files); num_files = fl_filename_list(directory_, &files);
#endif /* WIN32 || __EMX__ */ #endif /* WIN32 || __EMX__ */
if (num_files <= 0) 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_, snprintf(filename, sizeof(filename), "%s/%s", directory_,
files[i]->d_name); files[i]->d_name);
if (filename_isdir(filename)) if (fl_filename_isdir(filename))
{ {
char name[1024]; // Temporary directory name 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)); insert(num_dirs, name, Fl_File_Icon::find(filename));
} }
else if (filetype_ == FILES && 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)); 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 $".
// //
src/Fl_File_Chooser2.cxx
+13 -13
View File
@@ -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. // More Fl_File_Chooser routines.
// //
@@ -88,7 +88,7 @@ Fl_File_Chooser::directory(const char *d) // I - Directory to change to
#else #else
if (d[0] != '/' && d[0] != '\\') if (d[0] != '/' && d[0] != '\\')
#endif /* WIN32 || __EMX__ */ #endif /* WIN32 || __EMX__ */
filename_absolute(directory_, d); fl_filename_absolute(directory_, d);
else else
{ {
strncpy(directory_, d, sizeof(directory_) - 1); strncpy(directory_, d, sizeof(directory_) - 1);
@@ -175,7 +175,7 @@ Fl_File_Chooser::count()
pathname[sizeof(pathname) - 1] = '\0'; pathname[sizeof(pathname) - 1] = '\0';
} }
if (filename_isdir(pathname)) if (fl_filename_isdir(pathname))
return (0); return (0);
else else
return (1); return (1);
@@ -194,7 +194,7 @@ Fl_File_Chooser::count()
pathname[sizeof(pathname) - 1] = '\0'; pathname[sizeof(pathname) - 1] = '\0';
} }
if (!filename_isdir(pathname)) if (!fl_filename_isdir(pathname))
count ++; count ++;
} }
@@ -244,7 +244,7 @@ Fl_File_Chooser::value(int f) // I - File number
pathname[sizeof(pathname) - 1] = '\0'; pathname[sizeof(pathname) - 1] = '\0';
} }
if (!filename_isdir(pathname)) if (!fl_filename_isdir(pathname))
{ {
// Nope, see if this this is "the one"... // Nope, see if this this is "the one"...
count ++; 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); // printf("Fl_File_Chooser::value(\"%s\")\n", filename == NULL ? "(null)" : filename);
// See if the filename is actually a directory... // 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... // Yes, just change the current directory...
directory(filename); directory(filename);
@@ -439,9 +439,9 @@ Fl_File_Chooser::fileListCB()
{ {
#if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__)
if ((strlen(pathname) == 2 && pathname[1] == ':') || if ((strlen(pathname) == 2 && pathname[1] == ':') ||
filename_isdir(pathname)) fl_filename_isdir(pathname))
#else #else
if (filename_isdir(pathname)) if (fl_filename_isdir(pathname))
#endif /* WIN32 || __EMX__ */ #endif /* WIN32 || __EMX__ */
{ {
directory(pathname); directory(pathname);
@@ -461,7 +461,7 @@ Fl_File_Chooser::fileListCB()
{ {
fileName->value(filename); fileName->value(filename);
if (!filename_isdir(pathname) || (type_ & DIRECTORY)) if (!fl_filename_isdir(pathname) || (type_ & DIRECTORY))
okButton->activate(); okButton->activate();
} }
} }
@@ -554,9 +554,9 @@ Fl_File_Chooser::fileNameCB()
#if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__)
if ((strlen(pathname) == 2 && pathname[1] == ':') || if ((strlen(pathname) == 2 && pathname[1] == ':') ||
filename_isdir(pathname)) fl_filename_isdir(pathname))
#else #else
if (filename_isdir(pathname)) if (fl_filename_isdir(pathname))
#endif /* WIN32 || __EMX__ */ #endif /* WIN32 || __EMX__ */
directory(pathname); directory(pathname);
else if ((type_ & CREATE) || access(pathname, 0) == 0) else if ((type_ & CREATE) || access(pathname, 0) == 0)
@@ -698,7 +698,7 @@ Fl_File_Chooser::fileNameCB()
} }
if ((type_ & CREATE || access(pathname, 0) == 0) && if ((type_ & CREATE || access(pathname, 0) == 0) &&
(!filename_isdir(pathname) || type_ & DIRECTORY)) (!fl_filename_isdir(pathname) || type_ & DIRECTORY))
okButton->activate(); okButton->activate();
else else
okButton->deactivate(); 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 $".
// //
src/Fl_File_Icon.cxx
+3 -3
View File
@@ -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. // Fl_File_Icon routines.
// //
@@ -220,7 +220,7 @@ Fl_File_Icon::find(const char *filename,// I - Name of file */
// is found... // is found...
for (current = first_; current != (Fl_File_Icon *)0; current = current->next_) for (current = first_; current != (Fl_File_Icon *)0; current = current->next_)
if ((current->type_ == filetype || current->type_ == ANY) && if ((current->type_ == filetype || current->type_ == ANY) &&
filename_match(filename, current->pattern_)) fl_filename_match(filename, current->pattern_))
break; break;
// Return the match (if any)... // 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 $".
// //
src/Fl_File_Icon2.cxx
+5 -5
View File
@@ -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. // 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 const char *ext; // File extension
ext = filename_ext(f); ext = fl_filename_ext(f);
if (ext && strcmp(ext, ".fti") == 0) if (ext && strcmp(ext, ".fti") == 0)
i = load_fti(f); i = load_fti(f);
@@ -758,7 +758,7 @@ load_kde_icons(const char *directory) // I - Directory to load
entries = (dirent **)0; entries = (dirent **)0;
n = filename_list(directory, &entries); n = fl_filename_list(directory, &entries);
for (i = 0; i < n; i ++) for (i = 0; i < n; i ++)
{ {
@@ -768,7 +768,7 @@ load_kde_icons(const char *directory) // I - Directory to load
strcat(full,"/"); strcat(full,"/");
strcat(full, entries[i]->d_name); strcat(full, entries[i]->d_name);
if (filename_isdir(full)) if (fl_filename_isdir(full))
load_kde_icons(full); load_kde_icons(full);
else else
load_kde_mimelnk(full); 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 $".
// //
src/Fl_Light_Button.cxx
+3 -3
View File
@@ -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). // Lighted button widget for the Fast Light Tool Kit (FLTK).
// //
@@ -35,7 +35,7 @@
#include <FL/fl_draw.H> #include <FL/fl_draw.H>
void Fl_Light_Button::draw() { 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_Color col = value() ? (active_r() ? selection_color() :
fl_inactive(selection_color())) : color(); fl_inactive(selection_color())) : color();
int W; 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 $".
// //
src/Fl_Return_Button.cxx
+3 -3
View File
@@ -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). // 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() { void Fl_Return_Button::draw() {
if (type() == FL_HIDDEN_BUTTON) return; 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()); value() ? selection_color() : color());
int W = h(); int W = h();
if (w()/3 < W) W = w()/3; 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 $".
// //
src/Fl_Scrollbar.cxx
+6 -6
View File
@@ -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). // 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;} if (W < 3*H) {Fl_Slider::draw(X,Y,W,H); return;}
Fl_Slider::draw(X+H,Y,W-2*H,H); Fl_Slider::draw(X+H,Y,W-2*H,H);
if (damage()&FL_DAMAGE_ALL) { 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()); 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()); X+W-H, Y, H, H, selection_color());
if (active_r()) if (active_r())
fl_color(labelcolor()); fl_color(labelcolor());
@@ -216,9 +216,9 @@ void Fl_Scrollbar::draw() {
if (H < 3*W) {Fl_Slider::draw(X,Y,W,H); return;} if (H < 3*W) {Fl_Slider::draw(X,Y,W,H); return;}
Fl_Slider::draw(X,Y+W,W,H-2*W); Fl_Slider::draw(X,Y+W,W,H-2*W);
if (damage()&FL_DAMAGE_ALL) { 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()); 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()); X, Y+H-W, W, W, selection_color());
if (active_r()) if (active_r())
fl_color(labelcolor()); 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 $".
// //
src/Fl_arg.cxx
+3 -3
View File
@@ -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). // 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: // set the class, which is used by X version of get_system_colors:
if (name) {xclass(name); name = 0;} 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;} if (title) {label(title); title = 0;}
else if (!label()) label(xclass()); else if (!label()) label(xclass());
@@ -364,5 +364,5 @@ int XParseGeometry(const char* string, int* x, int* y,
#endif // ifdef WIN32 #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 $".
// //
src/Fl_mac.cxx
+3 -3
View File
@@ -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). // 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 ':' * 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; const char *p, *q;
for ( p = q = name ; *p ; ) 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 $".
// //
src/Fl_win32.cxx
+5 -5
View File
@@ -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). // 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 '/' // 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; const char *p,*q;
q = name; q = name;
if (q[0] && q[1]==':') q += 2; // skip leading drive letter 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 (shown() && !parent()) {
if (!name) name = ""; if (!name) name = "";
SetWindowText(i->xid, name); SetWindowText(i->xid, name);
// if (!iname) iname = filename_name(name); // if (!iname) iname = fl_filename_name(name);
// should do something with iname here... // 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 $".
// //
src/Fl_x.cxx
+4 -4
View File
@@ -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). // 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 '/' // 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; const char *p,*q;
for (p=q=name; *p;) if (*p++ == '/') q = p; for (p=q=name; *p;) if (*p++ == '/') q = p;
return q; return q;
@@ -1160,7 +1160,7 @@ void Fl_Window::label(const char *name,const char *iname) {
if (!name) name = ""; if (!name) name = "";
XChangeProperty(fl_display, i->xid, XA_WM_NAME, XChangeProperty(fl_display, i->xid, XA_WM_NAME,
XA_STRING, 8, 0, (uchar*)name, strlen(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, XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME,
XA_STRING, 8, 0, (uchar*)iname, strlen(iname)); XA_STRING, 8, 0, (uchar*)iname, strlen(iname));
} }
@@ -1215,5 +1215,5 @@ void Fl_Window::make_current() {
#endif #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 $".
// //
src/filename_absolute.cxx
+5 -5
View File
@@ -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). // 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)=='/') #define isdirsep(c) ((c)=='/')
#endif #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 (isdirsep(*from) || *from == '|'
#if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__) #if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__)
|| from[1]==':' || 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 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 int tolen, // I - Size of "to" buffer
const char *from) { // I - Absolute filename const char *from) { // I - Absolute filename
const char *newslash; // Directory separator 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 $".
// //
src/filename_expand.cxx
+3 -3
View File
@@ -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). // 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)=='/') #define isdirsep(c) ((c)=='/')
#endif #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]; char *temp = new char[tolen];
strncpy(temp,from, tolen - 1); 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 $".
// //
src/filename_ext.cxx
+3 -3
View File
@@ -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). // Filename extension routines for the Fast Light Tool Kit (FLTK).
// //
@@ -27,7 +27,7 @@
#include <FL/filename.H> #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 *q = 0;
const char *p = buf; const char *p = buf;
for (p=buf; *p; p++) { 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 $".
// //
src/filename_isdir.cxx
+3 -3
View File
@@ -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). // 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)=='/') #define isdirsep(c) ((c)=='/')
#endif #endif
int filename_isdir(const char* n) { int fl_filename_isdir(const char* n) {
struct stat s; struct stat s;
#ifdef WIN32 #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 $".
// //
src/filename_list.cxx
+3 -3
View File
@@ -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). // Filename list routines for the Fast Light Tool Kit (FLTK).
// //
@@ -39,7 +39,7 @@ extern "C" {
#endif #endif
} }
int filename_list(const char *d, dirent ***list) { int fl_filename_list(const char *d, dirent ***list) {
#if defined(__hpux) #if defined(__hpux)
// HP-UX defines the comparison function like this: // HP-UX defines the comparison function like this:
return scandir(d, list, 0, (int(*)(const dirent **, const dirent **))numericsort); 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 $".
// //
src/filename_match.cxx
+5 -5
View File
@@ -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). // Pattern matching routines for the Fast Light Tool Kit (FLTK).
// //
@@ -27,7 +27,7 @@
#include <FL/filename.H> #include <FL/filename.H>
#include <ctype.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; int matched;
for (;;) { for (;;) {
@@ -39,7 +39,7 @@ int filename_match(const char *s, const char *p) {
case '*' : // match 0-n of any characters case '*' : // match 0-n of any characters
if (!*p) return 1; // do trailing * quickly 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; return 1;
case '[': { // match one character in set of form [abc-d] or [^a-b] 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} case '{' : // {pattern1|pattern2|pattern3}
NEXTCASE: NEXTCASE:
if (filename_match(s,p)) return 1; if (fl_filename_match(s,p)) return 1;
for (matched = 0;;) { for (matched = 0;;) {
switch (*p++) { switch (*p++) {
case '\\': if (*p) p++; break; 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 $".
// //
src/filename_setext.cxx
+4 -4
View File
@@ -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). // Filename extension routines for the Fast Light Tool Kit (FLTK).
// //
@@ -30,8 +30,8 @@
#include <FL/filename.H> #include <FL/filename.H>
#include <string.h> #include <string.h>
char *filename_setext(char *buf, int buflen, const char *ext) { char *fl_filename_setext(char *buf, int buflen, const char *ext) {
char *q = (char *)filename_ext(buf); char *q = (char *)fl_filename_ext(buf);
if (ext) { if (ext) {
strncpy(q,ext,buflen - (q - buf) - 1); strncpy(q,ext,buflen - (q - buf) - 1);
buf[buflen - 1] = '\0'; 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 $".
// //
src/fl_diamond_box.cxx
+3 -3
View File
@@ -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). // 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*); 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_DOWN_BOX, fl_diamond_down_box);
fl_internal_boxtype(_FL_DIAMOND_UP_BOX,fl_diamond_up_box); fl_internal_boxtype(_FL_DIAMOND_UP_BOX,fl_diamond_up_box);
return _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 $".
// //
src/fl_engraved_label.cxx
+5 -5
View File
@@ -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). // 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); 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); Fl::set_labeltype(_FL_SHADOW_LABEL, fl_shadow_label, 0);
return _FL_SHADOW_LABEL; 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); Fl::set_labeltype(_FL_ENGRAVED_LABEL, fl_engraved_label, 0);
return _FL_ENGRAVED_LABEL; 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); Fl::set_labeltype(_FL_EMBOSSED_LABEL, fl_embossed_label, 0);
return _FL_EMBOSSED_LABEL; 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 $".
// //
src/fl_file_dir.cxx
+5 -5
View File
@@ -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). // 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()))) { strcmp(pat, fc->filter()))) {
// if pattern is different, remove name but leave old directory: // if pattern is different, remove name but leave old directory:
char* p = (char *)fc->value(); char* p = (char *)fc->value();
const char* q = filename_name(p); const char* q = fl_filename_name(p);
int i; int i;
if (q == NULL) i = 0; if (q == NULL) i = 0;
@@ -81,7 +81,7 @@ char* fl_file_chooser(const char* message, const char* pat, const char* fname)
Fl::wait(); Fl::wait();
if (fc->value()) { if (fc->value()) {
filename_relative(retname, sizeof(retname), fc->value()); fl_filename_relative(retname, sizeof(retname), fc->value());
return retname; return retname;
} else return 0; } else return 0;
@@ -111,7 +111,7 @@ char* fl_dir_chooser(const char* message, const char* fname)
Fl::wait(); Fl::wait();
if (fc->value()) { if (fc->value()) {
filename_relative(retname, sizeof(retname), fc->value()); fl_filename_relative(retname, sizeof(retname), fc->value());
return retname; return retname;
} else return 0; } 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 $".
// //
src/fl_oval_box.cxx
+3 -3
View File
@@ -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). // 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*); 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_OSHADOW_BOX,fl_oval_shadow_box);
fl_internal_boxtype(_FL_OVAL_FRAME,fl_oval_frame); fl_internal_boxtype(_FL_OVAL_FRAME,fl_oval_frame);
fl_internal_boxtype(_FL_OFLAT_BOX,fl_oval_flat_box); 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 $".
// //
src/fl_plastic.cxx
+3 -3
View File
@@ -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). // "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*); 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_UP_BOX, up_box);
fl_internal_boxtype(_FL_PLASTIC_DOWN_BOX, down_box); fl_internal_boxtype(_FL_PLASTIC_DOWN_BOX, down_box);
fl_internal_boxtype(_FL_PLASTIC_UP_FRAME, up_frame); 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 $".
// //
src/fl_round_box.cxx
+3 -3
View File
@@ -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). // 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*); 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_DOWN_BOX, fl_round_down_box);
fl_internal_boxtype(_FL_ROUND_UP_BOX, fl_round_up_box); fl_internal_boxtype(_FL_ROUND_UP_BOX, fl_round_up_box);
return _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 $".
// //
src/fl_rounded_box.cxx
+5 -5
View File
@@ -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). // 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*); 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_FRAME, fl_rounded_frame);
fl_internal_boxtype(_FL_ROUNDED_BOX, fl_rounded_box); fl_internal_boxtype(_FL_ROUNDED_BOX, fl_rounded_box);
return _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); fl_internal_boxtype(_FL_RFLAT_BOX, fl_rflat_box);
return _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); fl_internal_boxtype(_FL_RSHADOW_BOX, fl_rshadow_box);
return _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 $".
// //
src/fl_shadow_box.cxx
+3 -3
View File
@@ -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). // 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*); 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_FRAME, fl_shadow_frame);
fl_internal_boxtype(_FL_SHADOW_BOX, fl_shadow_box); fl_internal_boxtype(_FL_SHADOW_BOX, fl_shadow_box);
return _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 $".
// //
src/forms_fselect.cxx
+3 -3
View File
@@ -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). // 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); const char *q = fl_file_chooser(message,fl_pattern,fl_directory);
if (!q) return 0; if (!q) return 0;
strcpy(fl_directory, q); strcpy(fl_directory, q);
p = (char *)filename_name(fl_directory); p = (char *)fl_filename_name(fl_directory);
strcpy(fl_filename, p); strcpy(fl_filename, p);
if (p > fl_directory+1) p--; if (p > fl_directory+1) p--;
*p = 0; *p = 0;
@@ -61,5 +61,5 @@ char* fl_get_pattern() {return (char *)fl_pattern;}
char* fl_get_filename() {return fl_filename;} 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 $".
// //
src/makedepend
+1 -1
View File
@@ -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_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_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/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.H ../FL/Enumerations.H ../FL/Fl_Export.H
fl_boxtype.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../config.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 fl_color.o: Fl_XColor.H ../config.h ../FL/Enumerations.H ../FL/Fl_Export.H
test/demo.cxx
+5 -5
View File
@@ -1,5 +1,5 @@
// //
// "$Id: demo.cxx,v 1.8.2.5.2.5 2002/01/01 15:11:32 easysw Exp $" // "$Id: demo.cxx,v 1.8.2.5.2.6 2002/03/25 21:08:42 easysw Exp $"
// //
// Main demo program for the Fast Light Tool Kit (FLTK). // Main demo program for the Fast Light Tool Kit (FLTK).
// //
@@ -319,10 +319,10 @@ int main(int argc, char **argv) {
strcpy(buf, argv[0]); strcpy(buf, argv[0]);
#if defined _MSC_VER && defined _DEBUG #if defined _MSC_VER && defined _DEBUG
// MS_VisualC appends a 'd' to debugging executables. remove it. // MS_VisualC appends a 'd' to debugging executables. remove it.
filename_setext( buf, "" ); fl_filename_setext( buf, "" );
buf[ strlen(buf)-1 ] = 0; buf[ strlen(buf)-1 ] = 0;
#endif #endif
filename_setext(buf,".menu"); fl_filename_setext(buf,".menu");
const char *fname = buf; const char *fname = buf;
int i = 0; int i = 0;
if (!Fl::args(argc,argv,i) || i < argc-1) if (!Fl::args(argc,argv,i) || i < argc-1)
@@ -331,7 +331,7 @@ int main(int argc, char **argv) {
if (!load_the_menu(fname)) Fl::fatal("Can't open %s",fname); if (!load_the_menu(fname)) Fl::fatal("Can't open %s",fname);
strcpy(buf,fname); strcpy(buf,fname);
const char *c = filename_name(buf); const char *c = fl_filename_name(buf);
if (c > buf) {buf[c-buf] = 0; chdir(buf);} if (c > buf) {buf[c-buf] = 0; chdir(buf);}
push_menu("@main"); push_menu("@main");
form->show(argc,argv); form->show(argc,argv);
@@ -340,6 +340,6 @@ int main(int argc, char **argv) {
} }
// //
// End of "$Id: demo.cxx,v 1.8.2.5.2.5 2002/01/01 15:11:32 easysw Exp $". // End of "$Id: demo.cxx,v 1.8.2.5.2.6 2002/03/25 21:08:42 easysw Exp $".
// //