Changeset 10416 for trunk/src/user32/uitools.cpp

Timestamp:

Jan 21, 2004, 1:16:14 PM (22 years ago)

Author:

sandervl

Message:

DrawIconEx: handle cyWidth == 0 case correctly

File:

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

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.35 2003-02-13 12:44:53 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.36 2004-01-21 12:16:14 sandervl Exp $ */
 /*
  * User Interface Functions
@@ -1724 +1724 @@
     cxWidth = GetSystemMetrics(SM_CXICON);
     cyWidth = GetSystemMetrics(SM_CYICON);
-  } else if (cxWidth == 0)
+  } 
+  else 
   {
-    cxWidth = bmp.bmWidth;
-  } else if (cyWidth == 0)
-  {
-    cyWidth = ii.hbmColor ? bmp.bmHeight:bmp.bmHeight/2;
+      if (cxWidth == 0)
+      {
+        cxWidth = bmp.bmWidth;
+      } 
+      if (cyWidth == 0)
+      {
+        cyWidth = ii.hbmColor ? bmp.bmHeight:bmp.bmHeight/2;
+      }
   }