VC++ fixes, plus add new tiled_image project file.

Use the plastic box type for the tiled_image demo.


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

3 files changed, 25 insertions, 20 deletions

diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index c4864d36e..9218bb540 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.4 2001/11/22 15:35:01 easysw Exp $"
+// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24:43 easysw Exp $"
 //
 // Bitmap header file for the Fast Light Tool Kit (FLTK).
 //
@@ -38,9 +38,9 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
   Fl_Bitmask id; // for internal use
 
   Fl_Bitmap(const uchar *bits, int W, int H) :
-    Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data(&((const char *)array), 1);}
+    Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((char **)&array, 1);}
   Fl_Bitmap(const char *bits, int W, int H) :
-    Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data(&((const char *)array), 1);}
+    Fl_Image(W,H,0), array((const uchar *)bits), alloc_array(0), id(0) {data((char **)&array, 1);}
   virtual ~Fl_Bitmap();
   virtual Fl_Image *copy(int W, int H);
   Fl_Image *copy() { return copy(w(), h()); }
@@ -53,5 +53,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
 #endif
 
 //
-// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.4 2001/11/22 15:35:01 easysw Exp $".
+// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.5 2001/11/29 00:24:43 easysw Exp $".
 //
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index e3331b9e8..aaacdb9b4 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Image.H,v 1.5.2.3.2.7 2001/11/25 16:38:10 easysw Exp $"
+// "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24:43 easysw Exp $"
 //
 // Image header file for the Fast Light Tool Kit (FLTK).
 //
@@ -76,7 +76,7 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
   Fl_Bitmask mask; // for internal use (mask bitmap)
 
   Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) :
-    Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data(&((char *)array), 1); ld(LD);}
+    Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data((char **)&array, 1); ld(LD);}
   virtual ~Fl_RGB_Image();
   virtual Fl_Image *copy(int W, int H);
   Fl_Image *copy() { return copy(w(), h()); }
@@ -91,5 +91,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
 #endif
 
 //
-// End of "$Id: Fl_Image.H,v 1.5.2.3.2.7 2001/11/25 16:38:10 easysw Exp $".
+// End of "$Id: Fl_Image.H,v 1.5.2.3.2.8 2001/11/29 00:24:43 easysw Exp $".
 //
diff --git a/FL/filename.H b/FL/filename.H
index ecc82210b..98ac6cb7d 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -1,5 +1,5 @@
 //
-// "$Id: filename.H,v 1.11.2.4.2.2 2001/11/26 00:15:06 easysw Exp $"
+// "$Id: filename.H,v 1.11.2.4.2.3 2001/11/29 00:24:43 easysw Exp $"
 //
 // Filename header file for the Fast Light Tool Kit (FLTK).
 //
@@ -24,35 +24,40 @@
 //
 
 #ifndef FL_FILENAME_H
-#define FL_FILENAME_H
+#  define FL_FILENAME_H
 
 #  include "Fl_Export.H"
 
-#define FL_PATH_MAX 256 // all buffers are this length
+#  define FL_PATH_MAX 256 // all buffers are this length
 
 FL_EXPORT const char *filename_name(const char *); // return pointer to name
 FL_EXPORT const char *filename_ext(const char *); // return pointer to .ext
 FL_EXPORT char *filename_setext(char *to, int tolen, const char *ext); // clobber .ext
-inline char *filename_setext(char *to, const char *ext) { return filename_setext(to, FL_PATH_MAX, ext); }
 FL_EXPORT int filename_expand(char *to, int tolen, const char *from); // do $x and ~x
-inline int filename_expand(char *to, const char *from) { return filename_expand(to, FL_PATH_MAX, from); }
 FL_EXPORT int filename_absolute(char *to, int tolen, const char *from); // prepend getcwd()
-inline int filename_absolute(char *to, const char *from) { return filename_absolute(to, FL_PATH_MAX, from); }
 FL_EXPORT int filename_relative(char *to, int tolen, const char *from); // make local to getcwd()
-inline int filename_relative(char *to, const char *from) { return filename_relative(to, FL_PATH_MAX, from); }
 FL_EXPORT int filename_match(const char *name, const char *pattern); // glob match
 FL_EXPORT int filename_isdir(const char *name);
 
+#  ifdef __cplusplus
+// Under WIN32, we include filename.H from numericsort.c; this should probably change
+inline char *filename_setext(char *to, const char *ext) { return filename_setext(to, FL_PATH_MAX, ext); }
+inline int filename_expand(char *to, const char *from) { return filename_expand(to, FL_PATH_MAX, from); }
+inline int filename_absolute(char *to, const char *from) { return filename_absolute(to, FL_PATH_MAX, from); }
+inline int filename_relative(char *to, const char *from) { return filename_relative(to, FL_PATH_MAX, from); }
+#  endif // __cplusplus
+
+
 // Portable "scandir" function.  Ugly but apparently necessary...
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#  if defined(WIN32) && !defined(__CYGWIN__)
 
 struct dirent {char d_name[1];};
 
-#else
+#  else
 
-#include <sys/types.h>
-#include <dirent.h>
+#    include <sys/types.h>
+#    include <dirent.h>
 // warning: on some systems (very few nowadays?) <dirent.h> may not exist.
 // The correct information is in one of these files:
 //#include <sys/ndir.h>
@@ -62,12 +67,12 @@ struct dirent {char d_name[1];};
 //#define dirent direct
 // It would be best to create a <dirent.h> file that does this...
 
-#endif
+#  endif
 
 FL_EXPORT int filename_list(const char *d, struct dirent ***list);
 
 #endif
 
 //
-// End of "$Id: filename.H,v 1.11.2.4.2.2 2001/11/26 00:15:06 easysw Exp $".
+// End of "$Id: filename.H,v 1.11.2.4.2.3 2001/11/29 00:24:43 easysw Exp $".
 //