diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_File_Browser.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_File_Chooser2.cxx | 12 | ||||
| -rw-r--r-- | src/filename_isdir.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index f5e02587d..fdee961a0 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -600,7 +600,7 @@ Fl_File_Browser::load(const char *directory,// I - Directory to load icon = Fl_File_Icon::find(filename); if ((icon && icon->type() == Fl_File_Icon::DIRECTORY) || - fl_filename_isdir_quick(filename)) { + _fl_filename_isdir_quick(filename)) { num_dirs ++; insert(num_dirs, files[i]->d_name, icon); } else if (filetype_ == FILES && diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 77ba45850..e6ccf6347 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -412,9 +412,9 @@ Fl_File_Chooser::fileListCB() if (Fl::event_clicks()) { #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) if ((strlen(pathname) == 2 && pathname[1] == ':') || - fl_filename_isdir_quick(pathname)) + _fl_filename_isdir_quick(pathname)) #else - if (fl_filename_isdir_quick(pathname)) + if (_fl_filename_isdir_quick(pathname)) #endif /* WIN32 || __EMX__ */ { // Change directories... @@ -477,7 +477,7 @@ Fl_File_Chooser::fileListCB() if (callback_) (*callback_)(this, data_); // Activate the OK button as needed... - if (!fl_filename_isdir_quick(pathname) || (type_ & DIRECTORY)) + if (!_fl_filename_isdir_quick(pathname) || (type_ & DIRECTORY)) okButton->activate(); else okButton->deactivate(); @@ -544,15 +544,15 @@ Fl_File_Chooser::fileNameCB() // Enter pressed - select or change directory... #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) if ((isalpha(pathname[0] & 255) && pathname[1] == ':' && !pathname[2]) || - fl_filename_isdir_quick(pathname) && + _fl_filename_isdir_quick(pathname) && compare_dirnames(pathname, directory_)) { #else - if (fl_filename_isdir_quick(pathname) && + if (_fl_filename_isdir_quick(pathname) && compare_dirnames(pathname, directory_)) { #endif /* WIN32 || __EMX__ */ directory(pathname); } else if ((type_ & CREATE) || access(pathname, 0) == 0) { - if (!fl_filename_isdir_quick(pathname) || (type_ & DIRECTORY)) { + if (!_fl_filename_isdir_quick(pathname) || (type_ & DIRECTORY)) { // Update the preview box... update_preview(); diff --git a/src/filename_isdir.cxx b/src/filename_isdir.cxx index 4e21d8603..5d58911d8 100644 --- a/src/filename_isdir.cxx +++ b/src/filename_isdir.cxx @@ -40,7 +40,7 @@ static inline int isdirsep(char c) {return c=='/' || c=='\\';} #define isdirsep(c) ((c)=='/') #endif -int fl_filename_isdir_quick(const char* n) { +int _fl_filename_isdir_quick(const char* n) { // Do a quick optimization for filenames with a trailing slash... if (*n && isdirsep(n[strlen(n) - 1])) return 1; return fl_filename_isdir(n); |