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

Timestamp:

Aug 14, 1999, 6:13:16 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.6 1999-07-12 15:58:48 cbratschi Exp $ */
+/* $Id: propsheet.c,v 1.7 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -627 +627 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_SYSMENU;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP;
+    ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
   }
   else
@@ -635 +636 @@
     pTemplate->style &= ~WS_SYSMENU;
     pTemplate->style &= ~WS_POPUP;
+    pTemplate->style &= ~WS_DISABLED;
+
   }
 
@@ -668 +671 @@
 
   if (showPage)
+  {
+    NMHDR hdr;
+
+    hdr.hwndFrom = hwndParent;
+    hdr.code = PSN_SETACTIVE;
+
+    /*
+     * Send the notification before showing the page.
+     */
+    SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+
     ShowWindow(hwndPage, SW_SHOW);
+  }
   else
     ShowWindow(hwndPage, SW_HIDE);
@@ -899 +914 @@
     return FALSE;
 
-//  if (hpage != NULL)
-//    FIXME(propsheet, "Implement HPROPSHEETPAGE!\n");
-//  else
-    hwndPage = psInfo->proppage[index].hwndPage;
-
-  /*
-   * Notify the new page.
-   */
-  hdr.code = PSN_SETACTIVE;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  /*
+   * hpage takes precedence over index.
+   */
+  if (hpage != NULL)
+  {
+    index = PROPSHEET_GetPageIndex(hpage, psInfo);
+
+    if (index == -1)
+    {
+      //TRACE("Could not find page to remove!\n");
+      return FALSE;
+    }
+  }
+
+  hwndPage = psInfo->proppage[index].hwndPage;
+
+  /*
+   * Notify the new page if it's already created.
+   * If not it will get created and notified in PROPSHEET_ShowPage.
+   */
+  if (hwndPage)
+  {
+    int result;
+    hdr.code = PSN_SETACTIVE;
+
+    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+    /*
+     * TODO: check return value.
+     */
+  }
 
   /*
@@ -1340 +1374 @@
       if (pnmh->code == TCN_SELCHANGE)
       {
-        PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd,
-                                                          PropSheetInfoStr);
         int index = SendMessageA(pnmh->hwndFrom, TCM_GETCURSEL, 0, 0);
-        HWND hwndHelp  = GetDlgItem(hwnd, IDHELP);
-
-        PROPSHEET_ShowPage(hwnd, index, psInfo);
-
-        if (psInfo->proppage[index].hasHelp)
-          EnableWindow(hwndHelp, TRUE);
-        else
-          EnableWindow(hwndHelp, FALSE);
+        PROPSHEET_SetCurSel(hwnd, index, 0);
       }