Fix OK button when doing directory selection.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2708 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
521ab78b9a
commit
263f2ed1e6
2
CHANGES
2
CHANGES
@ -1,5 +1,7 @@
|
||||
CHANGES IN FLTK 1.1.2
|
||||
|
||||
- The file chooser now activates the OK button when
|
||||
opening a directory in directory selection mode.
|
||||
- Fixed a bug in the file chooser when entering an
|
||||
absolute path.
|
||||
- Back-ported some FLTK 2.0 tooltip changes to eliminate
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.25 2002/10/29 20:07:34 easysw Exp $"
|
||||
// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.26 2002/10/29 20:12:36 easysw Exp $"
|
||||
//
|
||||
// More Fl_File_Chooser routines.
|
||||
//
|
||||
@ -779,13 +779,18 @@ Fl_File_Chooser::rescan()
|
||||
{
|
||||
char pathname[1024]; // New pathname for filename field
|
||||
|
||||
|
||||
// Clear the current filename
|
||||
strlcpy(pathname, directory_, sizeof(pathname));
|
||||
if (pathname[0] && pathname[strlen(pathname) - 1] != '/') {
|
||||
strlcat(pathname, "/", sizeof(pathname));
|
||||
}
|
||||
fileName->value(pathname);
|
||||
okButton->deactivate();
|
||||
|
||||
if (type_ & DIRECTORY)
|
||||
okButton->activate();
|
||||
else
|
||||
okButton->deactivate();
|
||||
|
||||
// Build the file list...
|
||||
fileList->load(directory_, sort);
|
||||
@ -1147,5 +1152,5 @@ unquote_pathname(char *dst, // O - Destination string
|
||||
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.25 2002/10/29 20:07:34 easysw Exp $".
|
||||
// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.26 2002/10/29 20:12:36 easysw Exp $".
|
||||
//
|
||||
|
||||
Loading…
Reference in New Issue
Block a user