diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-09-23 13:08:03 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-09-23 13:08:03 +0000 |
| commit | 91b72d091872048fe0cdb11b67b2be86c34fccc9 (patch) | |
| tree | ee1e3f8bb20b3ec0f3aef43380e7517839c52d5a /fluid | |
| parent | 5aa3ce735eb514bee64d878d9443ae1704d2cc33 (diff) | |
Update VC++ project files.
Add support for FLTK_DOCDIR env var. to FLUID.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1588 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/fluid.cxx | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index d0af61e65..6f053f9f9 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13.2.4 2001/09/13 18:21:40 easysw Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.5 2001/09/23 13:08:02 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -64,6 +64,11 @@ const char *copyright = #include <errno.h> #include <config.h> +#if !HAVE_SNPRINTF +extern "C" { +extern int snprintf(char* str, size_t size, const char* fmt, ...); +} +#endif // !HAVE_SNPRINTF #if defined(WIN32) && !defined(__CYGWIN__) # include <direct.h> @@ -341,16 +346,27 @@ void about_cb(Fl_Widget *, void *) { about_panel->show(); } -void help_cb(Fl_Widget *, void *) { +void show_help(const char *name) { + const char *docdir; + char filename[1024]; + if (!help_dialog) help_dialog = new Fl_HelpDialog(); - help_dialog->load(FLTK_DOCDIR "/fluid.html"); + + if ((docdir = getenv("FLTK_DOCDIR")) == NULL) + docdir = FLTK_DOCDIR; + + snprintf(filename, sizeof(filename), "%s/%s", docdir, name); + + help_dialog->load(filename); help_dialog->show(); } +void help_cb(Fl_Widget *, void *) { + show_help("fluid.html"); +} + void manual_cb(Fl_Widget *, void *) { - if (!help_dialog) help_dialog = new Fl_HelpDialog(); - help_dialog->load(FLTK_DOCDIR "/index.html"); - help_dialog->show(); + show_help("index.html"); } //////////////////////////////////////////////////////////////// @@ -502,5 +518,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13.2.4 2001/09/13 18:21:40 easysw Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.5 2001/09/23 13:08:02 easysw Exp $". // |