Mercurial > hg > xemacs-beta

comparison lwlib/xlwmenu.c @ 199:169c0442b401 r20-3b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b26
author cvs
date Mon, 13 Aug 2007 10:00:33 +0200
parents acd284d43ca1
children e45d5e7c476e
comparison
equal deleted inserted replaced
198:a94d4839ade3 199:169c0442b401
42 #include <X11/cursorfont.h> 42 #include <X11/cursorfont.h>
43 #include <X11/bitmaps/gray> 43 #include <X11/bitmaps/gray>
44 44
45 #ifdef NEED_MOTIF 45 #ifdef NEED_MOTIF
46 #include <Xm/Xm.h> 46 #include <Xm/Xm.h>
47 #if XmVersion < 1002 /* 1.1 or ancient */
48 #undef XmFONTLIST_DEFAULT_TAG
49 #define XmFONTLIST_DEFAULT_TAG XmSTRING_DEFAULT_CHARSET
50 #endif /* XmVersion < 1.2 */
47 #endif 51 #endif
48 #include "xlwmenuP.h" 52 #include "xlwmenuP.h"
49 53
50 #ifdef USE_DEBUG_MALLOC 54 #ifdef USE_DEBUG_MALLOC
51 #include <dmalloc.h> 55 #include <dmalloc.h>
2283 highlighted_pos->y = ws->height; 2287 highlighted_pos->y = ws->height;
2284 else 2288 else
2285 highlighted_pos->x = ws->width; 2289 highlighted_pos->x = ws->width;
2286 } 2290 }
2287 2291
2288 if (hit && !*hit_return && (val->type != SEPARATOR_TYPE)) 2292 if (hit && !*hit_return)
2289 { 2293 {
2290 if (horizontal_p && hit->x > start.x && hit->x < where.x) 2294 if (horizontal_p && hit->x > start.x && hit->x <= where.x)
2291 *hit_return = val; 2295 *hit_return = val;
2292 else if (!horizontal_p && hit->y > start.y && hit->y < where.y) 2296 else if (!horizontal_p && hit->y > start.y && hit->y <= where.y)
2293 *hit_return = val; 2297 *hit_return = val;
2294 } 2298 }
2295 2299
2296 if (horizontal_p) 2300 if (horizontal_p)
2297 where.y = mw->menu.shadow_thickness; 2301 where.y = mw->menu.shadow_thickness;