Changeset 1803 for trunk/src/comctl32/propsheet.c

Timestamp:

Nov 21, 1999, 6:58:08 PM (26 years ago)

Author:

cbratschi

Message:

fixed id for WM_NOTIFY

File:

• trunk/src/comctl32/propsheet.c (modified) (26 diffs)

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.14 1999-11-19 16:16:38 achimha Exp $ */
+/* $Id: propsheet.c,v 1.15 1999-11-21 17:58:07 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -266 +266 @@
       p += lstrlenW( (LPCWSTR)p ) + 1;
       break;
-  } 
+  }
 
   /* class */
@@ -292 +292 @@
     {
       char szTitle[256];
-      
+
       if ( !LoadStringA( lppsp->hInstance, (UINT) lppsp->pszTitle, szTitle, 256 ) )
-        return FALSE;
+        return FALSE;
 
       psInfo->proppage[index].pszText = HEAP_strdupAtoW( GetProcessHeap(),
-                                                         0, szTitle );
+                                                         0, szTitle );
     }
     else
       psInfo->proppage[index].pszText = HEAP_strdupAtoW(GetProcessHeap(),
-                                                        0,
-                                                        lppsp->pszTitle);
+                                                        0,
+                                                        lppsp->pszTitle);
   }
 
@@ -308 +308 @@
    * Build the image list for icons
    */
-  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID)) 
+  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID))
   {
     HICON hIcon;
@@ -315 +315 @@
 
     if (dwFlags & PSP_USEICONID)
-      hIcon = LoadImageA(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON, 
+      hIcon = LoadImageA(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON,
                          icon_cx, icon_cy, LR_DEFAULTCOLOR);
     else
@@ -926 +926 @@
 
   hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance,
-                                        pTemplate,
-                                        hwndParent,
-                                        ppshpage->pfnDlgProc,
-                                        (LPARAM)ppshpage);
+                                        pTemplate,
+                                        hwndParent,
+                                        ppshpage->pfnDlgProc,
+                                        (LPARAM)ppshpage);
 
   ppInfo[index].hwndPage = hwndPage;
@@ -963 +963 @@
 
     hdr.hwndFrom = hwndParent;
+    hdr.idFrom = GetWindowLongA(hwndParent,GWL_ID);
     hdr.code = PSN_SETACTIVE;
 
@@ -1019 +1020 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_WIZBACK;
 
@@ -1054 +1056 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_WIZNEXT;
 
@@ -1088 +1091 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_WIZFINISH;
 
@@ -1123 +1127 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
 
   /*
@@ -1166 +1171 @@
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_QUERYCANCEL;
 
@@ -1196 +1202 @@
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_HELP;
 
@@ -1294 +1301 @@
 
 /*************************************************************************
- * BOOL PROPSHEET_CanSetCurSel [Internal] 
+ * BOOL PROPSHEET_CanSetCurSel [Internal]
  *
  * Test weither the current page can be changed by sending a PSN_KILLACTIVE
@@ -1321 +1328 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   hdr.code = PSN_KILLACTIVE;
 
@@ -1345 +1353 @@
 
   hdr.hwndFrom = hwndDlg;
+  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
   /*
    * hpage takes precedence over index.
@@ -1370 +1379 @@
     result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
     /*
-     * TODO: check return value. 
+     * TODO: check return value.
      */
   }
@@ -1392 +1401 @@
 static void PROPSHEET_SetTitleA(HWND hwndDlg, DWORD dwStyle, LPCSTR lpszText)
 {
-  PropSheetInfo*        psInfo = (PropSheetInfo*) GetPropA(hwndDlg, PropSheetInfoStr);
-  char                          szTitle[256];
+  PropSheetInfo*        psInfo = (PropSheetInfo*) GetPropA(hwndDlg, PropSheetInfoStr);
+  char                          szTitle[256];
 
   if (HIWORD(lpszText) == 0) {
-    if (!LoadStringA(psInfo->ppshheader->hInstance, 
+    if (!LoadStringA(psInfo->ppshheader->hInstance,
                      LOWORD(lpszText), szTitle, sizeof(szTitle)-1))
       return;
@@ -1612 +1621 @@
   if (psInfo->isModeless || psInfo->nPages > 1)
      DestroyWindow(psInfo->proppage[index].hwndPage);
-  
+
   /* Remove the tab */
   SendMessageA(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -1619 +1628 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)  
+  if (index > 0)
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -1659 +1668 @@
     /* Show and enable the Next button */
     hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
-    
+
     ShowWindow(hwndButton, SW_SHOW);
     EnableWindow(hwndButton, TRUE);
@@ -1837 +1846 @@
         SendMessageA(hwnd, WM_SETICON, 0, hIcon);
       }
-      
+
       if (psInfo->ppshheader->dwFlags & PSH_USEHICON)
         SendMessageA(hwnd, WM_SETICON, 0, psInfo->ppshheader->u1.hIcon);
@@ -1870 +1879 @@
       }
 
-      if (psInfo->useCallback) 
-             (*(psInfo->ppshheader->pfnCallback))(hwnd, 
-                                              PSCB_INITIALIZED, (LPARAM)0); 
-
-      ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page);      
+      if (psInfo->useCallback)
+             (*(psInfo->ppshheader->pfnCallback))(hwnd,
+                                              PSCB_INITIALIZED, (LPARAM)0);
+
+      ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page);
       PROPSHEET_CreatePage(hwnd, psInfo->active_page, psInfo, ppshpage, TRUE);
 
@@ -1885 +1894 @@
          char szText[256];
 
-         if (LoadStringA(psInfo->ppshheader->hInstance, 
+         if (LoadStringA(psInfo->ppshheader->hInstance,
                  (UINT)psInfo->ppshheader->pszCaption, szText, 255))
             PROPSHEET_SetTitleA(hwnd, psInfo->ppshheader->dwFlags, szText);
@@ -2059 +2068 @@
     case PSM_REBOOTSYSTEM:
     {
-      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd, 
+      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd,
                                                         PropSheetInfoStr);
 
@@ -2120 +2129 @@
 
     case PSM_SETFINISHTEXTA:
-      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);        
+      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);
       return TRUE;