Changeset 1395 for trunk/dll/common.c


Ignore:
Timestamp:
Feb 8, 2009, 2:48:16 AM (17 years ago)
Author:
Gregg Young
Message:

Allow user to turn off alert and/or error beeps in settings notebook. Ticket 341 Move repeated strings to PCSZs. Ticket 6 Add *DateFormat functions to format dates based on locale Ticket 28 Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error Ticket 6

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/common.c

    r1391 r1395  
    2424  01 Jan 09 GKY Add option to rescan tree container on eject of removable media
    2525  11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
     26  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
    2627
    2728***********************************************************************/
    … …  
    230231                              HWND_TOP, ids[x], NULL, NULL);
    231232    if (!hwndTmp)
    232       Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     233      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
     234                PCSZ_WINCREATEWINDOW);
    233235  } // for
    234236}
    … …  
    407409                               hwndFrame, HWND_TOP, MAIN_STATUS, NULL, NULL);
    408410  if (!hwndStatus)
    409     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     411    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     412              PCSZ_WINCREATEWINDOW);
    410413
    411414  // Right status window
    … …  
    428431                                HWND_TOP, MAIN_STATUS2, NULL, NULL);
    429432  if (!hwndStatus2)
    430     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     433    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     434              PCSZ_WINCREATEWINDOW);
    431435
    432436  hwndAttr = WinCreateWindow(hwndFrame,
    … …  
    446450                             20, hwndFrame, HWND_TOP, IDM_ATTRS, NULL, NULL);
    447451  if (!hwndAttr)
    448     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     452    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     453              PCSZ_WINCREATEWINDOW);
    449454
    450455  hwndDate = WinCreateWindow(hwndFrame,
    … …  
    464469                             20, hwndFrame, HWND_TOP, IDM_INFO, NULL, NULL);
    465470  if (!hwndDate)
    466     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     471    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     472              PCSZ_WINCREATEWINDOW);
    467473
    468474  hwndName = WinCreateWindow(hwndFrame,
    … …  
    482488                             20, hwndFrame, HWND_TOP, IDM_RENAME, NULL, NULL);
    483489  if (!hwndName)
    484     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     490    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     491              PCSZ_WINCREATEWINDOW);
    485492
    486493  hwndTmp = WinCreateWindow(hwndFrame,
    … …  
    499506                            30, hwndFrame, HWND_TOP, MAIN_TOOLS, NULL, NULL);
    500507  if (!hwndTmp)
    501     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     508    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     509              PCSZ_WINCREATEWINDOW);
    502510
    503511  hwndBack = WinCreateWindow(hwndFrame,
    … …  
    518526
    519527  if (!hwndBack)
    520     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     528    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     529              PCSZ_WINCREATEWINDOW);
    521530
    522531  hwndLED = WinCreateWindow(hwndFrame,
    … …  
    529538                            12, hwndFrame, HWND_TOP, MAIN_LED, NULL, NULL);
    530539  if (!hwndLED)
    531     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     540    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     541              PCSZ_WINCREATEWINDOW);
    532542
    533543  hwndLEDHdr = WinCreateWindow(hwndFrame,
    … …  
    542552                               hwndFrame, HWND_TOP, MAIN_LEDHDR, NULL, NULL);
    543553  if (!hwndLEDHdr)
    544     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     554    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     555              PCSZ_WINCREATEWINDOW);
    545556
    546557  hwndAutoview = WinCreateWindow(hwndFrame,
    … …  
    562573                                 HWND_TOP, MAIN_AUTOVIEW, NULL, NULL);
    563574  if (!hwndAutoview)
    564     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     575    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     576              PCSZ_WINCREATEWINDOW);
    565577
    566578  hwndAutoMLE = WinCreateWindow(hwndFrame,
    … …  
    583595                                HWND_TOP, MAIN_AUTOVIEWMLE, NULL, NULL);
    584596  if (!hwndAutoMLE)
    585     Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
     597    Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
     598              PCSZ_WINCREATEWINDOW);
    586599
    587600  oldproc = WinSubclassWindow(hwndAutoMLE, AutoViewProc);
Note: See TracChangeset for help on using the changeset viewer.