projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some mappings between CNS 11643-6 and CJK Ext-B code points.
[chise/xemacs-chise.git-]
/
lwlib
/
xlwmenu.c
diff --git
a/lwlib/xlwmenu.c
b/lwlib/xlwmenu.c
index
5fadadf
..
cd013c8
100644
(file)
--- a/
lwlib/xlwmenu.c
+++ b/
lwlib/xlwmenu.c
@@
-197,7
+197,7
@@
XlwMenuClassRec xlwMenuClassRec =
XtNumber(xlwMenuResources), /* resource_count */
NULLQUARK, /* xrm_class */
TRUE, /* compress_motion */
XtNumber(xlwMenuResources), /* resource_count */
NULLQUARK, /* xrm_class */
TRUE, /* compress_motion */
- TRUE, /* compress_exposure */
+ XtExposeCompressMaximal, /* compress_exposure */
TRUE, /* compress_enterleave */
FALSE, /* visible_interest */
XlwMenuDestroy, /* destroy */
TRUE, /* compress_enterleave */
FALSE, /* visible_interest */
XlwMenuDestroy, /* destroy */
@@
-348,7
+348,8
@@
close_to_reference_time (Widget w, Time reference_time, XEvent *ev)
{
return
reference_time &&
{
return
reference_time &&
- (ev->xbutton.time - reference_time < XtGetMultiClickTime (XtDisplay (w)));
+ (ev->xbutton.time - reference_time
+ < (Time) XtGetMultiClickTime (XtDisplay (w)));
}
\f
/* Size code */
}
\f
/* Size code */
@@
-2325,7
+2326,7
@@
make_windows_if_needed (XlwMenuWidget mw, int n)
int start_at;
XSetWindowAttributes xswa;
Widget p;
int start_at;
XSetWindowAttributes xswa;
Widget p;
- int mask;
+ unsigned long mask;
int depth;
Visual *visual;
window_state *windows;
int depth;
Visual *visual;
window_state *windows;
@@
-3004,10
+3005,6
@@
XlwMenuInitialize (Widget request, Widget new, ArgList args,
{
/* Get the GCs and the widget size */
XlwMenuWidget mw = (XlwMenuWidget)new;
{
/* Get the GCs and the widget size */
XlwMenuWidget mw = (XlwMenuWidget)new;
-
- XSetWindowAttributes xswa;
- int mask;
-
Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
Display *display = XtDisplay (mw);
Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
Display *display = XtDisplay (mw);
@@
-3044,10
+3041,6
@@
XlwMenuInitialize (Widget request, Widget new, ArgList args,
make_shadow_gcs (mw);
extract_font_extents (mw);
make_shadow_gcs (mw);
extract_font_extents (mw);
- xswa.background_pixel = mw->core.background_pixel;
- xswa.border_pixel = mw->core.border_pixel;
- mask = CWBackPixel | CWBorderPixel;
-
mw->menu.popped_up = False;
mw->menu.pointer_grabbed = False;
mw->menu.next_release_must_exit = False;
mw->menu.popped_up = False;
mw->menu.pointer_grabbed = False;
mw->menu.next_release_must_exit = False;
@@
-3085,7
+3078,7
@@
XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
{
XlwMenuWidget mw = (XlwMenuWidget)w;
XSetWindowAttributes xswa;
{
XlwMenuWidget mw = (XlwMenuWidget)w;
XSetWindowAttributes xswa;
- int mask;
+ unsigned long mask;
(*xlwMenuWidgetClass->core_class.superclass->core_class.realize)
(w, valueMask, attributes);
(*xlwMenuWidgetClass->core_class.superclass->core_class.realize)
(w, valueMask, attributes);