Updated version to 1.0.8.

Applied colors patch.

Updated doco makefile for current version of HTMLDOC.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1015 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 32 insertions, 18 deletions

diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 2f71b5170..1a9f14f6e 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Enumerations.H,v 1.18.2.7 1999/12/17 18:51:23 mike Exp $"
+// "$Id: Enumerations.H,v 1.18.2.8 2000/02/25 03:44:19 mike Exp $"
 //
 // Enumerations for the Fast Light Tool Kit (FLTK).
 //
@@ -56,9 +56,10 @@
 
 #define FL_MAJOR_VERSION	1
 #define FL_MINOR_VERSION	0
-#define FL_PATCH_VERSION	7
+#define FL_PATCH_VERSION	8
 #define FL_VERSION		((double)FL_MAJOR_VERSION + \
-				 (double)FL_MINOR_VERSION * 0.01)
+				 (double)FL_MINOR_VERSION * 0.01 + \
+				 (double)FL_PATCH_VERSION * 0.0001)
 
 typedef unsigned char uchar;
 typedef unsigned long ulong;
@@ -365,5 +366,5 @@ enum Fl_Damage {
 #endif
 
 //
-// End of "$Id: Enumerations.H,v 1.18.2.7 1999/12/17 18:51:23 mike Exp $".
+// End of "$Id: Enumerations.H,v 1.18.2.8 2000/02/25 03:44:19 mike Exp $".
 //
diff --git a/documentation/Makefile b/documentation/Makefile
index 62e8c46ff..4939f5d84 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9.2.2 1999/06/12 13:53:23 mike Exp $"
+# "$Id: Makefile,v 1.9.2.3 2000/02/25 03:44:20 mike Exp $"
 #
 # Documentation makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -23,7 +23,7 @@
 # Please report all bugs and problems to "fltk-bugs@easysw.com".
 #
 
-# Where to find HTMLDOC...
+# Where to find HTMLDOC (http://www.easysw.com/htmldoc)...
 HTMLDOC		=	htmldoc
 
 # What media size to use:
@@ -130,17 +130,17 @@ fltk.d/index.html: $(HTMLFILES)
 	@echo "Generating HTML documentation..."
 	@-mkdir fltk.d
 	@-rm -f fltk.d/*
-	@$(HTMLDOC) -d fltk.d -t html --verbose --toclevels 2 --bodycolor white --title FL.gif $(HTMLFILES)
+	@$(HTMLDOC) -d fltk.d -t html --verbose --toclevels 2 --bodycolor white --titleimage FL.gif $(HTMLFILES)
 
 fltk.ps: $(HTMLFILES)
 	@echo "Generating PostScript documentation..."
-	@$(HTMLDOC) -f fltk.ps -t ps2 --duplex --verbose --toclevels 2 --title FL.gif $(HTMLFILES)
+	@$(HTMLDOC) -f fltk.ps -t ps2 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
 
 fltk.pdf: $(HTMLFILES)
 	@echo "Generating PDF documentation..."
 	@rm -f fltk.pdf
-	@$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --title FL.gif $(HTMLFILES)
+	@$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
 
 #
-# End of "$Id: Makefile,v 1.9.2.2 1999/06/12 13:53:23 mike Exp $".
+# End of "$Id: Makefile,v 1.9.2.3 2000/02/25 03:44:20 mike Exp $".
 #
diff --git a/fluid/code.cxx b/fluid/code.cxx
index 5d2270951..6503e02c9 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: code.cxx,v 1.9.2.2 1999/08/05 08:01:39 bill Exp $"
+// "$Id: code.cxx,v 1.9.2.3 2000/02/25 03:44:21 mike Exp $"
 //
 // Code output routines for the Fast Light Tool Kit (FLTK).
 //
@@ -264,7 +264,7 @@ int write_code(const char *s, const char *t) {
     header_file = f;
   }
   const char *hdr = "\
-// generated by Fast Light User Interface Designer (fluid) version %.2f\n\n";
+// generated by Fast Light User Interface Designer (fluid) version %.4f\n\n";
   fprintf(header_file, hdr, FL_VERSION);
   fprintf(code_file, hdr, FL_VERSION);
 
@@ -312,5 +312,5 @@ void Fl_Type::write_code1() {
 void Fl_Type::write_code2() {}
 
 //
-// End of "$Id: code.cxx,v 1.9.2.2 1999/08/05 08:01:39 bill Exp $".
+// End of "$Id: code.cxx,v 1.9.2.3 2000/02/25 03:44:21 mike Exp $".
 //
diff --git a/fluid/file.cxx b/fluid/file.cxx
index a1f90601b..2a6902bd3 100644
--- a/fluid/file.cxx
+++ b/fluid/file.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: file.cxx,v 1.7 1999/03/04 18:10:00 mike Exp $"
+// "$Id: file.cxx,v 1.7.2.1 2000/02/25 03:44:22 mike Exp $"
 //
 // Fluid file routines for the Fast Light Tool Kit (FLTK).
 //
@@ -320,7 +320,7 @@ extern const char* code_file_name;
 int write_file(const char *filename, int selected_only) {
   if (!open_write(filename)) return 0;
   write_string("# data file for the Fltk User Interface Designer (fluid)\n"
-	       "version %.2f",FL_VERSION);
+	       "version %.4f",FL_VERSION);
   if(!include_H_from_C)
     write_string("\ndo_not_include_H_from_C");
   if (!selected_only) {
@@ -592,5 +592,5 @@ void read_fdesign() {
 }
 
 //
-// End of "$Id: file.cxx,v 1.7 1999/03/04 18:10:00 mike Exp $".
+// End of "$Id: file.cxx,v 1.7.2.1 2000/02/25 03:44:22 mike Exp $".
 //
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 3cae6e9a9..d69177d14 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_get_system_colors.cxx,v 1.6.2.1 1999/10/19 04:50:34 bill Exp $"
+// "$Id: Fl_get_system_colors.cxx,v 1.6.2.2 2000/02/25 03:44:22 mike Exp $"
 //
 // System color support for the Fast Light Tool Kit (FLTK).
 //
@@ -121,16 +121,29 @@ getsyscolor(const char *arg, void (*func)(uchar,uchar,uchar)) {
   }
 }
 
+static const char *
+xdefaultcolor (const char *flcol, const char *key1, const char *key2)
+{
+  if (!flcol)
+    return XGetDefault (fl_display, key1, key2);
+  else
+    return flcol;
+}
+
 void Fl::get_system_colors()
 {
   fl_open_display();
+
+  fl_bg2 = xdefaultcolor (fl_bg2, "Entry", "background");
   getsyscolor(fl_bg2,Fl::background2);
+  fl_bg = xdefaultcolor (fl_bg, "*", "background");
   getsyscolor(fl_fg, Fl::foreground);
+  fl_fg = xdefaultcolor (fl_fg, "*", "foreground");
   getsyscolor(fl_bg, Fl::background);
 }
 
 #endif
 
 //
-// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.1 1999/10/19 04:50:34 bill Exp $".
+// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.2 2000/02/25 03:44:22 mike Exp $".
 //