summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FL/Fl_Bitmap.H8
-rw-r--r--FL/Fl_Image.H6
-rw-r--r--FL/filename.H31
-rw-r--r--src/Fl_Shared_Image.cxx6
-rw-r--r--src/numericsort.c32
-rw-r--r--test/tiled_image.cxx5
-rw-r--r--visualc/fltk.dsw18
-rw-r--r--visualc/fltk.lib.dsp21
-rw-r--r--visualc/fltkdll.dsp189
-rw-r--r--visualc/tiled_image.dsp97
10 files changed, 368 insertions, 45 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 $".
//
diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx
index 996ea39ff..8e911fc5a 100644
--- a/src/Fl_Shared_Image.cxx
+++ b/src/Fl_Shared_Image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Shared_Image.cxx,v 1.23.2.2 2001/11/24 18:07:57 easysw Exp $"
+// "$Id: Fl_Shared_Image.cxx,v 1.23.2.3 2001/11/29 00:24:43 easysw Exp $"
//
// Shared image code for the Fast Light Tool Kit (FLTK).
//
@@ -157,7 +157,7 @@ Fl_Shared_Image::update() {
//
Fl_Shared_Image::~Fl_Shared_Image() {
- if (name_) delete name_;
+ if (name_) delete[] (char *)name_;
if (alloc_image_) delete image_;
}
@@ -376,5 +376,5 @@ Fl_Shared_Image::get(const char *n, int W, int H) {
//
-// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.2 2001/11/24 18:07:57 easysw Exp $".
+// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.3 2001/11/29 00:24:43 easysw Exp $".
//
diff --git a/src/numericsort.c b/src/numericsort.c
index 61b7931c5..a29230d2f 100644
--- a/src/numericsort.c
+++ b/src/numericsort.c
@@ -1,5 +1,5 @@
/*
- * "$Id: numericsort.c,v 1.10.2.4 2001/01/22 15:13:41 easysw Exp $"
+ * "$Id: numericsort.c,v 1.10.2.4.2.1 2001/11/29 00:24:43 easysw Exp $"
*
* Numeric sorting routine for the Fast Light Tool Kit (FLTK).
*
@@ -32,22 +32,20 @@
#include <sys/types.h>
#if defined(WIN32) && !defined(__CYGWIN__)
-#include <FL/filename.H>
+# include <FL/filename.H>
+#elif defined(HAVE_DIRENT_H)
+# include <dirent.h>
#else
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-#endif
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
#endif
#ifdef __cplusplus
@@ -84,5 +82,5 @@ int numericsort(struct dirent **A, struct dirent **B) {
}
/*
- * End of "$Id: numericsort.c,v 1.10.2.4 2001/01/22 15:13:41 easysw Exp $".
+ * End of "$Id: numericsort.c,v 1.10.2.4.2.1 2001/11/29 00:24:43 easysw Exp $".
*/
diff --git a/test/tiled_image.cxx b/test/tiled_image.cxx
index a888fc99f..ca11a02f7 100644
--- a/test/tiled_image.cxx
+++ b/test/tiled_image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: tiled_image.cxx,v 1.1.2.2 2001/11/27 17:44:08 easysw Exp $"
+// "$Id: tiled_image.cxx,v 1.1.2.3 2001/11/29 00:24:43 easysw Exp $"
//
// Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK).
//
@@ -88,6 +88,7 @@ int main(int argc, char **argv) {
Fl_Button b(340,365,50,25,"Close"); ::b = &b;
b.callback(button_cb);
+ b.box(FL_PLASTIC_UP_BOX);
group.end();
@@ -99,5 +100,5 @@ int main(int argc, char **argv) {
}
//
-// End of "$Id: tiled_image.cxx,v 1.1.2.2 2001/11/27 17:44:08 easysw Exp $".
+// End of "$Id: tiled_image.cxx,v 1.1.2.3 2001/11/29 00:24:43 easysw Exp $".
//
diff --git a/visualc/fltk.dsw b/visualc/fltk.dsw
index e3f7bd7bb..2b22e3b07 100644
--- a/visualc/fltk.dsw
+++ b/visualc/fltk.dsw
@@ -431,6 +431,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name line_style
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name tiled_image
+ End Project Dependency
}}}
###############################################################################
@@ -1083,6 +1086,21 @@ Package=<4>
###############################################################################
+Project: "tiled_image"=".\tiled_image.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name fltk
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "valuators"=".\valuators.dsp" - Package Owner=<4>
Package=<5>
diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp
index 292eb2095..e1203b495 100644
--- a/visualc/fltk.lib.dsp
+++ b/visualc/fltk.lib.dsp
@@ -404,7 +404,6 @@ SOURCE=..\src\Fl_Pixmap.cxx
# Begin Source File
SOURCE=..\src\fl_plastic.cxx
-
# End Source File
# Begin Source File
@@ -412,6 +411,10 @@ SOURCE=..\src\Fl_PNG_Image.cxx
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_PNM_Image.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\src\Fl_Positioner.cxx
# End Source File
# Begin Source File
@@ -472,6 +475,10 @@ SOURCE=..\src\fl_shadow_box.cxx
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_Shared_Image.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\src\fl_shortcut.cxx
# End Source File
# Begin Source File
@@ -512,6 +519,10 @@ SOURCE=..\src\Fl_Tile.cxx
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_Tiled_Image.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\src\Fl_Tooltip.cxx
# End Source File
# Begin Source File
@@ -568,6 +579,14 @@ SOURCE=..\src\Fl_x.cxx
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_XBM_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\Fl_XPM_Image.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\src\forms_bitmap.cxx
# End Source File
# Begin Source File
diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index 0cc3fc14a..b11077598 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -95,6 +95,8 @@ SOURCE=..\src\filename_absolute.cxx
DEP_CPP_FILEN=\
"..\fl\filename.h"\
"..\fl\fl_export.h"\
+ "..\src\flstring.h"\
+ ".\config.h"\
# End Source File
# Begin Source File
@@ -159,6 +161,7 @@ DEP_CPP_FL_CX=\
"..\fl\fl_tooltip.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -170,6 +173,7 @@ DEP_CPP_FL_AB=\
"..\fl\enumerations.h"\
"..\fl\fl.h"\
"..\fl\fl_export.h"\
+ "..\src\flstring.h"\
".\config.h"\
# End Source File
@@ -197,6 +201,7 @@ DEP_CPP_FL_ADJ=\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fastarrow.h"\
@@ -224,6 +229,7 @@ DEP_CPP_FL_ARC=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\FL\math.h"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -241,6 +247,7 @@ DEP_CPP_FL_ARG=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -262,8 +269,10 @@ DEP_CPP_FL_AS=\
"..\fl\fl_secret_input.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\flstring.h"\
".\config.h"\
# End Source File
@@ -281,6 +290,7 @@ DEP_CPP_FL_BI=\
"..\fl\fl_menu_item.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -448,9 +458,11 @@ DEP_CPP_FL_CO=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fl_cmap.h"\
+ "..\src\fl_color_mac.cxx"\
"..\src\fl_color_win32.cxx"\
"..\src\Fl_XColor.H"\
".\config.h"\
@@ -514,6 +526,7 @@ DEP_CPP_FL_CU=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -537,8 +550,10 @@ DEP_CPP_FL_CUT=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\Fl_cutpaste_mac.cxx"\
"..\src\fl_cutpaste_win32.cxx"\
# End Source File
@@ -587,6 +602,7 @@ DEP_CPP_FL_DO=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -603,6 +619,7 @@ DEP_CPP_FL_DR=\
"..\fl\fl_image.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -618,8 +635,10 @@ DEP_CPP_FL_DRA=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\fl_draw_image_mac.cxx"\
"..\src\fl_draw_image_win32.cxx"\
"..\src\Fl_XColor.H"\
".\config.h"\
@@ -636,6 +655,7 @@ DEP_CPP_FL_DRAW=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -670,6 +690,7 @@ DEP_CPP_FL_FI=\
"..\fl\fl_slider.h"\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
+ "..\src\flstring.h"\
".\config.h"\
# End Source File
@@ -701,6 +722,7 @@ DEP_CPP_FL_FIL=\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -732,8 +754,11 @@ DEP_CPP_FL_FILE=\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\flstring.h"\
+ ".\config.h"\
# End Source File
# Begin Source File
@@ -741,6 +766,7 @@ DEP_CPP_FL_FILE=\
SOURCE=..\src\fl_file_dir.cxx
DEP_CPP_FL_FILE_=\
"..\fl\enumerations.h"\
+ "..\fl\filename.h"\
"..\fl\fl.h"\
"..\fl\fl_ask.h"\
"..\fl\fl_browser.h"\
@@ -789,7 +815,15 @@ DEP_CPP_FL_FILE_IC=\
"..\fl\fl_draw.h"\
"..\fl\fl_export.h"\
"..\FL\Fl_File_Icon.H"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_shared_image.h"\
"..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+ "..\src\flstring.h"\
".\config.h"\
# End Source File
@@ -804,9 +838,11 @@ DEP_CPP_FL_FO=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fl_font.h"\
+ "..\src\fl_font_mac.cxx"\
"..\src\fl_font_win32.cxx"\
".\config.h"\
@@ -821,8 +857,10 @@ DEP_CPP_FL_GE=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\Fl_get_key_mac.cxx"\
"..\src\fl_get_key_win32.cxx"\
# End Source File
@@ -836,6 +874,7 @@ DEP_CPP_FL_GET=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\FL\math.h"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -846,6 +885,7 @@ DEP_CPP_FL_GET=\
SOURCE=..\src\Fl_GIF_Image.cxx
DEP_CPP_FL_GI=\
"..\fl\enumerations.h"\
+ "..\fl\fl.h"\
"..\fl\fl_export.h"\
"..\fl\fl_gif_image.h"\
"..\fl\fl_group.h"\
@@ -853,6 +893,7 @@ DEP_CPP_FL_GI=\
"..\fl\fl_pixmap.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -869,6 +910,7 @@ DEP_CPP_FL_GL=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\FL\gl.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\Fl_Gl_Choice.H"\
@@ -887,6 +929,7 @@ DEP_CPP_FL_GL_=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\FL\gl.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\Fl_Gl_Choice.H"\
@@ -905,6 +948,7 @@ DEP_CPP_FL_GL_W=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\FL\gl.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\Fl_Gl_Choice.H"\
@@ -921,6 +965,7 @@ DEP_CPP_FL_GR=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -953,11 +998,16 @@ DEP_CPP_FL_HE=\
"..\fl\fl_group.h"\
"..\FL\Fl_Help_Dialog.H"\
"..\FL\Fl_Help_View.H"\
+ "..\fl\fl_image.h"\
"..\fl\fl_scrollbar.h"\
+ "..\fl\fl_shared_image.h"\
"..\fl\fl_slider.h"\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
# End Source File
# Begin Source File
@@ -971,14 +1021,16 @@ DEP_CPP_FL_HEL=\
"..\fl\fl_group.h"\
"..\FL\Fl_Help_View.H"\
"..\fl\fl_image.h"\
- "..\fl\fl_pixmap.h"\
"..\fl\fl_scrollbar.h"\
+ "..\fl\fl_shared_image.h"\
"..\fl\fl_slider.h"\
"..\fl\fl_valuator.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\flstring.h"\
".\config.h"\
# End Source File
@@ -995,6 +1047,7 @@ DEP_CPP_FL_IM=\
"..\fl\fl_menu_item.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1036,6 +1089,7 @@ DEP_CPP_FL_JP=\
"..\fl\fl_jpeg_image.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1054,6 +1108,7 @@ DEP_CPP_FL_LA=\
"..\fl\fl_input_.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1081,6 +1136,7 @@ DEP_CPP_FL_LIN=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1177,6 +1233,7 @@ DEP_CPP_FL_MENU_W=\
"..\fl\fl_single_window.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1227,6 +1284,7 @@ DEP_CPP_FL_OVE=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1241,6 +1299,7 @@ DEP_CPP_FL_OVER=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1259,6 +1318,7 @@ DEP_CPP_FL_OVERL=\
"..\fl\fl_overlay_window.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1274,6 +1334,7 @@ DEP_CPP_FL_OW=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1306,6 +1367,7 @@ DEP_CPP_FL_PI=\
"..\fl\fl_pixmap.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1313,7 +1375,7 @@ DEP_CPP_FL_PI=\
# Begin Source File
SOURCE=..\src\fl_plastic.cxx
-DEP_CPP_FL_PLA=\
+DEP_CPP_FL_PL=\
"..\fl\enumerations.h"\
"..\fl\fl.h"\
"..\fl\fl_draw.h"\
@@ -1331,6 +1393,25 @@ DEP_CPP_FL_PN=\
"..\fl\fl_png_image.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+ ".\config.h"\
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\Fl_PNM_Image.cxx
+DEP_CPP_FL_PNM=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_pnm_image.h"\
+ "..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1370,6 +1451,7 @@ DEP_CPP_FL_RE=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1470,6 +1552,7 @@ DEP_CPP_FL_SCR=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1498,6 +1581,7 @@ DEP_CPP_FL_SE=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fl_font.h"\
@@ -1514,9 +1598,11 @@ DEP_CPP_FL_SET=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fl_font.h"\
+ "..\src\fl_set_fonts_mac.cxx"\
"..\src\fl_set_fonts_win32.cxx"\
# End Source File
@@ -1532,6 +1618,31 @@ DEP_CPP_FL_SH=\
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_Shared_Image.cxx
+DEP_CPP_FL_SHA=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_bitmap.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_gif_image.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_jpeg_image.h"\
+ "..\fl\fl_pixmap.h"\
+ "..\fl\fl_png_image.h"\
+ "..\fl\fl_pnm_image.h"\
+ "..\fl\fl_shared_image.h"\
+ "..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\fl_xbm_image.h"\
+ "..\fl\fl_xpm_image.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+
+# End Source File
+# Begin Source File
+
SOURCE=..\src\fl_shortcut.cxx
DEP_CPP_FL_SHO=\
"..\fl\enumerations.h"\
@@ -1542,6 +1653,7 @@ DEP_CPP_FL_SHO=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1668,6 +1780,24 @@ DEP_CPP_FL_TI=\
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_Tiled_Image.cxx
+DEP_CPP_FL_TIL=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_draw.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_tiled_image.h"\
+ "..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+
+# End Source File
+# Begin Source File
+
SOURCE=..\src\Fl_Tooltip.cxx
DEP_CPP_FL_TO=\
"..\fl\enumerations.h"\
@@ -1747,6 +1877,7 @@ DEP_CPP_FL_VE=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\FL\math.h"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1762,6 +1893,7 @@ DEP_CPP_FL_VI=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
".\config.h"\
@@ -1802,6 +1934,7 @@ DEP_CPP_FL_WIND=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1828,6 +1961,7 @@ DEP_CPP_FL_WINDOW=\
"..\fl\fl_group.h"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1853,16 +1987,60 @@ DEP_CPP_FL_X_=\
"..\fl\fl.h"\
"..\fl\fl_export.h"\
"..\fl\fl_group.h"\
+ "..\fl\fl_menu_.h"\
+ "..\fl\fl_menu_bar.h"\
+ "..\fl\fl_menu_item.h"\
+ "..\FL\Fl_Sys_Menu_Bar.H"\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
+ "..\src\Fl_mac.cxx"\
"..\src\fl_win32.cxx"\
".\config.h"\
# End Source File
# Begin Source File
+SOURCE=..\src\Fl_XBM_Image.cxx
+DEP_CPP_FL_XB=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_bitmap.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\fl_xbm_image.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+ ".\config.h"\
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\Fl_XPM_Image.cxx
+DEP_CPP_FL_XP=\
+ "..\fl\enumerations.h"\
+ "..\fl\fl.h"\
+ "..\fl\fl_export.h"\
+ "..\fl\fl_group.h"\
+ "..\fl\fl_image.h"\
+ "..\fl\fl_pixmap.h"\
+ "..\fl\fl_widget.h"\
+ "..\fl\fl_window.h"\
+ "..\fl\fl_xpm_image.h"\
+ "..\fl\mac.H"\
+ "..\fl\win32.h"\
+ "..\fl\x.h"\
+ ".\config.h"\
+
+# End Source File
+# Begin Source File
+
SOURCE=..\src\forms_bitmap.cxx
DEP_CPP_FORMS=\
"..\fl\enumerations.h"\
@@ -1909,6 +2087,7 @@ DEP_CPP_FORMS=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\fl\forms.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -1962,6 +2141,7 @@ DEP_CPP_FORMS_=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\fl\forms.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -2025,6 +2205,7 @@ DEP_CPP_FORMS_FS=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\fl\forms.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -2077,6 +2258,7 @@ DEP_CPP_FORMS_P=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\fl\forms.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
@@ -2105,6 +2287,7 @@ DEP_CPP_GL_DR=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\FL\gl.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\fl_font.h"\
@@ -2124,6 +2307,7 @@ DEP_CPP_GL_ST=\
"..\fl\fl_widget.h"\
"..\fl\fl_window.h"\
"..\FL\gl.h"\
+ "..\fl\mac.H"\
"..\fl\win32.h"\
"..\fl\x.h"\
"..\src\Fl_Gl_Choice.H"\
@@ -2176,6 +2360,7 @@ DEP_CPP_NUMER=\
SOURCE=..\src\scandir.c
DEP_CPP_SCAND=\
+ "..\src\flstring.h"\
"..\src\scandir_win32.c"\
".\config.h"\
diff --git a/visualc/tiled_image.dsp b/visualc/tiled_image.dsp
new file mode 100644
index 000000000..30d55b1cd
--- /dev/null
+++ b/visualc/tiled_image.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="tiled_image" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=tiled_image - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "tiled_image.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "tiled_image.mak" CFG="tiled_image - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "tiled_image - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "tiled_image - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "tiled_image - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 fltk.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_image.exe" /libpath:"..\lib"
+# SUBTRACT LINK32 /pdb:none /incremental:yes
+
+!ELSEIF "$(CFG)" == "tiled_image - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "tiled_image_"
+# PROP BASE Intermediate_Dir "tiled_image_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "tiled_image_"
+# PROP Intermediate_Dir "tiled_image_"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 fltkd.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\lib"
+# SUBTRACT LINK32 /pdb:none /incremental:no
+
+!ENDIF
+
+# Begin Target
+
+# Name "tiled_image - Win32 Release"
+# Name "tiled_image - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\test\tiled_image.cxx
+# End Source File
+# End Target
+# End Project
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 08:19:38 +0000