Fixed a few warnings in OS X. The fluid stuff was 'touche'd, but not changed.

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

12 files changed, 28 insertions, 25 deletions

diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 327d85755..30fb78675 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.16 2004/11/20 16:19:04 easysw Exp $"
+// "$Id$"
 //
 // C function type code for the Fast Light Tool Kit (FLTK).
 //
@@ -789,5 +789,5 @@ void Fl_Class_Type::write_code2() {
 }
 
 //
-// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.16 2004/11/20 16:19:04 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx
index bc123539d..dcd539e6c 100644
--- a/fluid/Fl_Group_Type.cxx
+++ b/fluid/Fl_Group_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.4 2004/04/11 04:38:55 easysw Exp $"
+// "$Id$"
 //
 // Fl_Group object code for the Fast Light Tool Kit (FLTK).
 //
@@ -242,5 +242,5 @@ const char tile_type_name[] = "Fl_Tile";
 Fl_Tile_Type Fl_Tile_type;	// the "factory"
 
 //
-// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.4 2004/04/11 04:38:55 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index 9d7f584cb..d368c5076 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.19 2004/05/13 21:02:39 easysw Exp $"
+// "$Id$"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -791,5 +791,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.19 2004/05/13 21:02:39 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index d94734701..503665a89 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.29 2004/04/11 04:38:55 easysw Exp $"
+// "$Id$"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -2019,5 +2019,5 @@ int Fl_Widget_Type::read_fdesign(const char* propname, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.29 2004/04/11 04:38:55 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index 193788f04..be53f2ba3 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.15 2004/04/11 04:38:56 easysw Exp $"
+// "$Id$"
 //
 // Pixmap label support for the Fast Light Tool Kit (FLTK).
 //
@@ -221,5 +221,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
 
 
 //
-// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.15 2004/04/11 04:38:56 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/align_widget.cxx b/fluid/align_widget.cxx
index 684c2d5bd..c66a1c31d 100644
--- a/fluid/align_widget.cxx
+++ b/fluid/align_widget.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: align_widget.cxx,v 1.1.2.7 2004/04/11 04:38:56 easysw Exp $"
+// "$Id$"
 //
 // alignment code for the Fast Light Tool Kit (FLTK).
 //
@@ -412,6 +412,6 @@ void align_widget_cb(Fl_Widget*, long how)
 
 
 //
-// End of "$Id: align_widget.cxx,v 1.1.2.7 2004/04/11 04:38:56 easysw Exp $".
+// End of "$Id$".
 //
 
diff --git a/fluid/code.cxx b/fluid/code.cxx
index 3ce6f5689..d20187940 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: code.cxx,v 1.9.2.9.2.7 2004/04/11 04:38:56 easysw Exp $"
+// "$Id$"
 //
 // Code output routines for the Fast Light Tool Kit (FLTK).
 //
@@ -463,5 +463,5 @@ void Fl_Type::write_code1() {
 void Fl_Type::write_code2() {}
 
 //
-// End of "$Id: code.cxx,v 1.9.2.9.2.7 2004/04/11 04:38:56 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 05a1ee0ab..995c93182 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.12 2004/04/11 04:38:56 easysw Exp $"
+// "$Id$"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -962,5 +962,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.12 2004/04/11 04:38:56 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/file.cxx b/fluid/file.cxx
index 8e901ce95..973117aed 100644
--- a/fluid/file.cxx
+++ b/fluid/file.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: file.cxx,v 1.7.2.6.2.10 2004/04/11 04:38:56 easysw Exp $"
+// "$Id$"
 //
 // Fluid file routines for the Fast Light Tool Kit (FLTK).
 //
@@ -637,5 +637,5 @@ void read_fdesign() {
 }
 
 //
-// End of "$Id: file.cxx,v 1.7.2.6.2.10 2004/04/11 04:38:56 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 237c01823..5ca31b3a3 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.46 2004/09/08 15:42:47 easysw Exp $"
+// "$Id$"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -886,5 +886,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.46 2004/09/08 15:42:47 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx
index 734ebb98e..636c156dc 100644
--- a/src/Fl_Sys_Menu_Bar.cxx
+++ b/src/Fl_Sys_Menu_Bar.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.10 2004/11/21 14:32:22 easysw Exp $"
+// "$Id$"
 //
 // MacOS system menu bar widget for the Fast Light Tool Kit (FLTK).
 //
@@ -142,6 +142,8 @@ static void setMenuShortcut( MenuHandle mh, int miCnt, const Fl_Menu_Item *m )
   SetMenuItemModifiers( mh, miCnt, macMod );
 }
 
+#if 0
+// this function needs to be verified before we compile it back in.
 static void catMenuShortcut( const Fl_Menu_Item *m, char *dst )
 {
   if ( !m->shortcut_ ) 
@@ -158,6 +160,7 @@ static void catMenuShortcut( const Fl_Menu_Item *m, char *dst )
   //if ( isalnum( mm->shortcut_ ) && !( mm->flags & FL_SUBMENU ) )
   //sprintf( buf+strlen(buf), "/%c", mm->shortcut_ );
 }
+#endif
 
 static void setMenuFlags( MenuHandle mh, int miCnt, const Fl_Menu_Item *m )
 {
@@ -188,7 +191,7 @@ static void createSubMenu( MenuHandle mh, int &cnt, pFl_Menu_Item &mm )
   int miCnt = 1;
   while ( mm->text )
   {
-    MenuHandle smh;
+    MenuHandle smh = 0;
     buf[1] = 0;
     catMenuFont( mm, buf+1 );
     //catMenuShortcut( mm, buf+1 );
@@ -320,5 +323,5 @@ int Fl_Menu_Bar::handle(int event) {
 #endif /* __APPLE__ */
 
 //
-// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.10 2004/11/21 14:32:22 easysw Exp $".
+// End of "$Id$".
 //
diff --git a/src/fl_draw_image_mac.cxx b/src/fl_draw_image_mac.cxx
index be4427324..27d3b6312 100644
--- a/src/fl_draw_image_mac.cxx
+++ b/src/fl_draw_image_mac.cxx
@@ -165,8 +165,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     }
   }
 #elif defined(__APPLE_QUARTZ__)
-  void *array = buf;
-  uchar *tmpBuf;
+  const void *array = buf;
+  uchar *tmpBuf = 0;
   if (cb) {
     tmpBuf = new uchar[ H*W*delta ];
     for (int i=0; i<H; i++) {