comparison lwlib/lwlib.c @ 3025:facf3239ba30

[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents 04bc9d2f42c7
children 383ab474a241
comparison
equal deleted inserted replaced
3024:b7f26b2f78bd 3025:facf3239ba30
191 memset (copy->scrollbar_data, '\0', sizeof (scrollbar_values)); 191 memset (copy->scrollbar_data, '\0', sizeof (scrollbar_values));
192 } 192 }
193 193
194 /* 194 /*
195 * Return true if old->scrollbar_data were not equivalent 195 * Return true if old->scrollbar_data were not equivalent
196 * to new->scrollbar_data. 196 * to new_->scrollbar_data.
197 */ 197 */
198 static Boolean 198 static Boolean
199 merge_scrollbar_values (widget_value *old, widget_value *new_) 199 merge_scrollbar_values (widget_value *old, widget_value *new_)
200 { 200 {
201 Boolean changed = False; 201 Boolean changed = False;
236 #endif /* NEED_SCROLLBARS */ 236 #endif /* NEED_SCROLLBARS */
237 237
238 #ifdef HAVE_X_WIDGETS 238 #ifdef HAVE_X_WIDGETS
239 /* 239 /*
240 * Return true if old->args was not equivalent 240 * Return true if old->args was not equivalent
241 * to new->args. 241 * to new_->args.
242 */ 242 */
243 static Boolean 243 static Boolean
244 merge_widget_value_args (widget_value *old, widget_value *new) 244 merge_widget_value_args (widget_value *old, widget_value *new_)
245 { 245 {
246 Boolean changed = False; 246 Boolean changed = False;
247 247
248 if (new->args && !old->args) 248 if (new_->args && !old->args)
249 { 249 {
250 lw_copy_widget_value_args (new, old); 250 lw_copy_widget_value_args (new_, old);
251 changed = True; 251 changed = True;
252 } 252 }
253 /* Generally we don't want to lose values that are already in the 253 /* Generally we don't want to lose values that are already in the
254 widget. */ 254 widget. */
255 else if (!new->args && old->args) 255 else if (!new_->args && old->args)
256 { 256 {
257 lw_copy_widget_value_args (old, new); 257 lw_copy_widget_value_args (old, new_);
258 changed = True; 258 changed = True;
259 } 259 }
260 else if (new->args && old->args && new->args != old->args) 260 else if (new_->args && old->args && new_->args != old->args)
261 { 261 {
262 /* #### Do something more sensible here than just copying the 262 /* #### Do something more sensible here than just copying the
263 new values (like actually merging the values). */ 263 new values (like actually merging the values). */
264 lw_copy_widget_value_args (new, old); 264 lw_copy_widget_value_args (new_, old);
265 changed = True; 265 changed = True;
266 } 266 }
267 else if (new->args && new->args == old->args && new->args->args_changed == True) 267 else if (new_->args && new_->args == old->args && new_->args->args_changed == True)
268 { 268 {
269 changed = True; 269 changed = True;
270 } 270 }
271 271
272 return changed; 272 return changed;