aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0-014

Browse Source
This commit is contained in:
Bram Moolenaar
2006-05-13 13:41:03 +00:00
parent 0440ca3371
commit 6a1a37028e
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui_xmebw.c
View File

@@ -480,7 +480,7 @@ draw_shadows(XmEnhancedButtonWidget eb)
|| (eb->core.height <= 2 * eb->primitive.highlight_thickness)) || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
return; return;
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
{ {
XmDisplay dpy; XmDisplay dpy;
@@ -641,7 +641,7 @@ draw_label(XmEnhancedButtonWidget eb, XEvent *event, Region region)
GC tmp_gc = NULL; GC tmp_gc = NULL;
Boolean replaceGC = False; Boolean replaceGC = False;
Boolean deadjusted = False; Boolean deadjusted = False;
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
Boolean etched_in = dpy->display.enable_etched_in_menu; Boolean etched_in = dpy->display.enable_etched_in_menu;
#else #else
@@ -726,7 +726,7 @@ Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params)
if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
&& _XmGetInDragMode((Widget) eb)) && _XmGetInDragMode((Widget) eb))
{ {
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
Boolean etched_in = dpy->display.enable_etched_in_menu; Boolean etched_in = dpy->display.enable_etched_in_menu;
#else #else
@@ -810,7 +810,7 @@ Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params)
if (Lab_IsMenupane(eb)) if (Lab_IsMenupane(eb))
{ {
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
Boolean etched_in = dpy->display.enable_etched_in_menu; Boolean etched_in = dpy->display.enable_etched_in_menu;
#else #else
@@ -1150,7 +1150,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
Redisplay(Widget w, XEvent *event, Region region) Redisplay(Widget w, XEvent *event, Region region)
{ {
XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w;
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
XmDisplay dpy; XmDisplay dpy;
XtEnum default_button_emphasis; XtEnum default_button_emphasis;
#endif #endif
@@ -1162,7 +1162,7 @@ Redisplay(Widget w, XEvent *event, Region region)
if (!XtIsRealized((Widget)eb)) if (!XtIsRealized((Widget)eb))
return; return;
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
default_button_emphasis = dpy->display.default_button_emphasis; default_button_emphasis = dpy->display.default_button_emphasis;
#endif #endif
@@ -1241,7 +1241,7 @@ Redisplay(Widget w, XEvent *event, Region region)
{ {
int adjust = 0; int adjust = 0;
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
/* /*
* NOTE: PushButton has two types of shadows: primitive-shadow and * NOTE: PushButton has two types of shadows: primitive-shadow and
* default-button-shadow. If pushbutton is in a menu only primitive * 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); adjust, adjust, rectwidth, rectheight, borderwidth);
} }
#ifndef LESSTIF_VERSION #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
switch (default_button_emphasis) switch (default_button_emphasis)
{ {
case XmINTERNAL_HIGHLIGHT: case XmINTERNAL_HIGHLIGHT:
@@ -1365,7 +1365,7 @@ Redisplay(Widget w, XEvent *event, Region region)
default_button_shadow_thickness = default_button_shadow_thickness =
eb->pushbutton.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 * Compute location of bounding box to contain the
* defaultButtonShadow. * defaultButtonShadow.

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
14,
/**/ /**/
13, 13,
/**/ /**/