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

Timestamp:

Aug 28, 1999, 11:25:56 AM (26 years ago)

Author:

achimha

Message:

merged with latest WINE changes

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.7 1999-08-14 16:13:12 cbratschi Exp $ */
+/* $Id: propsheet.c,v 1.8 1999-08-28 09:25:56 achimha Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  *   - Unicode property sheets
  */
+
+/* WINE 990815 level */
 
 /* CB: Odin problems:
@@ -67 +69 @@
   int width;
   int height;
+  HIMAGELIST hImageList;
 } PropSheetInfo;
 
@@ -159 +162 @@
   psInfo->restartWindows = FALSE;
   psInfo->rebootSystem = FALSE;
+  psInfo->hImageList = 0;
 
   return TRUE;
@@ -277 +281 @@
 //  TRACE(propsheet, "Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
   p += lstrlenW((LPCWSTR)p) + 1;
+
+  /*
+   * Build the image list for icons
+   */
+  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID))
+  {
+    HICON hIcon;
+    int icon_cx = GetSystemMetrics(SM_CXSMICON);
+    int icon_cy = GetSystemMetrics(SM_CYSMICON);
+
+    if (dwFlags & PSP_USEICONID)
+      hIcon = LoadImageA(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON, 
+                         icon_cx, icon_cy, LR_DEFAULTCOLOR);
+    else
+      hIcon = lppsp->u2.hIcon;
+
+    if (psInfo->hImageList == 0)
+      psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);
+
+    ImageList_AddIcon(psInfo->hImageList, hIcon);
+  }
 
   return TRUE;
@@ -577 +602 @@
   nTabs = psInfo->ppshheader->nPages;
 
+  /*
+   * Set the image list for icons.
+   */
+  if (psInfo->hImageList)
+  {
+    item.mask |= TCIF_IMAGE;
+    SendMessageA(hwndTabCtrl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList);
+  }
+
   for (i = 0; i < nTabs; i++)
   {
+    item.iImage = i;
+
     WideCharToMultiByte(CP_ACP, 0,
                         (LPCWSTR)psInfo->proppage[i].pszText,
@@ -1193 +1229 @@
   COMCTL32_Free(psInfo->proppage);
   COMCTL32_Free(psInfo->strPropertiesFor);
+  ImageList_Destroy(psInfo->hImageList);
 
   GlobalFree((HGLOBAL)psInfo);