projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+6BD6): Apply new conventions for glyph granularity.
[chise/xemacs-chise.git-]
/
src
/
scrollbar-x.c
diff --git
a/src/scrollbar-x.c
b/src/scrollbar-x.c
index
e06f598
..
b7b193b
100644
(file)
--- a/
src/scrollbar-x.c
+++ b/
src/scrollbar-x.c
@@
-23,6
+23,8
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: Not in FSF. */
/* 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"
#include <config.h>
#include "lisp.h"
@@
-69,19
+71,21
@@
x_inhibit_scrollbar_slider_size_change (void)
static void
x_free_scrollbar_instance (struct scrollbar_instance *instance)
{
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. */
}
/* A device method. */
@@
-278,7
+282,7
@@
x_update_scrollbar_instance_status (struct window *w, int active, int size,
}
}
}
}
- if (!wv->scrollbar_data) abort ();
+ if (!wv->scrollbar_data) ABORT ();
free_widget_value_tree (wv);
}
else if (managed)
free_widget_value_tree (wv);
}
else if (managed)
@@
-364,7
+368,7
@@
x_scrollbar_loop (enum x_scrollbar_loop type, Lisp_Object window,
}
break;
default:
}
break;
default:
- abort ();
+ ABORT ();
}
}
}
}
@@
-406,6
+410,9
@@
x_update_vertical_scrollbar_callback (Widget widget, LWLIB_ID id,
return;
mirror = find_scrollbar_window_mirror (f, id);
return;
mirror = find_scrollbar_window_mirror (f, id);
+ if (!mirror)
+ return;
+
win = real_window (mirror, 1);
if (NILP (win))
win = real_window (mirror, 1);
if (NILP (win))
@@
-609,6
+616,9
@@
x_update_horizontal_scrollbar_callback (Widget widget, LWLIB_ID id,
return;
mirror = find_scrollbar_window_mirror (f, id);
return;
mirror = find_scrollbar_window_mirror (f, id);
+ if (!mirror)
+ return;
+
win = real_window (mirror, 1);
if (NILP (win))
win = real_window (mirror, 1);
if (NILP (win))
@@
-677,13
+687,13
@@
x_scrollbar_pointer_changed_in_window (struct window *w)
void
x_update_frame_scrollbars (struct frame *f)
{
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--;
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
}
#ifdef MEMORY_USAGE_STATS