Get rid of "member X hidden by variable X" warnings...

Fix strcasecmp() detection...


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

10 files changed, 114 insertions, 109 deletions

diff --git a/configure.in b/configure.in
index 7fbf5178b..5e8697152 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.19 2000/11/20 15:44:17 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.20 2000/11/20 19:02:19 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -137,8 +137,8 @@ AC_CHECK_FUNC(snprintf,
     else
         AC_DEFINE(HAVE_SNPRINTF)
     fi)
-AC_CHECK_FUNC(vsprintf)
-AC_CHECK_FUNC(strcasecmp)
+AC_CHECK_FUNCS(vsprintf)
+AC_CHECK_FUNCS(strcasecmp)
 
 AC_PATH_XTRA
 dnl# echo "Ignoring libraries \"$X_PRE_LIBS\" requested by configure."
@@ -279,5 +279,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.19 2000/11/20 15:44:17 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.20 2000/11/20 19:02:19 easysw Exp $".
 dnl
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 363138b75..7a2ad1747 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.33 2000/11/20 02:49:40 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.34 2000/11/20 19:02:20 easysw Exp $"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -48,7 +48,7 @@ int		Fl::damage_,
 		Fl::e_clicks,
 		Fl::e_is_click,
 		Fl::e_keysym;
-char		*Fl::e_text = "";
+char		*Fl::e_text = (char *)"";
 int		Fl::e_length;
 
 //
@@ -734,5 +734,5 @@ void Fl_Window::flush() {
 }
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.33 2000/11/20 02:49:40 easysw Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.34 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx
index 7850cdcfe..4b5f906e8 100644
--- a/src/Fl_Chart.cxx
+++ b/src/Fl_Chart.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Chart.cxx,v 1.5.2.4 2000/06/05 21:20:49 mike Exp $"
+// "$Id: Fl_Chart.cxx,v 1.5.2.5 2000/11/20 19:02:20 easysw Exp $"
 //
 // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK).
 //
@@ -357,9 +357,9 @@ void Fl_Chart::replace(int index,double val, const char *str, uchar col) {
   redraw();
 }
 
-void Fl_Chart::bounds(double min, double max) {
-  this->min = min;
-  this->max = max;
+void Fl_Chart::bounds(double mymin, double mymax) {
+  this->min = mymin;
+  this->max = mymax;
   redraw();
 }
 
@@ -378,5 +378,5 @@ void Fl_Chart::maxsize(int m) {
 }
 
 //
-// End of "$Id: Fl_Chart.cxx,v 1.5.2.4 2000/06/05 21:20:49 mike Exp $".
+// End of "$Id: Fl_Chart.cxx,v 1.5.2.5 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 9207b48b3..00b6479f2 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Double_Window.cxx,v 1.12.2.2 2000/06/05 21:20:50 mike Exp $"
+// "$Id: Fl_Double_Window.cxx,v 1.12.2.3 2000/11/20 19:02:20 easysw Exp $"
 //
 // Double-buffered window code for the Fast Light Tool Kit (FLTK).
 //
@@ -104,62 +104,62 @@ void Fl_Double_Window::flush() {flush(0);}
 
 void Fl_Double_Window::flush(int eraseoverlay) {
   make_current(); // make sure fl_gc is non-zero
-  Fl_X *i = Fl_X::i(this);
-  if (!i->other_xid) {
+  Fl_X *myi = Fl_X::i(this);
+  if (!myi->other_xid) {
 #if USE_XDBE
-    if (can_xdbe()) i->other_xid =
+    if (can_xdbe()) myi->other_xid =
       XdbeAllocateBackBufferName(fl_display, fl_xid(this), XdbeUndefined);
     else
 #endif
-      i->other_xid = fl_create_offscreen(w(), h());
+      myi->other_xid = fl_create_offscreen(w(), h());
     clear_damage(FL_DAMAGE_ALL);
   }
 #if USE_XDBE
   if (use_xdbe) {
     // if this is true, copy rather than swap so back buffer is preserved:
-    int copy = (i->region || eraseoverlay);
-    if (i->backbuffer_bad) { // make sure we do a complete redraw...
-      if (i->region) {XDestroyRegion(i->region); i->region = 0;}
+    int copy = (myi->region || eraseoverlay);
+    if (myi->backbuffer_bad) { // make sure we do a complete redraw...
+      if (myi->region) {XDestroyRegion(myi->region); myi->region = 0;}
       clear_damage(FL_DAMAGE_ALL);
     }
     if (damage()) {
-      fl_clip_region(i->region); i->region = 0;
-      fl_window = i->other_xid;
+      fl_clip_region(myi->region); myi->region = 0;
+      fl_window = myi->other_xid;
       draw();
-      fl_window = i->xid;
+      fl_window = myi->xid;
     }
     if (!copy) {
       XdbeSwapInfo s;
       s.swap_window = fl_xid(this);
       s.swap_action = XdbeUndefined;
       XdbeSwapBuffers(fl_display, &s, 1);
-      i->backbuffer_bad = 1;
+      myi->backbuffer_bad = 1;
       return;
     }
     // otherwise just use normal copy from back to front:
-    i->backbuffer_bad = 0; // which won't destroy the back buffer...
+    myi->backbuffer_bad = 0; // which won't destroy the back buffer...
   } else
 #endif
   if (damage() & ~FL_DAMAGE_EXPOSE) {
-    fl_clip_region(i->region); i->region = 0;
+    fl_clip_region(myi->region); myi->region = 0;
 #ifdef WIN32
     HDC _sgc = fl_gc;
-    fl_gc = fl_makeDC(i->other_xid);
+    fl_gc = fl_makeDC(myi->other_xid);
     fl_restore_clip(); // duplicate region into new gc
     draw();
     DeleteDC(fl_gc);
     fl_gc = _sgc;
 #else // X:
-    fl_window = i->other_xid;
+    fl_window = myi->other_xid;
     draw();
-    fl_window = i->xid;
+    fl_window = myi->xid;
 #endif
   }
   if (eraseoverlay) fl_clip_region(0);
   // on Irix (at least) it is faster to reduce the area copied to
   // the current clip region:
   int X,Y,W,H; fl_clip_box(0,0,w(),h(),X,Y,W,H);
-  fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+  fl_copy_offscreen(X, Y, W, H, myi->other_xid, X, Y);
 }
 
 void Fl_Double_Window::resize(int X,int Y,int W,int H) {
@@ -169,20 +169,20 @@ void Fl_Double_Window::resize(int X,int Y,int W,int H) {
 #if USE_XDBE
   if (use_xdbe) return;
 #endif
-  Fl_X* i = Fl_X::i(this);
-  if (i && i->other_xid && (ow != w() || oh != h())) {
-    fl_delete_offscreen(i->other_xid);
-    i->other_xid = 0;
+  Fl_X* myi = Fl_X::i(this);
+  if (myi && myi->other_xid && (ow != w() || oh != h())) {
+    fl_delete_offscreen(myi->other_xid);
+    myi->other_xid = 0;
   }
 }
 
 void Fl_Double_Window::hide() {
-  Fl_X* i = Fl_X::i(this);
-  if (i && i->other_xid) {
+  Fl_X* myi = Fl_X::i(this);
+  if (myi && myi->other_xid) {
 #if USE_XDBE
     if (!use_xdbe)
 #endif
-      fl_delete_offscreen(i->other_xid);
+      fl_delete_offscreen(myi->other_xid);
   }
   Fl_Window::hide();
 }
@@ -192,5 +192,5 @@ Fl_Double_Window::~Fl_Double_Window() {
 }
 
 //
-// End of "$Id: Fl_Double_Window.cxx,v 1.12.2.2 2000/06/05 21:20:50 mike Exp $".
+// End of "$Id: Fl_Double_Window.cxx,v 1.12.2.3 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index bfcb0f887..b58105bbc 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu.cxx,v 1.18.2.10 2000/07/30 00:31:44 spitzak Exp $"
+// "$Id: Fl_Menu.cxx,v 1.18.2.11 2000/11/20 19:02:20 easysw Exp $"
 //
 // Menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -208,15 +208,15 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp,
   }
   color(button ? button->color() : FL_GRAY);
   selected = -1;
-  {int i = 0;
-  if (m) for (const Fl_Menu_Item* m1=m; ; m1 = m1->next(), i++) {
+  {int j = 0;
+  if (m) for (const Fl_Menu_Item* m1=m; ; m1 = m1->next(), j++) {
     if (picked) {
-      if (m1 == picked) {selected = i; picked = 0;}
-      else if (m1 > picked) {selected = i-1; picked = 0; Wp = Hp = 0;}
+      if (m1 == picked) {selected = j; picked = 0;}
+      else if (m1 > picked) {selected = j-1; picked = 0; Wp = Hp = 0;}
     }
     if (!m1->text) break;
   }
-  numitems = i;}
+  numitems = j;}
 
   if (menubar) {
     itemheight = 0;
@@ -276,8 +276,8 @@ void menuwindow::position(int X, int Y) {
 }
 
 // scroll so item i is visible on screen
-void menuwindow::autoscroll(int i) {
-  int Y = y()+Fl::box_dx(box())+2+i*itemheight;
+void menuwindow::autoscroll(int n) {
+  int Y = y()+Fl::box_dx(box())+2+n*itemheight;
   if (Y <= Fl::y()) Y = Fl::y()-Y+10;
   else {
     Y = Y+itemheight-Fl::h()-Fl::y();
@@ -290,22 +290,22 @@ void menuwindow::autoscroll(int i) {
 
 ////////////////////////////////////////////////////////////////
 
-void menuwindow::drawentry(const Fl_Menu_Item* m, int i, int erase) {
+void menuwindow::drawentry(const Fl_Menu_Item* m, int n, int erase) {
   if (!m) return; // this happens if -1 is selected item and redrawn
 
   int BW = Fl::box_dx(box());
   int x = BW;
   int W = this->w();
   int w = W-2*BW-1;
-  int y = BW+1+i*itemheight;
+  int y = BW+1+n*itemheight;
   int h = itemheight - LEADING;
 
-  if (erase && i != selected) {
+  if (erase && n != selected) {
     fl_color(button ? button->color() : FL_GRAY);
     fl_rectf(x+1, y-(LEADING-2)/2, w-2, h+(LEADING-2));
   }
 
-  m->draw(x, y, w, h, button, i==selected);
+  m->draw(x, y, w, h, button, n==selected);
 
   // the shortcuts and arrows assumme fl_color() was left set by draw():
   if (m->submenu()) {
@@ -337,8 +337,8 @@ void menuwindow::draw() {
   if (damage() != FL_DAMAGE_CHILD) {	// complete redraw
     fl_draw_box(box(), 0, 0, w(), h(), color());
     if (menu) {
-      const Fl_Menu_Item* m; int i;
-      for (m=menu, i=0; m->text; i++, m = m->next()) drawentry(m, i, 0);
+      const Fl_Menu_Item* m; int j;
+      for (m=menu, j=0; m->text; j++, m = m->next()) drawentry(m, j, 0);
     }
   } else {
     if (damage() & FL_DAMAGE_CHILD && selected!=drawn_selected) { // change selection
@@ -349,8 +349,8 @@ void menuwindow::draw() {
   drawn_selected = selected;
 }
 
-void menuwindow::set_selected(int i) {
-  if (i != selected) {selected = i; damage(FL_DAMAGE_CHILD);}
+void menuwindow::set_selected(int n) {
+  if (n != selected) {selected = n; damage(FL_DAMAGE_CHILD);}
 }
 
 ////////////////////////////////////////////////////////////////
@@ -361,26 +361,26 @@ int menuwindow::find_selected(int mx, int my) {
   my -= y();
   if (my < 0 || my >= h()) return -1;
   if (!itemheight) { // menubar
-    int x = 3; int i = 0;
+    int x = 3; int n = 0;
     const Fl_Menu_Item* m = menu;
-    for (; ; m = m->next(), i++) {
+    for (; ; m = m->next(), n++) {
       if (!m->text) return -1;
       x += m->measure(0, button) + 16;
       if (x > mx) break;
     }
-    return i;
+    return n;
   }
   if (mx < Fl::box_dx(box()) || mx >= w()) return -1;
-  int i = (my-Fl::box_dx(box())-1)/itemheight;
-  if (i < 0 || i>=numitems) return -1;
-  return i;
+  int n = (my-Fl::box_dx(box())-1)/itemheight;
+  if (n < 0 || n>=numitems) return -1;
+  return n;
 }
 
-// return horizontal position for item i in a menubar:
-int menuwindow::titlex(int i) {
+// return horizontal position for item n in a menubar:
+int menuwindow::titlex(int n) {
   const Fl_Menu_Item* m;
   int x = 3;
-  for (m=menu; i--; m = m->next()) x += m->measure(0, button) + 16;
+  for (m=menu; n--; m = m->next()) x += m->measure(0, button) + 16;
   return x;
 }
 
@@ -497,11 +497,11 @@ int menuwindow::handle(int e) {
     }
     break;
   case FL_SHORTCUT: {
-    for (int menu = p.nummenus; menu--;) {
-      menuwindow &mw = *(p.p[menu]);
+    for (int mymenu = p.nummenus; mymenu--;) {
+      menuwindow &mw = *(p.p[mymenu]);
       int item; const Fl_Menu_Item* m = mw.menu->find_shortcut(&item);
       if (m) {
-	setitem(m, menu, item);
+	setitem(m, mymenu, item);
 	if (!m->submenu()) p.state = DONE_STATE;
 	return 1;
       }
@@ -511,16 +511,16 @@ int menuwindow::handle(int e) {
   case FL_DRAG: {
     int mx = Fl::event_x_root();
     int my = Fl::event_y_root();
-    int item=0; int menu;
-    for (menu = p.nummenus-1; ; menu--) {
-      item = p.p[menu]->find_selected(mx, my);
+    int item=0; int mymenu;
+    for (mymenu = p.nummenus-1; ; mymenu--) {
+      item = p.p[mymenu]->find_selected(mx, my);
       if (item >= 0) break;
-      if (menu <= 0) break;
+      if (mymenu <= 0) break;
     }
-    setitem(menu, item);
+    setitem(mymenu, item);
     if (e == FL_PUSH) {
       if (p.current_item && p.current_item->submenu() // this is a menu title
-	  && item != p.p[menu]->selected // and it is not already on
+	  && item != p.p[mymenu]->selected // and it is not already on
 	  && !p.current_item->callback_) // and it does not have a callback
 	p.state = MENU_PUSH_STATE;
       else
@@ -743,5 +743,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
 }
 
 //
-// End of "$Id: Fl_Menu.cxx,v 1.18.2.10 2000/07/30 00:31:44 spitzak Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.18.2.11 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx
index a92004d8d..a07cec556 100644
--- a/src/Fl_Menu_Window.cxx
+++ b/src/Fl_Menu_Window.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_Window.cxx,v 1.8.2.3 2000/06/05 21:20:54 mike Exp $"
+// "$Id: Fl_Menu_Window.cxx,v 1.8.2.4 2000/11/20 19:02:20 easysw Exp $"
 //
 // Menu window code for the Fast Light Tool Kit (FLTK).
 //
@@ -63,12 +63,12 @@ void Fl_Menu_Window::show() {
 void Fl_Menu_Window::flush() {
 #if HAVE_OVERLAY
   if (!fl_overlay_visual || !overlay()) {Fl_Single_Window::flush(); return;}
-  Fl_X *i = Fl_X::i(this);
-  fl_window = i->xid;
-  if (!gc) gc = XCreateGC(fl_display, i->xid, 0, 0);
+  Fl_X *myi = Fl_X::i(this);
+  fl_window = myi->xid;
+  if (!gc) gc = XCreateGC(fl_display, myi->xid, 0, 0);
   fl_gc = gc;
   fl_overlay = 1;
-  fl_clip_region(i->region); i->region = 0; current_ = this;
+  fl_clip_region(myi->region); myi->region = 0; current_ = this;
   draw();
   fl_overlay = 0;
 #else
@@ -97,5 +97,5 @@ Fl_Menu_Window::~Fl_Menu_Window() {
 }
 
 //
-// End of "$Id: Fl_Menu_Window.cxx,v 1.8.2.3 2000/06/05 21:20:54 mike Exp $".
+// End of "$Id: Fl_Menu_Window.cxx,v 1.8.2.4 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx
index db10d8451..21b5386e7 100644
--- a/src/Fl_Menu_add.cxx
+++ b/src/Fl_Menu_add.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_add.cxx,v 1.9.2.8 2000/10/17 07:39:06 spitzak Exp $"
+// "$Id: Fl_Menu_add.cxx,v 1.9.2.9 2000/11/20 19:02:20 easysw Exp $"
 //
 // Menu utilities for the Fast Light Tool Kit (FLTK).
 //
@@ -98,11 +98,11 @@ static int compare(const char* a, const char* b) {
 // produce submenus (actually a totally unnecessary feature as you can
 // now add submenu titles directly by setting SUBMENU in the flags):
 int Fl_Menu_Item::add(
-  const char *text,
+  const char *mytext,
   int shortcut,
   Fl_Callback *cb,	
   void *data,
-  int flags
+  int myflags
 ) {
   Fl_Menu_Item *array = this;
   Fl_Menu_Item *m = this;
@@ -117,13 +117,13 @@ int Fl_Menu_Item::add(
 
     /* fill in the buf with name, changing \x to x: */
     q = buf;
-    for (p=text; *p && *p != '/'; *q++ = *p++) if (*p=='\\') p++;
+    for (p=mytext; *p && *p != '/'; *q++ = *p++) if (*p=='\\') p++;
     *q = 0;
 
     item = buf;
     if (*item == '_') {item++; flags1 = FL_MENU_DIVIDER;}
     if (*p != '/') break; /* not a menu title */
-    text = p+1;	/* point at item title */
+    mytext = p+1;	/* point at item title */
 
     /* find a matching menu title: */
     for (; m->text; m = m->next())
@@ -147,7 +147,7 @@ int Fl_Menu_Item::add(
 
   if (!m->text) {	/* add a new menu item */
     int n = m-array;
-    array = insert(array, size, n, item, flags|flags1);
+    array = insert(array, size, n, item, myflags|flags1);
     size++;
     if (flags & FL_SUBMENU) { // add submenu delimiter
       array = insert(array, size, n+1, 0, 0);
@@ -160,7 +160,7 @@ int Fl_Menu_Item::add(
   m->shortcut_ = shortcut;
   m->callback_ = cb;
   m->user_data_ = data;
-  m->flags = flags|flags1;
+  m->flags = myflags|flags1;
 
   if (array == local_array) local_array_size = size;
   return m-array;
@@ -253,5 +253,5 @@ void Fl_Menu_::remove(int i) {
 }
 
 //
-// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.8 2000/10/17 07:39:06 spitzak Exp $".
+// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.9 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx
index 67af6fafa..d172465bf 100644
--- a/src/Fl_Overlay_Window.cxx
+++ b/src/Fl_Overlay_Window.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Overlay_Window.cxx,v 1.7.2.3 2000/06/05 21:20:55 mike Exp $"
+// "$Id: Fl_Overlay_Window.cxx,v 1.7.2.4 2000/11/20 19:02:20 easysw Exp $"
 //
 // Overlay window code for the Fast Light Tool Kit (FLTK).
 //
@@ -108,9 +108,9 @@ void _Fl_Overlay::flush() {
   fl_gc = gc;
   fl_overlay = 1;
   Fl_Overlay_Window *w = (Fl_Overlay_Window *)parent();
-  Fl_X *i = Fl_X::i(this);
+  Fl_X *myi = Fl_X::i(this);
   if (damage() != FL_DAMAGE_EXPOSE) XClearWindow(fl_display, fl_xid(this));
-  fl_clip_region(i->region); i->region = 0;
+  fl_clip_region(myi->region); myi->region = 0;
   w->draw_overlay();
   fl_overlay = 0;
 }
@@ -140,5 +140,5 @@ void Fl_Overlay_Window::redraw_overlay() {
 #endif
 
 //
-// End of "$Id: Fl_Overlay_Window.cxx,v 1.7.2.3 2000/06/05 21:20:55 mike Exp $".
+// End of "$Id: Fl_Overlay_Window.cxx,v 1.7.2.4 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index 9a79bcbdb..0359623b7 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_arg.cxx,v 1.5.2.5 2000/06/08 12:30:36 mike Exp $"
+// "$Id: Fl_arg.cxx,v 1.5.2.6 2000/11/20 19:02:20 easysw Exp $"
 //
 // Optional argument initialization code for the Fast Light Tool Kit (FLTK).
 //
@@ -176,15 +176,15 @@ void Fl_Window::show(int argc, char **argv) {
 
 #ifndef WIN32
   // set the command string, used by state-saving window managers:
-  int i;
-  int n=0; for (i=0; i<argc; i++) n += strlen(argv[i])+1;
+  int j;
+  int n=0; for (j=0; j<argc; j++) n += strlen(argv[j])+1;
 #ifdef __GNUC__
   char buffer[n];
 #else
   char *buffer = new char[n];
 #endif
   char *p = buffer;
-  for (i=0; i<argc; i++) for (const char *q = argv[i]; (*p++ = *q++););
+  for (j=0; j<argc; j++) for (const char *q = argv[j]; (*p++ = *q++););
   XChangeProperty(fl_display, fl_xid(this), XA_WM_COMMAND, XA_STRING, 8, 0,
 		  (unsigned char *)buffer, p-buffer-1);
 #ifndef __GNUC__
@@ -352,5 +352,5 @@ int XParseGeometry(const char* string, int* x, int* y,
 #endif // ifdef WIN32
 
 //
-// End of "$Id: Fl_arg.cxx,v 1.5.2.5 2000/06/08 12:30:36 mike Exp $".
+// End of "$Id: Fl_arg.cxx,v 1.5.2.6 2000/11/20 19:02:20 easysw Exp $".
 //
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 2e330f3a7..b675ea102 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.24.2.21 2000/11/20 02:49:40 easysw Exp $"
+// "$Id: Fl_x.cxx,v 1.24.2.22 2000/11/20 19:02:20 easysw Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -242,19 +242,24 @@ static Atom wm_delete_window;
 static Atom wm_protocols;
 static Atom _motif_wm_hints;
 
-extern "C" {
-static void fd_callback(int,void *) {do_queued_events();}
-
-static int io_error_handler(Display*) {Fl::fatal("X I/O error"); return 0;}
+static void fd_callback(int,void *) {
+  do_queued_events();
 }
 
-static int xerror_handler(Display* d, XErrorEvent* e) {
-  char buf1[128], buf2[128];
-  sprintf(buf1, "XRequest.%d", e->request_code);
-  XGetErrorDatabaseText(d,"",buf1,buf1,buf2,128);
-  XGetErrorText(d, e->error_code, buf1, 128);
-  Fl::warning("%s: %s 0x%lx", buf2, buf1, e->resourceid);
-  return 0;
+extern "C" {
+  static int io_error_handler(Display*) {
+    Fl::fatal("X I/O error");
+    return 0;
+  }
+
+  static int xerror_handler(Display* d, XErrorEvent* e) {
+    char buf1[128], buf2[128];
+    sprintf(buf1, "XRequest.%d", e->request_code);
+    XGetErrorDatabaseText(d,"",buf1,buf1,buf2,128);
+    XGetErrorText(d, e->error_code, buf1, 128);
+    Fl::warning("%s: %s 0x%lx", buf2, buf1, e->resourceid);
+    return 0;
+  }
 }
 
 void fl_open_display() {
@@ -898,5 +903,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.24.2.21 2000/11/20 02:49:40 easysw Exp $".
+// End of "$Id: Fl_x.cxx,v 1.24.2.22 2000/11/20 19:02:20 easysw Exp $".
 //