diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-10-30 21:52:38 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-10-30 21:52:38 +0000 |
| commit | 8ad7e5ccc002031027318c3bc3ecbd3b2c0a86b8 (patch) | |
| tree | 5c43d0da3a2222cec29942d843d5931448f64d96 | |
| parent | b5a73c78e61c18f4d08aec39a6edf5b19b1dbfd4 (diff) | |
Added callback when double-clicking file in a file chooser (STR#2346)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7783 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | FL/Fl_Preferences.H | 2 | ||||
| -rw-r--r-- | src/Fl_File_Chooser2.cxx | 1 | ||||
| -rw-r--r-- | src/Fl_Preferences.cxx | 1 | ||||
| -rw-r--r-- | test/pixmap_browser.cxx | 2 |
5 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.3.0 + - Added callback when double-clicking file in a file chooser + (STR #2346) - Fixed label alignment (STR #2436) - Added interface to set color chooser mode (STR #2407) - Fixed compile errors when HAVE_LIBJPEG was not defined diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H index 49d66247e..d111419ef 100644 --- a/FL/Fl_Preferences.H +++ b/FL/Fl_Preferences.H @@ -156,8 +156,6 @@ public: // char export( const char *filename, Type fileFormat ); // char import( const char *filename ); - // char copyTo(class Fl_Tree*); // deprecated, use Fl_Tree::load(Fl_Preferences&) - /** 'Name' provides a simple method to create numerical or more complex procedural names for entries and groups on the fly. diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 33b7e3f2e..93335dc89 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -727,6 +727,7 @@ Fl_File_Chooser::fileListCB() { // Hide the window - picked the file... window->hide(); + if (callback_) (*callback_)(this, data_); } } else diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index d8d3eaf10..f4c58be48 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -28,7 +28,6 @@ #include <FL/Fl.H> #include <FL/Fl_Preferences.H> #include <FL/Fl_Plugin.H> -#include <FL/Fl_Tree.H> #include <FL/filename.H> #include <stdio.h> diff --git a/test/pixmap_browser.cxx b/test/pixmap_browser.cxx index 4df8c1fed..6841fe943 100644 --- a/test/pixmap_browser.cxx +++ b/test/pixmap_browser.cxx @@ -88,7 +88,7 @@ void file_cb(const char *n) { void button_cb(Fl_Widget *,void *) { fl_file_chooser_callback(file_cb); - fl_file_chooser("Image file?","*.{bm,bmp,gif,jpg,pbm,pgm,png,ppm,xbm,xpm}", name); + puts(fl_file_chooser("Image file?","*.{bm,bmp,gif,jpg,pbm,pgm,png,ppm,xbm,xpm}", name)); fl_file_chooser_callback(0); } |