Mercurial > hg > xemacs-beta
comparison lwlib/lwlib.c @ 183:e121b013d1f0 r20-3b18
Import from CVS: tag r20-3b18
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:54:23 +0200 |
parents | 2d532a89d707 |
children | 3d6bfa290dbd |
comparison
equal
deleted
inserted
replaced
182:f07455f06202 | 183:e121b013d1f0 |
---|---|
138 in production code... it should be conditionalized. */ | 138 in production code... it should be conditionalized. */ |
139 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; | 139 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; |
140 | 140 |
141 if (wv->toolkit_data && wv->free_toolkit_data) | 141 if (wv->toolkit_data && wv->free_toolkit_data) |
142 { | 142 { |
143 free (wv->toolkit_data); | 143 XtFree (wv->toolkit_data); |
144 wv->toolkit_data = (void *) 0xDEADBEEF; | 144 wv->toolkit_data = (void *) 0xDEADBEEF; |
145 } | 145 } |
146 #ifdef NEED_SCROLLBARS | 146 #ifdef NEED_SCROLLBARS |
147 if (wv->scrollbar_data) | 147 if (wv->scrollbar_data) |
148 { | 148 { |
208 } | 208 } |
209 else if (new->scrollbar_data && old->scrollbar_data) | 209 else if (new->scrollbar_data && old->scrollbar_data) |
210 { | 210 { |
211 scrollbar_values *old_sb = old->scrollbar_data; | 211 scrollbar_values *old_sb = old->scrollbar_data; |
212 scrollbar_values *new_sb = new->scrollbar_data; | 212 scrollbar_values *new_sb = new->scrollbar_data; |
213 #define FROB(field) if (old_sb->field != new_sb->field) changed = True | 213 |
214 FROB (line_increment); | 214 if ((old_sb->line_increment != new_sb->line_increment) || |
215 FROB (page_increment); | 215 (old_sb->page_increment != new_sb->page_increment) || |
216 FROB (minimum); | 216 (old_sb->minimum != new_sb->minimum) || |
217 FROB (maximum); | 217 (old_sb->maximum != new_sb->maximum) || |
218 FROB (slider_size); | 218 (old_sb->slider_size != new_sb->slider_size) || |
219 FROB (slider_position); | 219 (old_sb->slider_position != new_sb->slider_position) || |
220 FROB (scrollbar_width); | 220 (old_sb->scrollbar_width != new_sb->scrollbar_width) || |
221 FROB (scrollbar_height); | 221 (old_sb->scrollbar_height != new_sb->scrollbar_height) || |
222 FROB (scrollbar_x); | 222 (old_sb->scrollbar_x != new_sb->scrollbar_x) || |
223 FROB (scrollbar_y); | 223 (old_sb->scrollbar_y != new_sb->scrollbar_y)) |
224 #undef FROB | 224 changed = True; |
225 | |
225 *old_sb = *new_sb; | 226 *old_sb = *new_sb; |
226 } | 227 } |
227 | 228 |
228 return changed; | 229 return changed; |
229 } | 230 } |
628 val1->change = change; | 629 val1->change = change; |
629 | 630 |
630 if (change > NO_CHANGE && val1->toolkit_data) | 631 if (change > NO_CHANGE && val1->toolkit_data) |
631 { | 632 { |
632 if (val1->free_toolkit_data) | 633 if (val1->free_toolkit_data) |
633 free (val1->toolkit_data); | 634 XtFree (val1->toolkit_data); |
634 val1->toolkit_data = NULL; | 635 val1->toolkit_data = NULL; |
635 } | 636 } |
636 | 637 |
637 return val1; | 638 return val1; |
638 } | 639 } |