Changeset 2160 for trunk/src/user32/static.cpp

Timestamp:

Dec 20, 1999, 5:45:18 PM (26 years ago)

Author:

cbratschi

Message:

some icon bug fixes

File:

• trunk/src/user32/static.cpp (modified) (3 diffs)

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.12 1999-11-22 20:33:24 sandervl Exp $ */
+/* $Id: static.cpp,v 1.13 1999-12-20 16:45:16 cbratschi Exp $ */
 /*
  * Static control
@@ -91 +91 @@
 
     if (!GetIconInfo(hicon,&ii)) return prevIcon;
-    GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+    if (ii.hbmColor)
+      GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+    else
+    {
+      GetObjectA(ii.hbmMask,sizeof(BITMAP),(LPVOID)&bmp);
+      bmp.bmHeight /= 2;
+    }
 
     if (!(dwStyle & (SS_CENTERIMAGE | SS_REALSIZEIMAGE))) STATIC_ResizeWindow(hwnd,dwStyle,bmp.bmWidth,bmp.bmHeight);
+
+    if (ii.hbmColor) DeleteObject(ii.hbmColor);
+    if (ii.hbmMask) DeleteObject(ii.hbmMask);
 
     return prevIcon;
@@ -679 +688 @@
 
       if (!GetIconInfo(infoPtr->hIcon,&ii)) return;
-      GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+      if (ii.hbmColor)
+        GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+      else
+      {
+        GetObjectA(ii.hbmMask,sizeof(BITMAP),(LPVOID)&bmp);
+        bmp.bmHeight /= 2;
+      }
       DrawIcon(hdc,(rc.right-bmp.bmWidth)/2,(rc.bottom-bmp.bmHeight)/2,infoPtr->hIcon);
+      if (ii.hbmColor) DeleteObject(ii.hbmColor);
+      if (ii.hbmMask) DeleteObject(ii.hbmMask);
     } else if (infoPtr->hIcon) DrawIcon(hdc,rc.left,rc.top,infoPtr->hIcon);
 }