X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtstyle%2FI18nMain.c;h=b468ee179ff07f836c2bd31a13e89dff99bf0947;hb=408d18b711cb2c904817d5c5bb85abd3e861612c;hp=cea3c9f6bad831eb24543c55fc1bb448c024e719;hpb=dcdd21df3431e532728b9dbda6d2519921336f8e;p=oweals%2Fcde.git

diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c
index cea3c9f6..b468ee17 100644
--- a/cde/programs/dtstyle/I18nMain.c
+++ b/cde/programs/dtstyle/I18nMain.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -46,6 +46,7 @@
 /*+++++++++++++++++++++++++++++++++++++++*/
 
 #include <X11/Xlib.h>
+#include <errno.h>
 #include <Xm/MwmUtil.h>
 
 #include <Xm/XmP.h>
@@ -362,7 +363,7 @@ static Widget
 BuildI18nDlg(
       Widget shell )
 {
-    register int     i, n;
+    int     i, n;
     Arg              args[MAX_ARGS];
     XmString         button_string[NUM_LABELS]; 
     XmString         string; 
@@ -376,9 +377,9 @@ BuildI18nDlg(
     /* get i18n resource values  */
 
     /* Set up DialogBoxDialog button labels */
-    button_string[0] = CMPSTR(_DtOkString);
-    button_string[1] = CMPSTR(_DtCancelString);
-    button_string[2] = CMPSTR(_DtHelpString);
+    button_string[0] = CMPSTR((String) _DtOkString);
+    button_string[1] = CMPSTR((String) _DtCancelString);
+    button_string[2] = CMPSTR((String) _DtHelpString);
 
     /* Create toplevel DialogBox */
 
@@ -509,7 +510,7 @@ BuildI18nDlg(
     n = 0;
     XtSetArg(args[n], XmNcomboBoxType, XmDROP_DOWN_COMBO_BOX); n++;
     i18n.serverHostCB =
-  	(Widget) XmCreateComboBox(inputMethodForm, "serverHostCB", args, n);
+  	(Widget) (intptr_t) XmCreateComboBox(inputMethodForm, "serverHostCB", args, n);
 
     XtAddCallback(XtNameToWidget(i18n.serverHostCB, "Text"),
 		  XmNactivateCallback, ServerHostCB, NULL);
@@ -560,7 +561,7 @@ BuildI18nDlg(
     n = 0;
     XtSetArg(args[n], XmNselectionPolicy, XmBROWSE_SELECT); n++;
     i18n.preeditTypeList =
-	(Widget) XmCreateList(preeditTypeForm, "preeditTypeList", args, n);
+	(Widget) (intptr_t) XmCreateList(preeditTypeForm, "preeditTypeList", args, n);
 
     n = 0;
     string = CMPSTR((char *)GETMESSAGE(19, 10, "Move Up"));
@@ -825,7 +826,8 @@ UpdateImList(
     I18nEnv *env,
     char *hostname)
 {
-    Cardinal n,i;
+    Cardinal i;
+    XtArgVal n;
     Widget *im_tog = NULL;
     int ret = NoError;
 
@@ -992,7 +994,8 @@ SaveSelectedValues(
 {
     int ret = NoError;
     char *preeditStr = NULL, *tmpStr;
-    int i, num_preedit = 0;
+    int i;
+    XtArgVal num_preedit = 0;
     XmStringTable list_preedit;
     static char preeditTypeRes[1024];
 
@@ -1068,7 +1071,8 @@ SetFileSelValues(
 )
 {
     char *hostname;
-    Cardinal n,i;
+    Cardinal i;
+    XtArgVal n;
     Widget *im_tog;
 
     /* The hostname value is stored in the ImsSel structure. */
@@ -1202,7 +1206,9 @@ saveI18n(
 	sprintf(bufr, "%s*i18nDlg.y: %d\n", bufr, y);
 	sprintf(bufr, "%s*i18nDlg.width: %d\n", bufr, width);
 	sprintf(bufr, "%s*i18nDlg.height: %d\n", bufr, height);
-	write (fd, bufr, strlen(bufr));
+	if(-1 == write (fd, bufr, strlen(bufr))) {
+		perror(strerror(errno));
+	}
     }
 }
 
@@ -1398,7 +1404,7 @@ MoveUpCB(
 	    XtVaGetValues(i18n.preeditTypeList, XmNitems, &list_items, NULL);
 
 	    /* makes an array of two XmStrings by reversing the selected
-	       one and the item preceeding it */
+	       one and the item preceding it */
 	    items[0] = list_items[sel_index];
 	    items[1] = list_items[sel_index - 1];