WIN32 fixes for the new image stuff...

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

2 files changed, 109 insertions, 4 deletions

diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp
index 3f70995b8..82304f507 100644
--- a/visualc/fltk.lib.dsp
+++ b/visualc/fltk.lib.dsp
@@ -255,10 +255,6 @@ SOURCE=..\src\fl_engraved_label.cxx
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\fl_file_dir.cxx

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\Fl_File_Browser.cxx

 # End Source File

 # Begin Source File

@@ -271,10 +267,18 @@ SOURCE=..\src\Fl_File_Chooser2.cxx
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\fl_file_dir.cxx

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_File_Icon.cxx

 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_File_Icon2.cxx

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\fl_font.cxx

 # End Source File

 # Begin Source File

@@ -287,6 +291,10 @@ SOURCE=..\src\Fl_get_system_colors.cxx
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_GIF_Image.cxx

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_grab.cxx

 # End Source File

 # Begin Source File

@@ -315,6 +323,10 @@ SOURCE=..\src\Fl_Input_.cxx
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_JPEG_Image.cxx

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\fl_labeltype.cxx

 # End Source File

 # Begin Source File

@@ -391,6 +403,10 @@ SOURCE=..\src\Fl_Pixmap.cxx
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_PNG_Image.cxx

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_Positioner.cxx

 # End Source File

 # Begin Source File

diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index 986be7d4e..de3ebe384 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -192,9 +192,13 @@ DEP_CPP_FL_ADJ=\
 	"..\fl\fl_bitmap.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

 	"..\fl\fl_image.h"\

 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	"..\src\fastarrow.h"\

 	"..\src\mediumarrow.h"\

 	"..\src\slowarrow.h"\

@@ -595,7 +599,12 @@ DEP_CPP_FL_DR=\
 	"..\fl\enumerations.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

 	"..\fl\fl_image.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -692,6 +701,8 @@ DEP_CPP_FL_FIL=\
 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -770,6 +781,20 @@ DEP_CPP_FL_FILE_I=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_File_Icon2.cxx

+DEP_CPP_FL_FILE_IC=\

+	"..\fl\enumerations.h"\

+	"..\fl\filename.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_draw.h"\

+	"..\fl\fl_export.h"\

+	"..\FL\Fl_File_Icon.H"\

+	"..\fl\fl_widget.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\fl_font.cxx

 DEP_CPP_FL_FO=\

 	"..\fl\enumerations.h"\

@@ -818,6 +843,23 @@ DEP_CPP_FL_GET=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_GIF_Image.cxx

+DEP_CPP_FL_GI=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_gif_image.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_image.h"\

+	"..\fl\fl_pixmap.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_Gl_Choice.cxx

 DEP_CPP_FL_GL=\

 	"..\fl\enumerations.h"\

@@ -934,6 +976,9 @@ DEP_CPP_FL_HEL=\
 	"..\fl\fl_slider.h"\

 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	".\config.h"\

 	

 # End Source File

@@ -973,6 +1018,7 @@ SOURCE=..\src\Fl_Input_.cxx
 DEP_CPP_FL_INP=\

 	"..\fl\enumerations.h"\

 	"..\fl\fl.h"\

+	"..\fl\fl_ask.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

 	"..\fl\fl_input_.h"\

@@ -981,6 +1027,22 @@ DEP_CPP_FL_INP=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_JPEG_Image.cxx

+DEP_CPP_FL_JP=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_image.h"\

+	"..\fl\fl_jpeg_image.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\fl_labeltype.cxx

 DEP_CPP_FL_LA=\

 	"..\fl\enumerations.h"\

@@ -991,6 +1053,9 @@ DEP_CPP_FL_LA=\
 	"..\fl\fl_image.h"\

 	"..\fl\fl_input_.h"\

 	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -1247,6 +1312,22 @@ DEP_CPP_FL_PI=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_PNG_Image.cxx

+DEP_CPP_FL_PN=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_image.h"\

+	"..\fl\fl_png_image.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_Positioner.cxx

 DEP_CPP_FL_PO=\

 	"..\fl\enumerations.h"\

@@ -1818,6 +1899,8 @@ DEP_CPP_FORMS=\
 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

 	"..\fl\forms.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -1869,6 +1952,8 @@ DEP_CPP_FORMS_=\
 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

 	"..\fl\forms.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -1930,6 +2015,8 @@ DEP_CPP_FORMS_FS=\
 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

 	"..\fl\forms.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

@@ -1980,6 +2067,8 @@ DEP_CPP_FORMS_P=\
 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

 	"..\fl\forms.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File