Changeset 1498 for trunk/dll/eas.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/eas.c

    r1480 r1498  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2004, 2008 Steven H. Levine
     9  Copyright (c) 2004, 2010 Steven H. Levine
    1010
    1111  01 Aug 04 SHL Rework lstrip/rstrip usage
    … …  
    2424  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
    2525  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
     26  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    2627
    2728***********************************************************************/
    … …  
    162163              DosBeep(50, 100);
    163164            WinSetDlgItemText(hwnd, EAC_TEXT,
    164                               GetPString(IDS_EANAMEEXISTSTEXT));
     165                              (CHAR *) GetPString(IDS_EANAMEEXISTSTEXT));
    165166            break;
    166167          }
    … …  
    170171                DosBeep(50, 100);
    171172              WinSetDlgItemText(hwnd, EAC_TEXT,
    172                                 GetPString(IDS_EANAMERESERVEDTEXT));
     173                                (CHAR *) GetPString(IDS_EANAMERESERVEDTEXT));
    173174              return 0;
    174175            }
    … …  
    184185                  DosBeep(50, 100);
    185186                WinSetDlgItemText(hwnd, EAC_TEXT,
    186                                   GetPString(IDS_EAWRONGTYPETEXT));
     187                                  (CHAR *) GetPString(IDS_EAWRONGTYPETEXT));
    187188                return 0;
    188189              }
    … …  
    423424    }
    424425    else
    425       WinSetDlgItemText(hwnd, EA_TEXT, GetPString(IDS_EANOEAS));
     426      WinSetDlgItemText(hwnd, EA_TEXT, (CHAR *) GetPString(IDS_EANOEAS));
    426427    return 0;
    427428
    … …  
    441442      switch (SHORT2FROMMP(mp1)) {
    442443      case LN_SETFOCUS:
    443         WinSetDlgItemText(hwnd, EA_HELP, GetPString(IDS_EAFILENAMESHELPTEXT));
     444        WinSetDlgItemText(hwnd, EA_HELP, (CHAR *) GetPString(IDS_EAFILENAMESHELPTEXT));
    444445        break;
    445446      case LN_KILLFOCUS:
    … …  
    476477      switch (SHORT2FROMMP(mp1)) {
    477478      case LN_SETFOCUS:
    478         WinSetDlgItemText(hwnd, EA_HELP, GetPString(IDS_EATYPESHELPTEXT));
     479        WinSetDlgItemText(hwnd, EA_HELP, (CHAR *) GetPString(IDS_EATYPESHELPTEXT));
    479480        break;
    480481      case LN_KILLFOCUS:
    … …  
    788789      switch (SHORT2FROMMP(mp1)) {
    789790      case EN_SETFOCUS:
    790         WinSetDlgItemText(hwnd, EA_HELP, GetPString(IDS_EADATAHELPTEXT));
     791        WinSetDlgItemText(hwnd, EA_HELP, (CHAR *) GetPString(IDS_EADATAHELPTEXT));
    791792        break;
    792793      case EN_KILLFOCUS:
    … …  
    802803      switch (SHORT2FROMMP(mp1)) {
    803804      case LN_SETFOCUS:
    804         WinSetDlgItemText(hwnd, EA_HELP, GetPString(IDS_EADATAHELPTEXT));
     805        WinSetDlgItemText(hwnd, EA_HELP, (CHAR *) GetPString(IDS_EADATAHELPTEXT));
    805806        break;
    806807      case LN_KILLFOCUS:
    … …  
    813814      switch (SHORT2FROMMP(mp1)) {
    814815      case MLN_SETFOCUS:
    815         WinSetDlgItemText(hwnd, EA_HELP, GetPString(IDS_EADATAHELPTEXT));
     816        WinSetDlgItemText(hwnd, EA_HELP, (CHAR *) GetPString(IDS_EADATAHELPTEXT));
    816817        break;
    817818      case MLN_KILLFOCUS:
    … …  
    983984      }
    984985      if (!eap->head)
    985         WinSetDlgItemText(hwnd, EA_TEXT, GetPString(IDS_EANOEAS));
     986        WinSetDlgItemText(hwnd, EA_TEXT, (CHAR *) GetPString(IDS_EANOEAS));
    986987      break;
    987988
Note: See TracChangeset for help on using the changeset viewer.