diff lwlib/lwlib.c @ 1201:c2569faae8ed

[xemacs-hg @ 2003-01-12 10:45:53 by michaels] 2002-12-16 Ben Wing <ben@xemacs.org> * lwlib-Xlw.c (xlw_update_one_widget): * lwlib-Xm.c (xm_update_one_widget): * lwlib-Xm.c (xm_update_one_value): * lwlib.c: * lwlib.c (merge_scrollbar_values): * xlwmenu.c: * xlwmenu.c (display_menu): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuSetValues): * xlwradio.c: * xlwradio.c (RadioClassPartInit): * xlwradio.c (RadioSet): * xlwradio.c (RadioUnset): class -> class_, new -> new_.
author michaels
date Sun, 12 Jan 2003 10:45:53 +0000
parents 79c6ff3eef26
children 04bc9d2f42c7
line wrap: on
line diff
--- a/lwlib/lwlib.c	Sat Jan 11 22:52:31 2003 +0000
+++ b/lwlib/lwlib.c	Sun Jan 12 10:45:53 2003 +0000
@@ -196,24 +196,24 @@
  * to new->scrollbar_data.
  */
 static Boolean
-merge_scrollbar_values (widget_value *old, widget_value *new)
+merge_scrollbar_values (widget_value *old, widget_value *new_)
 {
   Boolean changed = False;
 
-  if (new->scrollbar_data && !old->scrollbar_data)
+  if (new_->scrollbar_data && !old->scrollbar_data)
     {
-      copy_scrollbar_values (new, old);
+      copy_scrollbar_values (new_, old);
       changed = True;
     }
-  else if (!new->scrollbar_data && old->scrollbar_data)
+  else if (!new_->scrollbar_data && old->scrollbar_data)
     {
       free (old->scrollbar_data);
       old->scrollbar_data = NULL;
     }
-  else if (new->scrollbar_data && old->scrollbar_data)
+  else if (new_->scrollbar_data && old->scrollbar_data)
     {
       scrollbar_values *old_sb = old->scrollbar_data;
-      scrollbar_values *new_sb = new->scrollbar_data;
+      scrollbar_values *new_sb = new_->scrollbar_data;
 
       if ((old_sb->line_increment   != new_sb->line_increment)	 ||
 	  (old_sb->page_increment   != new_sb->page_increment)	 ||
@@ -836,6 +836,8 @@
     }
 }
 
+#if defined (NEED_LUCID) || defined (NEED_ATHENA) || defined (NEED_MOTIF)
+
 /* strcasecmp() is not sufficiently portable or standard,
    and it's easier just to write our own. */
 static int
@@ -852,8 +854,6 @@
     }
 }
 
-#if defined (NEED_LUCID) || defined (NEED_ATHENA) || defined (NEED_MOTIF)
-
 static widget_creation_function
 find_in_table (const char *type, const widget_creation_entry table[])
 {