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

Timestamp:

Oct 22, 1999, 8:04:13 PM (26 years ago)

Author:

sandervl

Message:

Fixes + native win32 resources

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.9 1999-09-26 11:01:10 achimha Exp $ */
+/* $Id: propsheet.c,v 1.10 1999-10-22 18:04:11 sandervl Exp $ */
 /*
  * Property Sheets
@@ -17 +17 @@
 /* CB: Odin problems:
  - trap in PROPSHEET_DialogProc (tab control creation)
- - LockResource traps
 */
 
@@ -215 +214 @@
     HGLOBAL hTemplate = LoadResource(lppsp->hInstance,
                                      hResource);
-    //pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); //CB: trap, fix it
+     pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
   }
 
@@ -336 +335 @@
     (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
 
-  //load OS/2 dialog
-
-  if (psInfo->ppshheader->dwFlags & PSH_MODELESS)
-    ret = NativeCreateDlgIP(COMCTL32_hModule,
-                         psInfo->ppshheader->hInstance,
-                         MAKEINTRESOURCEA(IDD_PROPSHEET),
-                         psInfo->ppshheader->hwndParent,
-                         (DLGPROC)PROPSHEET_DialogProc,
-                         (LPARAM)psInfo);
-  else
-    ret = NativeDlgBoxIP(COMCTL32_hModule,
-                         psInfo->ppshheader->hInstance,
-                         MAKEINTRESOURCEA(IDD_PROPSHEET),
-                         psInfo->ppshheader->hwndParent,
-                         (DLGPROC)PROPSHEET_DialogProc,
-                         (LPARAM)psInfo);
-
-  if (ret == (INT)-1) return FALSE;
-
-/* //CB: original WINE code
   if (!(hRes = FindResourceA(COMCTL32_hModule,
                             MAKEINTRESOURCEA(IDD_PROPSHEET),
@@ -379 +358 @@
                                   (DLGPROC) PROPSHEET_DialogProc,
                                   (LPARAM)psInfo);
-*/
 
   return ret;