diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-04 12:21:34 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-04 12:21:34 +0000 |
| commit | e4727142d4c48198e708ba2bd4068daf8062abaf (patch) | |
| tree | b2394dd6b76d749af4deea2ebaf88e840adfad11 /src/Fl_FileChooser2.cxx | |
| parent | 00f126367d73a2e860ca22a093a66fd1703f412a (diff) | |
Fl_Text* widgets backported to 1.1 (Carl, please confirm that I haven't
goofed with the layout->resize conversion. Also check fix for mMaxSize
being 0 so I set it to textsize())
contrast,inactive -> fl_contrast, fl_inactive, with defines for old names.
fl_rect() and fl_rectf() with color args.
fl_height, etc. with font,size args.
Send FL_RELEASE and FL_DRAG events to the pushed() widget by default.
Fix file chooser so it doesn't automatically change dirs if the only
matching name is a dir.
Updated Fl_Browser_ and Fl_Scrollbar for better mouse wheel support.
Moved DLL definitions to new Fl_Export.H.
Restore callback functionality in file chooser.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1550 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_FileChooser2.cxx')
| -rw-r--r-- | src/Fl_FileChooser2.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/Fl_FileChooser2.cxx b/src/Fl_FileChooser2.cxx index 67ab98ff6..e353f56f2 100644 --- a/src/Fl_FileChooser2.cxx +++ b/src/Fl_FileChooser2.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_FileChooser2.cxx,v 1.15.2.1 2001/08/02 16:17:04 easysw Exp $" +// "$Id: Fl_FileChooser2.cxx,v 1.15.2.2 2001/08/04 12:21:33 easysw Exp $" // // More Fl_FileChooser routines. // @@ -431,7 +431,14 @@ Fl_FileChooser::fileListCB() upButton->activate(); } else + { + // Do any callback that is registered... + if (callback_) + (*callback_)(this, data_); + + // Hide the window... window->hide(); + } } else { @@ -542,6 +549,10 @@ Fl_FileChooser::fileNameCB() if (type_ == MULTI) type(SINGLE); + // Do any callback that is registered... + if (callback_) + (*callback_)(this, data_); + // Hide the window to signal things are done... window->hide(); } @@ -614,6 +625,13 @@ Fl_FileChooser::fileNameCB() pathname[sizeof(pathname) - 1] = '\0'; max_match = strlen(pathname); + // Strip trailing /, if any... + if (pathname[max_match - 1] == '/') + { + max_match --; + pathname[max_match] = '\0'; + } + // And then make sure that the item is visible fileList->topline(i); first_line = i; @@ -673,5 +691,5 @@ Fl_FileChooser::fileNameCB() // -// End of "$Id: Fl_FileChooser2.cxx,v 1.15.2.1 2001/08/02 16:17:04 easysw Exp $". +// End of "$Id: Fl_FileChooser2.cxx,v 1.15.2.2 2001/08/04 12:21:33 easysw Exp $". // |