Changeset 299
- Timestamp:
- Jun 27, 2006, 2:18:37 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/mainwnd2.c
r246 r299 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2005 Steven H. Levine9 Copyright (c) 2005, 2006 Steven H. Levine 10 10 11 11 23 May 05 SHL Use datamin.h 12 12 26 May 05 SHL Comments and localize code 13 13 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 14 16 15 17 ***********************************************************************/ … … 49 51 static MRESULT EXPENTRY MainFrameWndProc2(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 50 52 { 51 PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, 0);53 PFNWP oldproc = (PFNWP) WinQueryWindowPtr(hwnd, QWL_USER); 52 54 53 55 switch (msg) … … 429 431 break; 430 432 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); 433 436 if (pd) 434 437 { … … 476 479 477 480 case IDM_COMPARE: 478 pd = WinQueryWindowPtr(hwnd, 4);481 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 479 482 if (pd) 480 483 { … … 616 619 case IDM_NEXTWINDOW: 617 620 case IDM_PREVWINDOW: 618 pd = WinQueryWindowPtr(hwnd, 4);621 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 619 622 if (pd) 620 623 { … … 835 838 memset(pd, 0, sizeof(PERSON1DATA)); 836 839 pd -> size = sizeof(PERSON1DATA); 837 WinSetWindowPtr(hwnd, 4, (PVOID)pd);840 WinSetWindowPtr(hwnd, QWL_USER + 4, (PVOID)pd); 838 841 } 839 842 { … … 880 883 881 884 case UM_SETUP: 882 pd = WinQueryWindowPtr(hwnd, 4);885 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 883 886 if (pd) 884 887 { … … 950 953 if (hwndC) 951 954 { 952 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);955 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER); 953 956 if (dcd) 954 957 { … … 1010 1013 if (hwndC) 1011 1014 { 1012 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);1015 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER); 1013 1016 if (dcd) 1014 1017 { … … 1106 1109 "MainWindowPos2", 1107 1110 WinQueryWindow(hwnd, QW_PARENT)); 1108 pd = WinQueryWindowPtr(hwnd, 4);1111 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1109 1112 if (pd) 1110 1113 { … … 1154 1157 if (hwndC) 1155 1158 { 1156 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);1159 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER); 1157 1160 if (dcd) 1158 1161 { … … 1196 1199 if (hwndC) 1197 1200 { 1198 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), 0);1201 dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER); 1199 1202 if (dcd) 1200 1203 { … … 1257 1260 1258 1261 case UM_SETUP2: 1259 pd = WinQueryWindowPtr(hwnd, 4);1262 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1260 1263 if (pd) 1261 1264 { … … 1390 1393 1391 1394 case UM_ADVISEFOCUS: 1392 pd = WinQueryWindowPtr(hwnd, 4);1395 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1393 1396 if (mp1 && 1394 1397 pd && … … 1408 1411 if (mp1) 1409 1412 { 1410 pd = WinQueryWindowPtr(hwnd, 4);1413 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1411 1414 if (pd) 1412 1415 { … … 1439 1442 case IDM_COMMANDSMENU: 1440 1443 case IDM_SORTSUBMENU: 1441 pd = WinQueryWindowPtr(hwnd, 4);1444 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1442 1445 if (pd) 1443 1446 WinSendMsg(pd -> hwndCurr, … … 1488 1491 1489 1492 case UM_FOCUSME: 1490 pd = WinQueryWindowPtr(hwnd, 4);1493 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1491 1494 if (pd) 1492 1495 WinSetFocus(HWND_DESKTOP, … … 1511 1514 /* intentional fallthru */ 1512 1515 case WM_SIZE: 1513 pd = WinQueryWindowPtr(hwnd, 4);1516 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1514 1517 if (mp1 && 1515 1518 mp2 && … … 1639 1642 case WM_DESTROY: 1640 1643 hwndMain = (HWND) 0; 1641 pd = WinQueryWindowPtr(hwnd, 4);1644 pd = WinQueryWindowPtr(hwnd, QWL_USER + 4); 1642 1645 if (pd) 1643 1646 free(pd);
Note:
See TracChangeset
for help on using the changeset viewer.