From 6c796f88c7459fa4262f936dc9c7c02fa01e95e7 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 25 Mar 2002 21:08:42 +0000 Subject: 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 --- documentation/Fl_File_Browser.html | 6 ++-- documentation/Fl_File_Chooser.html | 8 +++-- documentation/functions.html | 24 +++++++-------- documentation/migration.html | 61 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 17 deletions(-) (limited to 'documentation') diff --git a/documentation/Fl_File_Browser.html b/documentation/Fl_File_Browser.html index 6b8cbadc2..6137bdddc 100644 --- a/documentation/Fl_File_Browser.html +++ b/documentation/Fl_File_Browser.html @@ -56,8 +56,10 @@ uchar iconsize() const

void filter(const char *pattern)
const char *filter() const

-

Sets or gets the filename filter. The pattern matching uses the -filename_match() function in FLTK. +

Sets or gets the filename filter. The pattern matching uses +the fl_filename_match() +function in FLTK.

void filetype(int type)
int filetype() const

diff --git a/documentation/Fl_File_Chooser.html b/documentation/Fl_File_Chooser.html index a38e945da..0e1db01af 100644 --- a/documentation/Fl_File_Chooser.html +++ b/documentation/Fl_File_Chooser.html @@ -59,9 +59,11 @@ above. The pathname argument can be a directory name or a complete file name (in which case the corresponding file is highlighted in the list and in the filename input field.) -

The pattern argument can be a NULL string or -"*" to list all files. See the FLTK documentation on -filename_match() for other kinds of patterns. +

The pattern argument can be a NULL +string or "*" to list all files. See the FLTK +documentation on fl_filename_match() +for other kinds of patterns.

The type argument can be one of the following: diff --git a/documentation/functions.html b/documentation/functions.html index a227ff5c7..4a8f827e9 100644 --- a/documentation/functions.html +++ b/documentation/functions.html @@ -128,8 +128,8 @@ or NULL if Cancel is chosen.

message is a string used to title the window.

pattern is used to limit the files listed in a directory to -those matching the pattern. This matching is done by -filename_match(). Use NULL to show all files. +those matching the pattern. This matching is done by +fl_filename_match(). Use NULL to show all files.

fname is a default filename to fill in the chooser with. If this is NULL 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 FLTK windows. -

int filename_list(const char *d, dirent +

int fl_filename_list(const char *d, dirent ***list)

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. -

int filename_isdir(const char *f)

+

int fl_filename_isdir(const char *f)

Returns non-zero if the file exists and is a directory. -

const char *filename_name(const char *f)

+

const char *fl_filename_name(const char *f)

Returns a pointer to the character after the last slash, or to the start of the filename if there is none. -

const char *filename_ext(const char *f)

+

const char *fl_filename_ext(const char *f)

-Returns a pointer to the last period in filename_name(f), or +Returns a pointer to the last period in fl_filename_name(f), or a pointer to the trailing nul if none. -

char *filename_setext(char *f, const char +

char *fl_filename_setext(char *f, const char *ext)

-Does strcpy(filename_ext(f), ext ? ext : ""). Returns a +Does strcpy(fl_filename_ext(f), ext ? ext : ""). Returns a pointer to f. -

int filename_expand(char *out, const char +

int fl_filename_expand(char *out, const char *in)

Splits in at each slash character. Replaces any occurrance @@ -203,7 +203,7 @@ be the same buffer). Returns non-zero if any changes were made. In true retro programming style, it is up to you to provide a buffer big enough for the result. 1024 characters should be enough. -

int filename_absolute(char *out, const +

int fl_filename_absolute(char *out, const char *in)

If in does not start with a slash, this prepends the current @@ -214,7 +214,7 @@ changes were made. In true retro programming style, it is up to you to provide a buffer big enough for the result. 1024 characters should be enough. -

int filename_match(const char *f, const char +

int fl_filename_match(const char *f, const char *pattern)

Returns true if f matches pattern. The following diff --git a/documentation/migration.html b/documentation/migration.html index 060fe7f13..def6c4b36 100644 --- a/documentation/migration.html +++ b/documentation/migration.html @@ -29,6 +29,67 @@ to be ported to the new Fl_File_Chooser class.

+

Function Names

+ +

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:

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Old 1.0.x NameNew 1.1.x Name
contrast()fl_contrast()
down()fl_down()
filename_absolute()fl_filename_absolute()
filename_expand()fl_filename_expand()
filename_ext()fl_filename_ext()
filename_isdir()fl_filename_isdir()
filename_list()fl_filename_list()
filename_match()fl_filename_match()
filename_name()fl_filename_name()
filename_relative()fl_filename_relative()
frame()fl_frame()
inactive()fl_inactive()
+

Image Support

Image support in FLTK has been significantly revamped in -- cgit v1.2.3