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

Timestamp:

Oct 8, 1999, 11:26:08 PM (26 years ago)

Author:

cbratschi

Message:

merged with WINE, other fixes

File:

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

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.3 1999-09-20 19:17:58 sandervl Exp $ */
+/* $Id: static.cpp,v 1.4 1999-10-08 21:26:08 cbratschi Exp $ */
 /*
  * Static control
@@ -7 +7 @@
  * Copyright  David W. Metcalfe, 1993
  *
+ * WINE version: 990923
  */
 
@@ -92 +93 @@
 
     if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {
-        //ERR("huh? hBitmap!=0, but not bitmap\n");
-        return 0;
+        //ERR("huh? hBitmap!=0, but not bitmap\n");
+        return 0;
     }
     hOldBitmap = infoPtr->hIcon;
@@ -102 +103 @@
         GetObjectA(hBitmap, sizeof(bm), &bm);
         SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
-                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
+                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
 /* CB: alternative code, if necessary
       HDC hdc = GetDC(hwnd);
@@ -113 +114 @@
       }
       ReleaseDC(hwnd,hdc);
-*/                      
-                
+*/
+
     }
     return hOldBitmap;
@@ -463 +464 @@
     FillRect( hdc, &rc, hBrush );
 
+    if (!IsWindowEnabled(hwnd)) SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
+
     textLen = GetWindowTextLengthA(hwnd);
     if (textLen > 0)
@@ -545 +548 @@
     if (infoPtr->hIcon) {
         BITMAP bm;
-        SIZE sz;
+        SIZE sz;
 
         if(GetObjectType(infoPtr->hIcon) != OBJ_BITMAP)
-            return;
+            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);
+        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);
     }
 }