diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-05-13 13:41:03 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-05-13 13:41:03 +0000 |
| commit | 6a1a37028e909c1a99900125cec0a07b3a788d69 (patch) | |
| tree | 3ad15acb8fb95dc002e9bd18bb1845bb3dcfd086 | |
| parent | 0440ca33713c5af7e218b37ffff41cdb3970711e (diff) | |
| download | vim-git-6a1a37028e909c1a99900125cec0a07b3a788d69.tar.gz | |
updated for version 7.0-014v7.0.014
| -rw-r--r-- | src/gui_xmebw.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c index 820aeba43..670e0c02e 100644 --- a/src/gui_xmebw.c +++ b/src/gui_xmebw.c @@ -480,7 +480,7 @@ draw_shadows(XmEnhancedButtonWidget eb) || (eb->core.height <= 2 * eb->primitive.highlight_thickness)) return; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) { XmDisplay dpy; @@ -641,7 +641,7 @@ draw_label(XmEnhancedButtonWidget eb, XEvent *event, Region region) GC tmp_gc = NULL; Boolean replaceGC = False; Boolean deadjusted = False; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); Boolean etched_in = dpy->display.enable_etched_in_menu; #else @@ -726,7 +726,7 @@ Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params) if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) && _XmGetInDragMode((Widget) eb)) { -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); Boolean etched_in = dpy->display.enable_etched_in_menu; #else @@ -810,7 +810,7 @@ Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params) if (Lab_IsMenupane(eb)) { -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); Boolean etched_in = dpy->display.enable_etched_in_menu; #else @@ -1150,7 +1150,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n) Redisplay(Widget w, XEvent *event, Region region) { XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) XmDisplay dpy; XtEnum default_button_emphasis; #endif @@ -1162,7 +1162,7 @@ Redisplay(Widget w, XEvent *event, Region region) if (!XtIsRealized((Widget)eb)) return; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); default_button_emphasis = dpy->display.default_button_emphasis; #endif @@ -1241,7 +1241,7 @@ Redisplay(Widget w, XEvent *event, Region region) { int adjust = 0; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) /* * NOTE: PushButton has two types of shadows: primitive-shadow and * default-button-shadow. If pushbutton is in a menu only primitive @@ -1289,7 +1289,7 @@ Redisplay(Widget w, XEvent *event, Region region) adjust, adjust, rectwidth, rectheight, borderwidth); } -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) switch (default_button_emphasis) { case XmINTERNAL_HIGHLIGHT: @@ -1365,7 +1365,7 @@ Redisplay(Widget w, XEvent *event, Region region) default_button_shadow_thickness = eb->pushbutton.default_button_shadow_thickness; -#ifndef LESSTIF_VERSION +#if !defined(LESSTIF_VERSION) && (XmVersion > 1002) /* * Compute location of bounding box to contain the * defaultButtonShadow. diff --git a/src/version.c b/src/version.c index a3a720f94..504e74296 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 14, +/**/ 13, /**/ 12, |