diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2011-02-05 22:35:51 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2011-02-05 22:35:51 +0000 |
| commit | b661be27788ef657d4c53e7d214a5ccb65bf83b9 (patch) | |
| tree | 0e66bc6b2b32b2fdb3f4ec253f76a0b684f83b97 /src | |
| parent | 46518adf5884914f4f6fc3e36bc0c4ed2ebcf846 (diff) | |
Distille the Native File Chooser files down into a single file. I would like to avoid that the common API runs out of sync between platforms (no code doubling - there was already a mismatch with 'const'), and that the users may wonder which file to include. Please check this on WIN32 and Unix. It does work on OS X.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8378 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Native_File_Chooser.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Native_File_Chooser_MAC.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_Native_File_Chooser.cxx b/src/Fl_Native_File_Chooser.cxx index 418120e19..9b08470c1 100644 --- a/src/Fl_Native_File_Chooser.cxx +++ b/src/Fl_Native_File_Chooser.cxx @@ -32,7 +32,7 @@ // Use Apple's chooser #ifdef __APPLE__ -#include <FL/Fl_Native_File_Chooser_MAC.H> +#include <FL/Fl_Native_File_Chooser.H> #endif // All else falls back to FLTK's own chooser diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index 2927d86fb..69f37d782 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/src/Fl_Native_File_Chooser_MAC.mm @@ -332,7 +332,7 @@ void Fl_Native_File_Chooser::preset_file(const char* val) { // PRESET FILE // Returned value can be NULL if none set. // -const char* Fl_Native_File_Chooser::preset_file() { +const char* Fl_Native_File_Chooser::preset_file() const { return(_preset_file); } |