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

Timestamp:

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

Author:

cbratschi

Message:

some icon bug fixes

File:

• trunk/src/user32/button.cpp (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.22 1999-12-19 17:46:24 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.23 1999-12-20 16:45:16 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -797 +797 @@
             BITMAP   bm;
 
-            GetIconInfo((HICON)infoPtr->hImage, &iconInfo);
-            GetObjectA (iconInfo.hbmColor, sizeof(BITMAP), &bm);
-
-            imageWidth  = bm.bmWidth;
-            imageHeight = bm.bmHeight;
-
-            DeleteObject(iconInfo.hbmColor);
-            DeleteObject(iconInfo.hbmMask);
+            GetIconInfo((HICON)infoPtr->hImage,&iconInfo);
+            if (iconInfo.hbmColor)
+            {
+              GetObjectA(iconInfo.hbmColor,sizeof(BITMAP),&bm);
+              imageWidth  = bm.bmWidth;
+              imageHeight = bm.bmHeight;
+            } else
+            {
+              GetObjectA(iconInfo.hbmMask,sizeof(BITMAP),&bm);
+              imageWidth  = bm.bmWidth;
+              imageHeight = bm.bmHeight/2;
+            }
+
+            if (iconInfo.hbmColor) DeleteObject(iconInfo.hbmColor);
+            if (iconInfo.hbmMask) DeleteObject(iconInfo.hbmMask);
 
         }