mirror of
https://github.com/fltk/fltk.git
synced 2026-06-05 16:12:13 +08:00
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
This commit is contained in:
Michael R Sweet
+4
-4
@@ -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 $".
|
||||
//
|
||||
|
||||
+3
-3
@@ -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 $".
|
||||
//
|
||||
|
||||
+11
-6
@@ -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).
|
||||
//
|
||||
@@ -33,16 +33,21 @@
|
||||
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__)
|
||||
@@ -69,5 +74,5 @@ 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 $".
|
||||
//
|
||||
|
||||
@@ -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 $".
|
||||
//
|
||||
|
||||
+3
-5
@@ -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).
|
||||
*
|
||||
@@ -33,8 +33,7 @@
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
# include <FL/filename.H>
|
||||
#else
|
||||
#if HAVE_DIRENT_H
|
||||
#elif defined(HAVE_DIRENT_H)
|
||||
# include <dirent.h>
|
||||
#else
|
||||
# define dirent direct
|
||||
@@ -48,7 +47,6 @@
|
||||
# include <ndir.h>
|
||||
# endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
@@ -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 $".
|
||||
*/
|
||||
|
||||
@@ -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 $".
|
||||
//
|
||||
|
||||
@@ -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>
|
||||
|
||||
+20
-1
@@ -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
|
||||
|
||||
+187
-2
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
Reference in New Issue
Block a user