diff options
| author | Greg Ercolano <erco@seriss.com> | 2016-09-05 19:45:52 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2016-09-05 19:45:52 +0000 |
| commit | 5871340263fbd39881b9599dbe4d5b307e570af7 (patch) | |
| tree | abb27bfa68dc03bfa37994978b71baac93465289 /src/Fl_Native_File_Chooser_FLTK.cxx | |
| parent | 832e117f814296ded3f0314821a357971e52dd71 (diff) | |
Bringing over fix [r11923] from 1.3 current to the porting branch.
(Slightly different from 1.3 current patch, as files were split)
Code indent consistency + doxygen \code indent fixes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11926 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Native_File_Chooser_FLTK.cxx')
| -rw-r--r-- | src/Fl_Native_File_Chooser_FLTK.cxx | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/src/Fl_Native_File_Chooser_FLTK.cxx b/src/Fl_Native_File_Chooser_FLTK.cxx index d8b59d67f..2f242592c 100644 --- a/src/Fl_Native_File_Chooser_FLTK.cxx +++ b/src/Fl_Native_File_Chooser_FLTK.cxx @@ -101,62 +101,62 @@ int Fl_Native_File_Chooser_FLTK_Driver::options() const { int Fl_Native_File_Chooser_FLTK_Driver::show() { // FILTER - if ( _parsedfilt ) { - _file_chooser->filter(_parsedfilt); - } + if ( _parsedfilt ) { + _file_chooser->filter(_parsedfilt); + } - // FILTER VALUE - // Set this /after/ setting the filter - // - _file_chooser->filter_value(_filtvalue); + // FILTER VALUE + // Set this /after/ setting the filter + // + _file_chooser->filter_value(_filtvalue); - // DIRECTORY - if ( _directory && _directory[0] ) { - _file_chooser->directory(_directory); - } else { - _file_chooser->directory(_prevvalue); - } + // DIRECTORY + if ( _directory && _directory[0] ) { + _file_chooser->directory(_directory); + } else { + _file_chooser->directory(_prevvalue); + } - // PRESET FILE - if ( _preset_file ) { - _file_chooser->value(_preset_file); - } + // PRESET FILE + if ( _preset_file ) { + _file_chooser->value(_preset_file); + } - // OPTIONS: PREVIEW - _file_chooser->preview( (options() & Fl_Native_File_Chooser::PREVIEW) ? 1 : 0); + // OPTIONS: PREVIEW + _file_chooser->preview( (options() & Fl_Native_File_Chooser::PREVIEW) ? 1 : 0); - // OPTIONS: NEW FOLDER - if ( options() & Fl_Native_File_Chooser::NEW_FOLDER ) - _file_chooser->type(_file_chooser->type() | Fl_File_Chooser::CREATE); // on + // OPTIONS: NEW FOLDER + if ( options() & Fl_Native_File_Chooser::NEW_FOLDER ) + _file_chooser->type(_file_chooser->type() | Fl_File_Chooser::CREATE); // on - // SHOW - _file_chooser->show(); + // SHOW + _file_chooser->show(); - // BLOCK WHILE BROWSER SHOWN - while ( _file_chooser->shown() ) { - Fl::wait(); - } + // BLOCK WHILE BROWSER SHOWN + while ( _file_chooser->shown() ) { + Fl::wait(); + } - if ( _file_chooser->value() && _file_chooser->value()[0] ) { - _prevvalue = strfree(_prevvalue); - _prevvalue = strnew(_file_chooser->value()); - _filtvalue = _file_chooser->filter_value(); // update filter value - - // HANDLE SHOWING 'SaveAs' CONFIRM - if ( options() & Fl_Native_File_Chooser::SAVEAS_CONFIRM && type() == Fl_Native_File_Chooser::BROWSE_SAVE_FILE ) { - struct stat buf; - if ( fl_stat(_file_chooser->value(), &buf) != -1 ) { - if ( buf.st_mode & S_IFREG ) { // Regular file + exists? - if ( exist_dialog() == 0 ) { - return(1); - } + if ( _file_chooser->value() && _file_chooser->value()[0] ) { + _prevvalue = strfree(_prevvalue); + _prevvalue = strnew(_file_chooser->value()); + _filtvalue = _file_chooser->filter_value(); // update filter value + + // HANDLE SHOWING 'SaveAs' CONFIRM + if ( options() & Fl_Native_File_Chooser::SAVEAS_CONFIRM && type() == Fl_Native_File_Chooser::BROWSE_SAVE_FILE ) { + struct stat buf; + if ( stat(_file_chooser->value(), &buf) != -1 ) { + if ( buf.st_mode & S_IFREG ) { // Regular file + exists? + if ( exist_dialog() == 0 ) { + return(1); } } } } + } - if ( _file_chooser->count() ) return(0); - else return(1); + if ( _file_chooser->count() ) return(0); + else return(1); } const char *Fl_Native_File_Chooser_FLTK_Driver::errmsg() const { @@ -171,8 +171,8 @@ const char* Fl_Native_File_Chooser_FLTK_Driver::filename() const { } const char* Fl_Native_File_Chooser_FLTK_Driver::filename(int i) const { - if ( i < _file_chooser->count() ) - return(_file_chooser->value(i+1)); // convert fltk 1 based to our 0 based + if ( i < _file_chooser->count() ) + return(_file_chooser->value(i+1)); // convert fltk 1 based to our 0 based return(""); } @@ -181,7 +181,7 @@ void Fl_Native_File_Chooser_FLTK_Driver::title(const char *val) { } const char *Fl_Native_File_Chooser_FLTK_Driver::title() const { - return(_file_chooser->label()); + return(_file_chooser->label()); } void Fl_Native_File_Chooser_FLTK_Driver::filter(const char *val) { |
