comparison lwlib/xlwmenu.c @ 446:1ccc32a20af4 r21-2-38

Import from CVS: tag r21-2-38
author cvs
date Mon, 13 Aug 2007 11:37:21 +0200
parents abe6d1db359e
children b39c14581166
comparison
equal deleted inserted replaced
445:34f3776fcf0e 446:1ccc32a20af4
2323 { 2323 {
2324 int i; 2324 int i;
2325 int start_at; 2325 int start_at;
2326 XSetWindowAttributes xswa; 2326 XSetWindowAttributes xswa;
2327 Widget p; 2327 Widget p;
2328 int mask; 2328 unsigned long mask;
2329 int depth; 2329 int depth;
2330 Visual *visual; 2330 Visual *visual;
2331 window_state *windows; 2331 window_state *windows;
2332 Window root; 2332 Window root;
2333 2333
3002 XlwMenuInitialize (Widget request, Widget new, ArgList args, 3002 XlwMenuInitialize (Widget request, Widget new, ArgList args,
3003 Cardinal *num_args) 3003 Cardinal *num_args)
3004 { 3004 {
3005 /* Get the GCs and the widget size */ 3005 /* Get the GCs and the widget size */
3006 XlwMenuWidget mw = (XlwMenuWidget)new; 3006 XlwMenuWidget mw = (XlwMenuWidget)new;
3007
3008 XSetWindowAttributes xswa;
3009 int mask;
3010
3011 Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw))); 3007 Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
3012 Display *display = XtDisplay (mw); 3008 Display *display = XtDisplay (mw);
3013 3009
3014 /* mw->menu.cursor = XCreateFontCursor (display, mw->menu.cursor_shape); */ 3010 /* mw->menu.cursor = XCreateFontCursor (display, mw->menu.cursor_shape); */
3015 mw->menu.cursor = mw->menu.cursor_shape; 3011 mw->menu.cursor = mw->menu.cursor_shape;
3042 3038
3043 make_drawing_gcs (mw); 3039 make_drawing_gcs (mw);
3044 make_shadow_gcs (mw); 3040 make_shadow_gcs (mw);
3045 extract_font_extents (mw); 3041 extract_font_extents (mw);
3046 3042
3047 xswa.background_pixel = mw->core.background_pixel;
3048 xswa.border_pixel = mw->core.border_pixel;
3049 mask = CWBackPixel | CWBorderPixel;
3050
3051 mw->menu.popped_up = False; 3043 mw->menu.popped_up = False;
3052 mw->menu.pointer_grabbed = False; 3044 mw->menu.pointer_grabbed = False;
3053 mw->menu.next_release_must_exit = False; 3045 mw->menu.next_release_must_exit = False;
3054 3046
3055 mw->menu.old_depth = 1; 3047 mw->menu.old_depth = 1;
3083 static void 3075 static void
3084 XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes) 3076 XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
3085 { 3077 {
3086 XlwMenuWidget mw = (XlwMenuWidget)w; 3078 XlwMenuWidget mw = (XlwMenuWidget)w;
3087 XSetWindowAttributes xswa; 3079 XSetWindowAttributes xswa;
3088 int mask; 3080 unsigned long mask;
3089 3081
3090 (*xlwMenuWidgetClass->core_class.superclass->core_class.realize) 3082 (*xlwMenuWidgetClass->core_class.superclass->core_class.realize)
3091 (w, valueMask, attributes); 3083 (w, valueMask, attributes);
3092 3084
3093 xswa.save_under = True; 3085 xswa.save_under = True;