aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

updated for version 7.1-317

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-20 09:40:11 +00:00
parent 7c94c26fb2
commit 4678465a4b
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui_motif.c
View File

@@ -686,8 +686,8 @@ manage_centered(dialog_child)
/* Temporarily set value of XmNmappedWhenManaged /* Temporarily set value of XmNmappedWhenManaged
to stop the dialog from popping up right away */ to stop the dialog from popping up right away */
XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, 0); XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL);
XtVaSetValues(shell, XmNmappedWhenManaged, False, 0); XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
XtManageChild(dialog_child); XtManageChild(dialog_child);
@@ -723,7 +723,7 @@ manage_centered(dialog_child)
XtMapWidget(shell); XtMapWidget(shell);
/* Restore the value of XmNmappedWhenManaged */ /* Restore the value of XmNmappedWhenManaged */
XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, 0); XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL);
} }
#if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \ #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \
@@ -1993,7 +1993,7 @@ do_mnemonic(Widget w, unsigned int keycode)
{ {
if (XtClass(w) == xmRowColumnWidgetClass) if (XtClass(w) == xmRowColumnWidgetClass)
{ {
XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL);
isMenu = (rowColType != (unsigned char)XmWORK_AREA); isMenu = (rowColType != (unsigned char)XmWORK_AREA);
} }
else else
@@ -2001,14 +2001,14 @@ do_mnemonic(Widget w, unsigned int keycode)
if (!isMenu) if (!isMenu)
{ {
XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
&numChildren, 0); &numChildren, NULL);
for (i = 0; i < numChildren; i++) for (i = 0; i < numChildren; i++)
do_mnemonic(children[i], keycode); do_mnemonic(children[i], keycode);
} }
} }
else else
{ {
XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL);
if (mnemonic != '\0') if (mnemonic != '\0')
{ {
mneString[0] = mnemonic; mneString[0] = mnemonic;
@@ -2019,7 +2019,7 @@ do_mnemonic(Widget w, unsigned int keycode)
if (XtClass(w) == xmLabelWidgetClass if (XtClass(w) == xmLabelWidgetClass
|| XtClass(w) == xmLabelGadgetClass) || XtClass(w) == xmLabelGadgetClass)
{ {
XtVaGetValues(w, XmNuserData, &userData, 0); XtVaGetValues(w, XmNuserData, &userData, NULL);
if (userData != NULL && XtIsWidget(userData)) if (userData != NULL && XtIsWidget(userData))
XmProcessTraversal(userData, XmTRAVERSE_CURRENT); XmProcessTraversal(userData, XmTRAVERSE_CURRENT);
} }
@@ -2073,7 +2073,7 @@ add_mnemonic_grabs(Widget dialog, Widget w)
{ {
if (XtClass(w) == xmRowColumnWidgetClass) if (XtClass(w) == xmRowColumnWidgetClass)
{ {
XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL);
isMenu = (rowColType != (unsigned char)XmWORK_AREA); isMenu = (rowColType != (unsigned char)XmWORK_AREA);
} }
else else
@@ -2081,14 +2081,14 @@ add_mnemonic_grabs(Widget dialog, Widget w)
if (!isMenu) if (!isMenu)
{ {
XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, XtVaGetValues(w, XmNchildren, &children, XmNnumChildren,
&numChildren, 0); &numChildren, NULL);
for (i = 0; i < numChildren; i++) for (i = 0; i < numChildren; i++)
add_mnemonic_grabs(dialog, children[i]); add_mnemonic_grabs(dialog, children[i]);
} }
} }
else else
{ {
XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL);
if (mnemonic != '\0') if (mnemonic != '\0')
{ {
mneString[0] = mnemonic; mneString[0] = mnemonic;

0
src/testdir/test65.in Normal file
View File

0
src/testdir/test65.ok Normal file
View File

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 */
/**/
317,
/**/ /**/
316, 316,
/**/ /**/