/* Synched up with: Not in FSF. */
+/* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */
+
#include <config.h>
#include "lisp.h"
static void
x_free_scrollbar_instance (struct scrollbar_instance *instance)
{
- if (SCROLLBAR_X_NAME (instance))
- xfree (SCROLLBAR_X_NAME (instance));
-
- if (SCROLLBAR_X_WIDGET (instance))
+ if (instance->scrollbar_data)
{
- if (XtIsManaged (SCROLLBAR_X_WIDGET (instance)))
- XtUnmanageChild (SCROLLBAR_X_WIDGET (instance));
+ if (SCROLLBAR_X_NAME (instance))
+ xfree (SCROLLBAR_X_NAME (instance));
- lw_destroy_all_widgets (SCROLLBAR_X_ID (instance));
- }
+ if (SCROLLBAR_X_WIDGET (instance))
+ {
+ if (XtIsManaged (SCROLLBAR_X_WIDGET (instance)))
+ XtUnmanageChild (SCROLLBAR_X_WIDGET (instance));
- if (instance->scrollbar_data)
- xfree (instance->scrollbar_data);
+ lw_destroy_all_widgets (SCROLLBAR_X_ID (instance));
+ }
+
+ xfree (instance->scrollbar_data);
+ }
}
/* A device method. */
}
}
- if (!wv->scrollbar_data) abort ();
+ if (!wv->scrollbar_data) ABORT ();
free_widget_value_tree (wv);
}
else if (managed)
}
break;
default:
- abort ();
+ ABORT ();
}
}
mirror = find_scrollbar_window_mirror (f, id);
if (!mirror)
return;
-
+
win = real_window (mirror, 1);
if (NILP (win))
mirror = find_scrollbar_window_mirror (f, id);
if (!mirror)
return;
-
+
win = real_window (mirror, 1);
if (NILP (win))
void
x_update_frame_scrollbars (struct frame *f)
{
- /* Consider this code to be "in_display" so that we abort() if Fsignal()
+ /* Consider this code to be "in_display" so that we ABORT() if Fsignal()
gets called. */
in_display++;
x_scrollbar_loop (X_UPDATE_FRAME_SCROLLBARS, f->root_window, f->root_mirror,
0, (Window) NULL);
in_display--;
- if (in_display < 0) abort ();
+ if (in_display < 0) ABORT ();
}
#ifdef MEMORY_USAGE_STATS