Changeset 1391 for trunk/dll/mainwnd.c


Ignore:
Timestamp:
Jan 12, 2009, 12:55:53 AM (17 years ago)
Author:
Gregg Young
Message:

Move nontranslated strings to init.c and codepage.c; use those strings in place of GetPString calls. Move other strings to a StringTable; minor cleanup and code changes to codepage.c to use a string array instead of GetPString calls. Ticket 340

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/mainwnd.c

    r1375 r1391  
    7878  03 Jan 09 GKY Check for system that is protectonly to gray out Dos/Win command lines and prevent
    7979                Dos/Win programs from being inserted into the execute dialog with message why.
     80  11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
    8081
    8182***********************************************************************/
    … …  
    10031004    lxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
    10041005    WinSetWindowULong(hwndBubble, QWL_USER, hwnd);
    1005     SetPresParams(hwndBubble, NULL, NULL, NULL, GetPString(IDS_8HELVTEXT));
     1006    //fixme to allow user to change presparams 1-10-09 GKY
     1007    SetPresParams(hwndBubble, NULL, NULL, NULL, FNT_8HELVETICA);
    10061008    hps = WinGetPS(hwndBubble);
    10071009    p = help;
    … …  
    12261228        break;
    12271229      default:
     1230        //fixme to allow user to change presparams 1-10-09 GKY
    12281231        SetPresParams(hwnd,
    12291232                      &RGBGREY,
    1230                       &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
     1233                      &RGBBLACK, &RGBGREY, FNT_6HELVETICA );
    12311234        break;
    12321235      }
    … …  
    14181421    DosReleaseMutexSem(hmtxFM2Globals);
    14191422    //DosExitCritSec();
    1420     SetPresParams(hwndMenu, NULL, NULL, NULL, GetPString(IDS_10SYSPROTEXT));
     1423    //fixme to allow user to change font 1-10-09 GKY
     1424    SetPresParams(hwndMenu, NULL, NULL, NULL, FNT_10SYSTEMPROPORT);
    14211425    if (PopupMenu(hwnd, hwnd, hwndMenu))
    14221426      WinShowWindow(hwndMenu, TRUE);
    … …  
    16151619        SetPresParams(hwndTool,
    16161620                      &RGBGREY,
    1617                       &RGBBLACK, &RGBGREY, GetPString(IDS_2SYSTEMVIOTEXT));
     1621                      &RGBBLACK, &RGBGREY, FNT_2SYSTEMVIO);
    16181622      }
    16191623    }
    16201624    ctrlxpos += ((tool->flags & T_TEXT) ? 55L : 33L);
     1625    //fixme to allow user to change presparams 1-10-09 GKY
    16211626    SetPresParams(WinWindowFromID(hwndT, tool->id),
    1622                   NULL, NULL, NULL, GetPString(IDS_8HELVTEXT));
     1627                  NULL, NULL, NULL, FNT_8HELVETICA);
    16231628    tool = tool->next;
    16241629  }                                     // while tool
    … …  
    17951800      memset(&rgb, 0, sizeof(rgb));
    17961801      rgb.bRed = (BYTE)128;
     1802      //fixme to allow user to change presparams 1-10-09 GKY
    17971803      SetPresParams(hwnd,
    1798                     &RGBGREY, &rgb, &RGBGREY, GetPString(IDS_8HELVTEXT));
     1804                    &RGBGREY, &rgb, &RGBGREY, FNT_8HELVETICA);
    17991805      SetTargetDir(hwnd, TRUE);
    18001806    }
    … …  
    22692275            Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
    22702276                       IDS_WINCREATEWINDOW);
    2271           else {
     2277          else {
     2278            //fixme to allow user to change presparams 1-10-09 GKY
    22722279            SetPresParams(hwndB,
    22732280                          &RGBGREY,
    2274                           &RGBBLACK, &RGBGREY, GetPString(IDS_6HELVTEXT));
     2281                          &RGBBLACK, &RGBGREY, FNT_6HELVETICA);
    22752282            WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
    22762283          }
    … …  
    23312338    {
    23322339      MRESULT mr = PFNWPStatic(hwnd, msg, mp1, mp2);
    2333 
     2340      //fixme to allow user to change presparams 1-10-09 GKY
    23342341      SetPresParams(hwnd,
    23352342                    &RGBGREY,
    2336                     &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
     2343                    &RGBBLACK, &RGBGREY, FNT_8HELVETICABOLD);
    23372344      return mr;
    23382345    }
    … …  
    56185625    else {
    56195626      WinSubclassWindow(WinWindowFromID(hwndFrame, IDM_IDEALSIZE),
    5620                         IdealButtonProc);
     5627                        IdealButtonProc);
     5628      //fixme to allow user to change presparams 1-10-09 GKY
    56215629      SetPresParams(WinWindowFromID(hwndFrame,
    56225630                                    IDM_IDEALSIZE),
    5623                     NULL, NULL, NULL, GetPString(IDS_10SYSTEMVIOTEXT));
     5631                    NULL, NULL, NULL, FNT_10SYSTEMVIO);
    56245632    }
    56255633
    … …  
    57215729    if (!hwndDrivelist)
    57225730      Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     5731    //fixme to allow user to change presparams 1-10-09 GKY
    57235732    SetPresParams(hwndDrivelist,
    5724                   NULL, NULL, NULL, GetPString(IDS_10SYSTEMMONOTEXT));
     5733                  NULL, NULL, NULL, "10.System Monospaced");
    57255734    hwndButtonlist = WinCreateWindow(hwndFrame,
    57265735                                     WC_COMBOBOX,
Note: See TracChangeset for help on using the changeset viewer.