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 | |
| 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
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 30 | ||||
| -rw-r--r-- | visualc/config.h | 9 | ||||
| -rw-r--r-- | visualc/fltk.lib.dsp | 4 | ||||
| -rw-r--r-- | visualc/fltkdll.dsp | 24 |
5 files changed, 58 insertions, 12 deletions
@@ -27,6 +27,9 @@ CHANGES IN FLTK 1.1.0b2 COLSPAN. - The FLUID keyboard shortcuts now work as expected (CTRL-C copies, SHIFT-CTRL-C writes code, etc.) + - The FLTK_DOCDIR environment variable can now be + used to tell FLUID where to find the on-line + documentation files. CHANGES IN FLTK 1.1.0b1 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 $". // diff --git a/visualc/config.h b/visualc/config.h index 5b4b53792..5794618ff 100644 --- a/visualc/config.h +++ b/visualc/config.h @@ -1,5 +1,5 @@ /* - * "$Id: config.h,v 1.5.2.5.2.2 2001/08/19 00:14:11 easysw Exp $" + * "$Id: config.h,v 1.5.2.5.2.3 2001/09/23 13:08:03 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++. * @@ -23,8 +23,13 @@ * Please report all bugs and problems to "fltk-bugs@fltk.org". */ +/* + * Where to find the documentation files... + */ + #define FLTK_DOCDIR "C:/FLTK/DOC" + /* * BORDER_WIDTH: * @@ -169,5 +174,5 @@ #undef HAVE_PNG_GET_VALID /* - * End of "$Id: config.h,v 1.5.2.5.2.2 2001/08/19 00:14:11 easysw Exp $". + * End of "$Id: config.h,v 1.5.2.5.2.3 2001/09/23 13:08:03 easysw Exp $". */ diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp index e86660bec..fa1f8a7e3 100644 --- a/visualc/fltk.lib.dsp +++ b/visualc/fltk.lib.dsp @@ -395,6 +395,10 @@ SOURCE=..\src\Fl_Positioner.cxx # End Source File
# Begin Source File
+SOURCE=..\src\Fl_Progress.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\src\fl_rect.cxx
# End Source File
# Begin Source File
diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp index 60f12d626..1c878dd2a 100644 --- a/visualc/fltkdll.dsp +++ b/visualc/fltkdll.dsp @@ -383,17 +383,21 @@ SOURCE=..\src\Fl_Check_Browser.cxx DEP_CPP_FL_CHE=\
"..\fl\enumerations.h"\
"..\fl\fl.h"\
- "..\fl\fl_button.h"\
+ "..\fl\fl_browser_.h"\
"..\fl\fl_check_browser.h"\
+ "..\fl\fl_draw.h"\
"..\fl\fl_export.h"\
- "..\fl\fl_light_button.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_scrollbar.h"\
+ "..\fl\fl_slider.h"\
+ "..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
# End Source File
# Begin Source File
SOURCE=..\src\Fl_Check_Button.cxx
-DEP_CPP_FL_CHE=\
+DEP_CPP_FL_CHEC=\
"..\fl\enumerations.h"\
"..\fl\fl.h"\
"..\fl\fl_button.h"\
@@ -849,6 +853,7 @@ DEP_CPP_FL_HE=\ "..\fl\enumerations.h"\
"..\fl\fl.h"\
"..\fl\fl_button.h"\
+ "..\fl\fl_double_window.h"\
"..\fl\fl_draw.h"\
"..\fl\fl_export.h"\
"..\fl\fl_group.h"\
@@ -931,6 +936,7 @@ DEP_CPP_FL_LA=\ "..\fl\fl_draw.h"\
"..\fl\fl_export.h"\
"..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
"..\fl\fl_input_.h"\
"..\fl\fl_widget.h"\
@@ -1201,6 +1207,18 @@ DEP_CPP_FL_PO=\ # End Source File
# Begin Source File
+SOURCE=..\src\Fl_Progress.cxx
+DEP_CPP_FL_PR=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_draw.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_progress.h"\
+ "..\fl\fl_widget.h"\
+
+# End Source File
+# Begin Source File
+
SOURCE=..\src\fl_rect.cxx
DEP_CPP_FL_RE=\
"..\fl\enumerations.h"\
|