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

Timestamp:

Feb 21, 2000, 6:25:33 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000212, added WS_EX_CONTEXTHELP

File:

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

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.17 2000-02-16 14:34:34 sandervl Exp $ */
+/* $Id: static.cpp,v 1.18 2000-02-21 17:25:29 cbratschi Exp $ */
 /*
  * Static control
@@ -7 +7 @@
  * Copyright  David W. Metcalfe, 1993
  *
+ * Corel version: 20000212
  * WINE version: 990923
  *
@@ -19 +20 @@
 #include "static.h"
 
-#define DBG_LOCALLOG    DBG_static
+#define DBG_LOCALLOG    DBG_static
 #include "dbglocal.h"
 
@@ -718 +719 @@
     FillRect( hdc, &rc, hbrush );
 
-    if (infoPtr->hIcon) {
+    if (infoPtr->hIcon)
+    {
         BITMAP bm;
-        SIZE sz;
-
-        if(GetObjectType(infoPtr->hIcon) != OBJ_BITMAP)
-            return;
+
+        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);
-        if (dwStyle & SS_CENTERIMAGE)
-          BitBlt(hdc,sz.cx,sz.cy,bm.bmWidth,bm.bmHeight,hMemDC,(rc.right-bm.bmWidth)/2,(rc.bottom-bm.bmHeight)/2,SRCCOPY);
+
+        GetObjectA(infoPtr->hIcon, sizeof(bm), &bm);
+        oldbitmap = SelectObject(hMemDC, infoPtr->hIcon);
+
+        // Paint the image in center area
+        if(dwStyle & SS_CENTERIMAGE)
+        {
+            SIZE szbm;
+            SIZE szdc;
+
+            if(bm.bmWidth > rc.right - rc.left)
+            {
+                szdc.cx = 0;
+                szbm.cx = (bm.bmWidth - (rc.right - rc.left)) / 2;
+                bm.bmWidth = rc.right - rc.left;
+            }
+            else
+            {
+                szbm.cx = 0;
+                szdc.cx = ((rc.right - rc.left) - bm.bmWidth) / 2;
+            }
+            if(bm.bmHeight > rc.bottom - rc.top)
+            {
+                szdc.cy = 0;
+                szbm.cy = (bm.bmHeight - (rc.bottom - rc.top)) / 2;
+                bm.bmWidth = rc.bottom - rc.top;
+            }
+            else
+            {
+                szbm.cy = 0;
+                szdc.cy = ((rc.bottom - rc.top) - bm.bmHeight) / 2;
+            }
+            BitBlt(hdc, szdc.cx, szdc.cy, bm.bmWidth, bm.bmHeight, hMemDC,
+                szbm.cx, szbm.cy, SRCCOPY);
+        }
         else
-          BitBlt(hdc,sz.cx,sz.cy,bm.bmWidth,bm.bmHeight,hMemDC,0,0,SRCCOPY);
-        SelectObject(hMemDC, oldbitmap);
-        DeleteDC(hMemDC);
+        {
+            BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY);
+        }
+
+        SelectObject(hMemDC, oldbitmap);
+        DeleteDC(hMemDC);
     }
 }
@@ -764 +797 @@
   di.itemData   = 0;
 
-  SendMessageA(GetParent(hwnd),WM_DRAWITEM,GetWindowLongA(hwnd,GWL_ID),(LPARAM)&di);
+  SendMessageA(GetParent(hwnd),WM_CTLCOLORSTATIC,hdc,hwnd);
+  SendMessageA(GetParent(hwnd),WM_DRAWITEM,di.CtlID,(LPARAM)&di);
 }