Changeset 299


Ignore:
Timestamp:
Jun 27, 2006, 2:18:37 AM (19 years ago)
Author:
root
Message:

Use QWL_USER more
Map IDM_WINDOWDLG to match IBM_TWODIRS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/mainwnd2.c

    r246 r299  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2005 Steven H. Levine
     9  Copyright (c) 2005, 2006 Steven H. Levine
    1010
    1111  23 May 05 SHL Use datamin.h
    1212  26 May 05 SHL Comments and localize code
    1313  06 Aug 05 SHL Renames
     14  02 Jan 06 SHL Use QWL_USER more
     15  02 Jan 06 SHL Map IDM_WINDOWDLG to match IBM_TWODIRS
    1416
    1517***********************************************************************/
     
    4951static MRESULT EXPENTRY MainFrameWndProc2(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
    5052{
    51   PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, 0);
     53  PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER);
    5254
    5355  switch (msg)
     
    429431    break;
    430432
    431   case IDM_TWODIRS:
    432     pd = WinQueryWindowPtr(hwnd, 4);
     433  case IDM_TWODIRS:             // Menu action
     434  case IDM_WINDOWDLG:           // Toolbar action
     435    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    433436    if (pd)
    434437    {
     
    476479
    477480  case IDM_COMPARE:
    478     pd = WinQueryWindowPtr(hwnd, 4);
     481    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    479482    if (pd)
    480483    {
     
    616619  case IDM_NEXTWINDOW:
    617620  case IDM_PREVWINDOW:
    618     pd = WinQueryWindowPtr(hwnd, 4);
     621    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    619622    if (pd)
    620623    {
     
    835838      memset(pd, 0, sizeof(PERSON1DATA));
    836839      pd -> size = sizeof(PERSON1DATA);
    837       WinSetWindowPtr(hwnd, 4, (PVOID) pd);
     840      WinSetWindowPtr(hwnd, QWL_USER + 4, (PVOID)pd);
    838841    }
    839842    {
     
    880883
    881884  case UM_SETUP:
    882     pd = WinQueryWindowPtr(hwnd, 4);
     885    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    883886    if (pd)
    884887    {
     
    950953      if (hwndC)
    951954      {
    952         dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);
     955        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
    953956        if (dcd)
    954957        {
     
    10101013      if (hwndC)
    10111014      {
    1012         dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);
     1015        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
    10131016        if (dcd)
    10141017        {
     
    11061109                      "MainWindowPos2",
    11071110                      WinQueryWindow(hwnd, QW_PARENT));
    1108     pd = WinQueryWindowPtr(hwnd, 4);
     1111    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    11091112    if (pd)
    11101113    {
     
    11541157      if (hwndC)
    11551158      {
    1156         dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);
     1159        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
    11571160        if (dcd)
    11581161        {
     
    11961199      if (hwndC)
    11971200      {
    1198         dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);
     1201        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
    11991202        if (dcd)
    12001203        {
     
    12571260
    12581261  case UM_SETUP2:
    1259     pd = WinQueryWindowPtr(hwnd, 4);
     1262    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    12601263    if (pd)
    12611264    {
     
    13901393
    13911394  case UM_ADVISEFOCUS:
    1392     pd = WinQueryWindowPtr(hwnd, 4);
     1395    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    13931396    if (mp1 &&
    13941397        pd &&
     
    14081411    if (mp1)
    14091412    {
    1410       pd = WinQueryWindowPtr(hwnd, 4);
     1413      pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    14111414      if (pd)
    14121415      {
     
    14391442    case IDM_COMMANDSMENU:
    14401443    case IDM_SORTSUBMENU:
    1441       pd = WinQueryWindowPtr(hwnd, 4);
     1444      pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    14421445      if (pd)
    14431446        WinSendMsg(pd -> hwndCurr,
     
    14881491
    14891492  case UM_FOCUSME:
    1490     pd = WinQueryWindowPtr(hwnd, 4);
     1493    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    14911494    if (pd)
    14921495      WinSetFocus(HWND_DESKTOP,
     
    15111514    /* intentional fallthru */
    15121515  case WM_SIZE:
    1513     pd = WinQueryWindowPtr(hwnd, 4);
     1516    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    15141517    if (mp1 &&
    15151518        mp2 &&
     
    16391642  case WM_DESTROY:
    16401643    hwndMain = (HWND) 0;
    1641     pd = WinQueryWindowPtr(hwnd, 4);
     1644    pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
    16421645    if (pd)
    16431646      free(pd);
Note: See TracChangeset for help on using the changeset viewer.