summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2005-02-05 23:00:59 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2005-02-05 23:00:59 +0000
commit01e47d8f247c9c2d41c5229ac582145a631752f7 (patch)
treecb62d717928c61a50d4cb770a15741da853f1841
parent4d3a3a7f66e41e51697606b2748d27957aad677d (diff)
The file chooser didn't always deactivate the OK button when
necessary (STR #653) src/Fl_File_Chooser2.cxx: - Fl_File_Chooser::fileListCB(): deactivate OK button when the current item is not the right type. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4021 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_File_Chooser2.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 3343b8316..bea511d18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648)
+ - The file chooser didn't always deactivate the OK
+ button when necessary (STR #653)
- Image drawing on OSX changed the current drawing
colors (STR #662)
- Fixed some compiler errors on WIN32 (STR #647)
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index b615fe1ca..a53d670b0 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -433,6 +433,8 @@ Fl_File_Chooser::fileListCB()
// Activate the OK button as needed...
if (!fl_filename_isdir(pathname) || (type_ & DIRECTORY))
okButton->activate();
+ else
+ okButton->deactivate();
}
}