Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / editors / nedit / patches / patch-source_preferences.c
blobeaf227a3bb5f24c9c8ab92e783b1d64db0842b9f
1 $NetBSD$
3 Silence gcc warnings about unsafe pointer casts.
5 --- source/preferences.c~ 2004-08-20 19:33:20.000000000 +0000
6 +++ source/preferences.c
7 @@ -2161,7 +2161,7 @@ void SetLanguageMode(WindowInfo *window,
8 XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
9 for (n=0; n<(int)nItems; n++) {
10 XtVaGetValues(items[n], XmNuserData, &userData, NULL);
11 - XmToggleButtonSetState(items[n], (int)userData == mode, False);
12 + XmToggleButtonSetState(items[n], (intptr_t)userData == mode, False);
16 @@ -4946,7 +4946,7 @@ static void updateLanguageModeSubmenu(Wi
17 xmToggleButtonGadgetClass, menu,
18 XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
19 XmNmarginHeight, 0,
20 - XmNuserData, (void *)i,
21 + XmNuserData, (void *)(intptr_t)i,
22 XmNset, window->languageMode==i, NULL);
23 XmStringFree(s1);
24 XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
25 @@ -4967,14 +4967,14 @@ static void setLangModeCB(Widget w, XtPo
26 XtVaGetValues(w, XmNuserData, &mode, NULL);
28 /* If the mode didn't change, do nothing */
29 - if (window->languageMode == (int)mode)
30 + if (window->languageMode == (intptr_t)mode)
31 return;
33 /* redo syntax highlighting word delimiters, etc. */
35 reapplyLanguageMode(window, (int)mode, False);
37 - params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
38 + params[0] = (((intptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(intptr_t)mode]->name;
39 XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);