diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 74 | ||||
| -rw-r--r-- | FL/filename.H | 30 | ||||
| -rw-r--r-- | FL/forms.H | 6 |
3 files changed, 55 insertions, 55 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 2692c2c63..650ac4169 100644 --- a/FL/Enumerations.H +++ b/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 $". // diff --git a/FL/filename.H b/FL/filename.H index 6d783b846..fdcdd73d0 100644 --- a/FL/filename.H +++ b/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 $". // diff --git a/FL/forms.H b/FL/forms.H index 481e59d01..e243090ea 100644 --- a/FL/forms.H +++ b/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 $". // |