Update dependencies.

Eliminate compiler warnings in Fl_GIF_Image.cxx.

Add X11 icon code to sudoku example.


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

2 files changed, 22 insertions, 16 deletions

diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx
index 5d6fc9af6..e40a9d218 100644
--- a/src/Fl_GIF_Image.cxx
+++ b/src/Fl_GIF_Image.cxx
@@ -110,8 +110,8 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
   int ColorMapSize = 1 << BitsPerPixel;
   // int OriginalResolution = ((ch>>4)&7)+1;
   // int SortedTable = (ch&8)!=0;
-  NEXTBYTE; // Background Color index
-  NEXTBYTE; // Aspect ratio is N/64
+  ch = NEXTBYTE; // Background Color index
+  ch = NEXTBYTE; // Aspect ratio is N/64
 
   // Read in global colormap:
   uchar transparent_pixel = 0;
@@ -153,7 +153,7 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
 
 	char bits;
 	bits = NEXTBYTE;
-	NEXTBYTE; NEXTBYTE; // GETSHORT(delay);
+	char junk = NEXTBYTE; junk = NEXTBYTE; // GETSHORT(delay);
 	transparent_pixel = NEXTBYTE;
 	if (bits & 1) has_transparent = 1;
 	blocklen = NEXTBYTE;
@@ -166,8 +166,8 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
       }
     } else if (i == 0x2c) {	// an image
 
-      NEXTBYTE; NEXTBYTE; // GETSHORT(x_position);
-      NEXTBYTE; NEXTBYTE; // GETSHORT(y_position);
+      ch = NEXTBYTE; ch = NEXTBYTE; // GETSHORT(x_position);
+      ch = NEXTBYTE; ch = NEXTBYTE; // GETSHORT(y_position);
       GETSHORT(Width);
       GETSHORT(Height);
       ch = NEXTBYTE;
@@ -189,7 +189,7 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
     }
 
     // skip the data:
-    while (blocklen>0) {while (blocklen--) {NEXTBYTE;} blocklen=NEXTBYTE;}
+    while (blocklen>0) {while (blocklen--) {ch = NEXTBYTE;} blocklen=NEXTBYTE;}
   }
 
   if (BitsPerPixel >= CodeSize)
diff --git a/src/makedepend b/src/makedepend
index 9ef2c6b63..86b614821 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -81,7 +81,8 @@ Fl_File_Chooser.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H
 Fl_File_Chooser.o: ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
 Fl_File_Chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 Fl_File_Chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-Fl_File_Chooser.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/Fl_Bitmap.H
+Fl_File_Chooser.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/fl_draw.H
+Fl_File_Chooser.o: ../FL/Fl_Bitmap.H
 Fl_File_Chooser2.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H
 Fl_File_Chooser2.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H
 Fl_File_Chooser2.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Choice.H
@@ -240,7 +241,8 @@ Fl_Widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Widget.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Tooltip.H
 Fl_Widget.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h
 Fl_Window.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
+Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H flstring.h
+Fl_Window.o: ../FL/Fl_Export.H ../config.h
 Fl_Window_fullscreen.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Window_fullscreen.o: ../FL/x.H ../FL/Fl_Window.H
 Fl_Window_hotspot.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -343,7 +345,7 @@ fl_file_dir.o: ../FL/Fl_Button.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 fl_file_dir.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H
 fl_font.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H
 fl_font.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H
-fl_font.o: ../FL/Fl_Window.H Fl_Font.H fl_font_xft.cxx
+fl_font.o: ../FL/Fl_Window.H Fl_Font.H fl_font_x.cxx
 fl_labeltype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/fl_draw.H
 fl_labeltype.o: ../FL/Fl_Image.H ../FL/Fl_Input_.H ../FL/Fl_Widget.H
@@ -360,8 +362,8 @@ fl_plastic.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h
 fl_read_image.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_read_image.o: ../FL/Fl_Window.H ../FL/fl_draw.H flstring.h
 fl_read_image.o: ../FL/Fl_Export.H ../config.h
-fl_rect.o: ../config.h ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H
-fl_rect.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H
+fl_rect.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H
 fl_round_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_round_box.o: ../FL/fl_draw.H
 fl_rounded_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -371,7 +373,7 @@ fl_set_font.o: ../FL/Fl_Window.H flstring.h ../FL/Fl_Export.H ../config.h
 fl_set_font.o: Fl_Font.H
 fl_set_fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H
 fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H ../config.h flstring.h
-fl_set_fonts.o: ../FL/Fl_Export.H fl_set_fonts_xft.cxx
+fl_set_fonts.o: ../FL/Fl_Export.H fl_set_fonts_x.cxx
 fl_scroll_area.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H
 fl_scroll_area.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H
 fl_shadow_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -384,9 +386,13 @@ fl_show_colormap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_show_colormap.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H
 fl_show_colormap.o: ../FL/fl_draw.H ../FL/fl_show_colormap.H ../config.h
 fl_symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-fl_symbols.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h
+fl_symbols.o: ../FL/fl_draw.H ../FL/math.h flstring.h ../FL/Fl_Export.H
+fl_symbols.o: ../config.h
 fl_vertex.o: ../config.h ../FL/fl_draw.H ../FL/Enumerations.H
-fl_vertex.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H ../FL/math.h
+fl_vertex.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl.H
+fl_vertex.o: ../FL/math.h
+screen_xywh.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H
+screen_xywh.o: ../FL/Fl_Window.H ../config.h
 forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H
 forms_compatability.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 forms_compatability.o: ../FL/Fl_Window.H ../FL/fl_draw.H
@@ -522,8 +528,8 @@ Fl_Help_Dialog.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H
 Fl_Help_Dialog.o: ../FL/Fl_Window.H ../FL/Fl_Help_View.H ../FL/Fl.H
 Fl_Help_Dialog.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H
 Fl_Help_Dialog.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
-Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Button.H
-Fl_Help_Dialog.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Group.H
+Fl_Help_Dialog.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 Fl_Help_Dialog.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/fl_ask.H
 Fl_JPEG_Image.o: ../FL/Fl_JPEG_Image.H ../FL/Fl_Image.H ../FL/Enumerations.H
 Fl_JPEG_Image.o: ../FL/Fl_Export.H ../config.h