diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-03 15:46:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-03 15:46:30 +0000 |
| commit | 14f432133081273396d48e4322115d6fc1860727 (patch) | |
| tree | 2f24ea179da7f84d5e1144abf038a08db9ce1694 | |
| parent | b6e2aceb4aa69d8eac85f8944434b4af5575985b (diff) | |
Fix "create" handling of new-directory button.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2647 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | CREDITS | 2 | ||||
| -rw-r--r-- | src/Fl_File_Chooser.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_File_Chooser.fl | 11 |
4 files changed, 12 insertions, 7 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.0 + - Fl_File_Chooser::type() didn't enable/disable the new + directory button correctly. - Fl_Preferences::entryExists() did not work properly. - FLUID's image file chooser pattern was incorrect. - Fl_File_Icon::load_system_icons() now detects KDE @@ -34,6 +34,7 @@ OTHER CONTRIBUTORS Fabien Costantini Stephen Davies Greg Ercolano + Yuri Fedorchenko George Garvey Stuart Levy Mike Lindner @@ -43,5 +44,6 @@ OTHER CONTRIBUTORS Albrecht Schlosser Andrea Suatoni Paul Sydney + Emanuele Vicentini Jim Wilson Ken Yarnall diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index 10c7d68fb..1b009cd9a 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -355,9 +355,9 @@ if (t & MULTI) else fileList->type(FL_HOLD_BROWSER); if (t & CREATE) - newButton->deactivate(); -else newButton->activate(); +else + newButton->deactivate(); if (t & DIRECTORY) fileList->filetype(Fl_File_Browser::DIRECTORIES); else diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 6457b5f69..f003c2804 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -79,7 +79,7 @@ window->hide();} open } { Fl_Check_Button previewButton { label Preview - callback {preview(previewButton->value());} selected + callback {preview(previewButton->value());} xywh {10 275 170 20} down_box DOWN_BOX shortcut 0x80070 value 1 code0 {previewButton->label(preview_label);} } @@ -278,7 +278,7 @@ fileName->take_focus();} {} } { code {return (fileList->textsize());} {} } - Function {type(int t)} {return_type void + Function {type(int t)} {open return_type void } { code {type_ = t; if (t & MULTI) @@ -286,13 +286,14 @@ if (t & MULTI) else fileList->type(FL_HOLD_BROWSER); if (t & CREATE) - newButton->deactivate(); -else newButton->activate(); +else + newButton->deactivate(); if (t & DIRECTORY) fileList->filetype(Fl_File_Browser::DIRECTORIES); else - fileList->filetype(Fl_File_Browser::FILES);} {} + fileList->filetype(Fl_File_Browser::FILES);} {selected + } } Function {type()} {return_type int } { |