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

Timestamp:

Oct 17, 1999, 9:32:05 PM (26 years ago)

Author:

cbratschi

Message:

DrawIcon/DrawIconEx, fixed other icon handling problems

File:

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

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.4 1999-10-08 21:26:08 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.5 1999-10-17 19:32:04 cbratschi Exp $ */
 /*
  * Static control
@@ -63 +63 @@
     STATICINFO *infoPtr = (STATICINFO *)GetInfoPtr(hwnd);
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-    INT cx,cy;
+    ICONINFO ii;
+    BITMAP bmp;
 
     if ((dwStyle & SS_TYPEMASK) != SS_ICON) return 0;
@@ -71 +72 @@
     infoPtr->hIcon = hicon;
 
-    cx = GetSystemMetrics(SM_CXICON);
-    cy = GetSystemMetrics(SM_CYICON);
-
-    SetWindowPos(hwnd,0,0,0,cx,cy,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
+    GetIconInfo(hicon,&ii);
+    GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+
+    SetWindowPos(hwnd,0,0,0,bmp.bmWidth,bmp.bmHeight,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
 
     return prevIcon;
@@ -104 +105 @@
         SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
                       SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
-/* CB: alternative code, if necessary
-      HDC hdc = GetDC(hwnd);
-      BITMAPINFO info;
-
-      ZeroMemory(&info,sizeof(info));
-      if (GetDIBits(hdc,hbitmap,0,0,NULL,&info,0) != 0)
-      {
-        SetWindowPos(hwnd,0,0,0,info.bmiHeader.biWidth,info.bmiHeader.biHeight,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
-      }
-      ReleaseDC(hwnd,hdc);
-*/
-
     }
     return hOldBitmap;