diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-05-24 09:13:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-05-24 09:13:31 +0000 |
| commit | 40a1b46245c1a8786324f5a06d6cb8d4bd9d5b74 (patch) | |
| tree | f45020695e190f511f4faf4dd3ed144059f298c0 /lwlib/xlwmenu.c | |
| parent | dbe9f5ba9648890dc34f4836a49fde766b21ce74 (diff) | |
| parent | 4ea5193b9cc5c577127ca6c89ecfaad819398d3b (diff) | |
| download | emacs-40a1b46245c1a8786324f5a06d6cb8d4bd9d5b74.tar.gz | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-289
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-290
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-291
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-292
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-293
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-567
Diffstat (limited to 'lwlib/xlwmenu.c')
| -rw-r--r-- | lwlib/xlwmenu.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 7b35f0ce62a..1a0dcf7d0b3 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -53,21 +53,8 @@ extern int gray_bitmap_width; extern int gray_bitmap_height; extern char *gray_bitmap_bits; -/* Defined in xterm.c. */ -extern int x_alloc_nearest_color_for_widget __P ((Widget, Colormap, XColor*)); -extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap, - unsigned long *, - double, int)); -extern int x_catch_errors __P ((Display*)); -extern void x_uncatch_errors P_ ((Display *, int)); -extern int x_had_errors_p __P ((Display*)); -extern void x_clear_errors __P ((Display*)); -extern unsigned long x_copy_dpy_color __P ((Display *, Colormap, - unsigned long)); - -/* Defined in xfaces.c. */ -extern void x_free_dpy_colors __P ((Display *, Screen *, Colormap, - unsigned long *pixels, int npixels)); +#include "xterm.h" + #else /* not emacs */ #include <X11/bitmaps/gray> @@ -352,7 +339,7 @@ make_old_stack_space (mw, n) } /* Size code */ -int +static int string_width (mw, s) XlwMenuWidget mw; char *s; @@ -2098,6 +2085,7 @@ Start (w, ev, params, num_params) mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; /* handles the down like a move, slots are compatible */ + ev->xmotion.is_hint = 0; handle_motion_event (mw, &ev->xmotion); } } @@ -2435,7 +2423,6 @@ pop_up_menu (mw, event) int borderwidth = mw->menu.shadow_thickness; Screen* screen = XtScreen (mw); Display *display = XtDisplay (mw); - int count; next_release_must_exit = 0; @@ -2482,7 +2469,7 @@ pop_up_menu (mw, event) } #ifdef emacs - count = x_catch_errors (display); + x_catch_errors (display); #endif if (XtGrabPointer ((Widget)mw, False, (PointerMotionMask @@ -2510,9 +2497,10 @@ pop_up_menu (mw, event) pointer_grabbed = 0; XtUngrabPointer ((Widget)mw, event->time); } - x_uncatch_errors (display, count); + x_uncatch_errors (); #endif + ((XMotionEvent*)event)->is_hint = 0; handle_motion_event (mw, (XMotionEvent*)event); } |