Changeset 1498 for trunk/dll/tools.c

Timestamp:

Jan 18, 2010, 1:57:01 AM (16 years ago)

Author:

Gregg Young

Message:

Changes to get FM2 to compile with the latest watcom 1.9 beta (mostly type casts of CHAR CONSTANT * to CHAR *). Changes to get the environment settings working everywhere again (broken by the change that moved commands to the INI); Added an environment size variable (set to 2048 which was the largest I found hard coded). Still need to find everywhere the environment size is set and use this variable.

File:

• trunk/dll/tools.c (modified) (11 diffs)

trunk/dll/tools.c

@@ -7 +7 @@
 
   Copyright (c) 1994-97 M. Kimes
-  Copyright (c) 2004, 2008 Steven H.Levine
+  Copyright (c) 2004, 2010 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -24 +24 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -233 +234 @@
   if (toolhead && filename && *filename) {
     strcpy(lasttoolbar, filename);
-    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", filename);
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", filename);
   }
   if (!toolhead) {
@@ -424 +425 @@
     if (!toolhead || !toolhead->next)
       WinDismissDlg(hwnd, 0);
-    WinSetWindowText(hwnd, GetPString(IDS_RETOOLTEXT));
+    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_RETOOLTEXT));
     {
       TOOL *tool;
@@ -612 +613 @@
     WinSetWindowPtr(hwnd, QWL_USER, mp2);
     if (mp2) {
-      WinSetWindowText(hwnd, GetPString(IDS_EDITTOOLTEXT));
+      WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_EDITTOOLTEXT));
       WinSendDlgItemMsg(hwnd, ADDBTN_ID, EM_SETREADONLY,
                         MPFROM2SHORT(TRUE, 0), MPVOID);
@@ -700 +701 @@
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
         WinSetDlgItemText(hwnd, ADDBTN_HELPME,
-                          GetPString(IDS_ADDTOOLQUICKHELPTEXT));
+                          (CHAR *) GetPString(IDS_ADDTOOLQUICKHELPTEXT));
       break;
 
@@ -708 +709 @@
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
         WinSetDlgItemText(hwnd, ADDBTN_HELPME,
-                          GetPString(IDS_ADDTOOLBUTTONTEXT));
+                          (CHAR *) GetPString(IDS_ADDTOOLBUTTONTEXT));
       break;
 
@@ -718 +719 @@
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
         WinSetDlgItemText(hwnd,
-                          ADDBTN_HELPME, GetPString(IDS_ADDTOOLBUTTONIDTEXT));
+                          ADDBTN_HELPME, (CHAR *) GetPString(IDS_ADDTOOLBUTTONIDTEXT));
       break;
 
@@ -942 +943 @@
     else {
       WinSetWindowULong(hwnd, QWL_USER, FALSE);
-      WinSetWindowText(hwnd, GetPString(IDS_LOADTOOLBARTITLETEXT));
+      WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_LOADTOOLBARTITLETEXT));
     }
     WinSendDlgItemMsg(hwnd,
@@ -991 +992 @@
     WinSetDlgItemText(hwnd,
                       SVBTN_CURRENT,
-                      (*lasttoolbar) ? lasttoolbar : PCSZ_FM3TOOLSDAT);
+                      (*lasttoolbar) ? lasttoolbar : (CHAR *) PCSZ_FM3TOOLSDAT);
     break;
 
@@ -1069 +1070 @@
           }
         }
-        PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+        PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
       }
       WinDismissDlg(hwnd, 1);