Author: mike
Date: 2006-01-31 11:22:06 -0500 (Tue, 31 Jan 2006)
New Revision: 4781

Modified:
   branches/branch-1.1/CHANGES
   branches/branch-1.1/fluid/file.cxx
Log:
FLUID didn't handle loading .fl files with international
characters properly with all compilers (STR #1150)



Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES	2006-01-31 16:06:45 UTC (rev 4780)
+++ branches/branch-1.1/CHANGES	2006-01-31 16:22:06 UTC (rev 4781)
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.8
 
+	- FLUID didn't handle loading .fl files with
+	  international characters properly with all compilers
+	  (STR #1150)
 	- Fl_Spinner's minimum() and maximum() "get" methods were
 	  misspelled (STR #1146)
 	- The largefile support changes in 1.1.7 broke binary

Modified: branches/branch-1.1/fluid/file.cxx
===================================================================
--- branches/branch-1.1/fluid/file.cxx	2006-01-31 16:06:45 UTC (rev 4780)
+++ branches/branch-1.1/fluid/file.cxx	2006-01-31 16:22:06 UTC (rev 4781)
@@ -101,7 +101,7 @@
   if (needspace) fputc(' ',fout);
   vfprintf(fout, format, args);
   va_end(args);
-  needspace = !isspace(format[strlen(format)-1]);
+  needspace = !isspace(format[strlen(format)-1] & 255);
 }
 
 // start a new line and indent it for a given nesting level:
@@ -246,7 +246,7 @@
       continue;
     } else if (x == '\n') {
       lineno++;
-    } else if (!isspace(x)) {
+    } else if (!isspace(x & 255)) {
       break;
     }
   }
@@ -287,7 +287,7 @@
     int length = 0;
     for (;;) {
       if (x == '\\') {x = read_quoted(); if (x<0) continue;}
-      else if (x<0 || isspace(x) || x=='{' || x=='}' || x=='#') break;
+      else if (x<0 || isspace(x & 255) || x=='{' || x=='}' || x=='#') break;
       buffer[length++] = x;
       expand_buffer(length);
       x = getc(fin);
@@ -519,7 +519,7 @@
     x = getc(fin);
     if (x < 0) return 0;
     if (x == '\n') {length = 0; continue;} // no colon this line...
-    if (!isspace(x)) {
+    if (!isspace(x & 255)) {
       buffer[length++] = x;
       expand_buffer(length);
     }
@@ -531,7 +531,7 @@
   // skip to start of value:
   for (;;) {
     x = getc(fin);
-    if (x < 0 || x == '\n' || !isspace(x)) break;
+    if (x < 0 || x == '\n' || !isspace(x & 255)) break;
   }
 
   // read the value: