--- os2sdk/demos/apps/ds/option.c	2018/08/09 12:25:13	1.1.1.1
+++ os2sdk/demos/apps/ds/option.c	2018/08/09 12:26:02	1.1.1.2
@@ -1,4 +1,6 @@
-/*  option.c - Display option screen */
+/*  option.c - Display option screen		    */
+/*  Created by Microsoft Corp. 1986  */
+
 
 #include "ds.h"
 #include "vars.h"
@@ -108,9 +110,9 @@ optionInit ()
 */
 showOption ()
 {
-    int  row,col,key;
+    USHORT row,col,key;
     Attr attrib, fore, back, brite, blink;
-    int  cRow,cCol;
+    USHORT cRow,cCol;
     Attr oldColor[N_COLORS];
     int  i;
     Attr oldPopupC;
@@ -123,7 +125,7 @@ showOption ()
 
     a = oldPopupC;
     for (row=0; row<O_HEIGHT; row++)
-	VIOWRTCHARSTRATT (chfs(optScreen[row]), O_WIDTH, row+O_ROW,O_COL,
+	VioWrtCharStrAtt (chfs(optScreen[row]), O_WIDTH, row+O_ROW,O_COL,
 			  afs(&a), VioHandle);
 
     for (row=0; row<N_COLORS; row++)
@@ -133,7 +135,7 @@ showOption ()
     cRow = 0;
     cCol = 0;
     while (key != enterKey) {
-	VIOSETCURPOS (O_Start_Row+cRow,curCol[cCol]-1, VioHandle);
+	VioSetCurPos (O_Start_Row+cRow,curCol[cCol]-1, VioHandle);
 	key = getKey();
 	switch (key) {
 	    case upKey:
@@ -246,7 +248,7 @@ int row,col,inc,oldPopupC;
 *
 */
 showRow (row,oldPopupC)
-int row;
+USHORT row;
 int oldPopupC;
 {
     Attr attrib, fore, back, brite, blink;
@@ -256,20 +258,20 @@ int oldPopupC;
 
     attrToParts (color[row], &fore, &back, &brite, &blink);
 
-    VIOWRTCHARSTRATT (chfs(cName[fore]), C_NAME_LEN,
+    VioWrtCharStrAtt (chfs(cName[fore]), C_NAME_LEN,
 			row+O_Start_Row,O_FORE_COL, afs(&a), VioHandle);
 
-    VIOWRTCHARSTRATT (chfs(cName[back]), C_NAME_LEN,
+    VioWrtCharStrAtt (chfs(cName[back]), C_NAME_LEN,
 			row+O_Start_Row,O_BACK_COL, afs(&a), VioHandle);
 
-    VIOWRTCHARSTRATT (chfs(tName[brite]), TOGGLE_LEN,
+    VioWrtCharStrAtt (chfs(tName[brite]), TOGGLE_LEN,
 			row+O_Start_Row,O_BRIGHT_COL, afs(&a), VioHandle);
 
-    VIOWRTCHARSTRATT (chfs(tName[blink]), TOGGLE_LEN,
+    VioWrtCharStrAtt (chfs(tName[blink]), TOGGLE_LEN,
 			row+O_Start_Row,O_BLINK_COL, afs(&a), VioHandle);
 
     a = color[row];
-    VIOWRTNATTR (afs(&a), SAMPLE_LEN, row+O_Start_Row,O_SAMPLE_COL, VioHandle);
+    VioWrtNAttr (afs(&a), SAMPLE_LEN, row+O_Start_Row,O_SAMPLE_COL, VioHandle);
 
 }   /* showRow */