Changeset 500 for trunk/src/user32/new/static.cpp

Timestamp:

Aug 15, 1999, 9:11:02 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

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

trunk/src/user32/new/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.4 1999-07-24 17:10:26 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.5 1999-08-15 19:11:01 cbratschi Exp $ */
 /*
  * Static control
@@ -83 +83 @@
  * Set the bitmap for an SS_BITMAP control.
  */
-static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hbitmap )
-{
-    HBITMAP prevIcon;
+static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap )
+{
+    HBITMAP hOldBitmap;
     STATICINFO *infoPtr = (STATICINFO *)GetInfoPtr(hwnd);
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
@@ -91 +91 @@
     if ((dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0;
 
-    if (infoPtr->hIcon) DeleteObject(infoPtr->hIcon);
-    prevIcon = infoPtr->hIcon;
-    infoPtr->hIcon = hbitmap;
-
-    if (hbitmap)
+    if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {
+        //ERR("huh? hBitmap!=0, but not bitmap\n");
+        return 0;
+    }
+    hOldBitmap = infoPtr->hIcon;
+    infoPtr->hIcon = hBitmap;
+    if (hBitmap)
     {
+        BITMAP bm;
+        GetObjectA(hBitmap, sizeof(bm), &bm);
+        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;
@@ -106 +113 @@
       }
       ReleaseDC(hwnd,hdc);
-    }
-
-    return prevIcon;
-}
-
+*/                      
+                
+    }
+    return hOldBitmap;
+}
 
 /***********************************************************************
@@ -535 +542 @@
                              hdc, hwnd );
     FillRect( hdc, &rc, hbrush );
-    if (infoPtr->hIcon)
-      DrawIcon(hdc,0,0,infoPtr->hIcon);
+
+    if (infoPtr->hIcon) {
+        BITMAP bm;
+        SIZE sz;
+
+        if(GetObjectType(infoPtr->hIcon) != OBJ_BITMAP)
+            return;
+        if (!(hMemDC = CreateCompatibleDC( hdc ))) return;
+        GetObjectA(infoPtr->hIcon, sizeof(bm), &bm);
+        GetBitmapDimensionEx(infoPtr->hIcon, &sz);
+        oldbitmap = SelectObject(hMemDC, infoPtr->hIcon);
+        BitBlt(hdc, sz.cx, sz.cy, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0,
+               SRCCOPY);
+        SelectObject(hMemDC, oldbitmap);
+        DeleteDC(hMemDC);
+    }
 }