Changeset 3584 for trunk/src/user32/button.cpp

Timestamp:

May 22, 2000, 7:21:11 PM (25 years ago)

Author:

cbratschi

Message:

merged controls with Corel WINE 20000513, maximize/minimize fix

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.34 2000-03-18 16:13:25 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.35 2000-05-22 17:21:06 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -7 +7 @@
  * Copyright (c) 1999 Christoph Bratschi
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 20000130)
  *
@@ -924 +924 @@
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
     RECT rbox, rtext, client;
-    HBRUSH hBrush;
+    HBRUSH hBrush, hOldBrush;
+    HPEN hPen, hOldPen;
+    COLORREF colour;
     int textLen, delta;
     char* text = NULL;
@@ -960 +962 @@
 
     hBrush = GetSysColorBrush(COLOR_BTNFACE);
+
+    /* In order to make things right, draw the rectangle background! */
+    if ( !(infoPtr->state & BUTTON_HASFOCUS) && (action == ODA_DRAWENTIRE) )
+    {
+        colour = GetBkColor(hDC);
+        hPen = CreatePen( PS_SOLID, 1, colour );
+        if ( hPen )
+        {
+            hOldBrush = SelectObject( hDC, hBrush );
+            hOldPen = SelectObject( hDC, hPen );
+            Rectangle( hDC, client.left, client.top, client.right, client.bottom );
+            SelectObject( hDC, hOldPen );
+            SelectObject( hDC, hOldBrush );
+            DeleteObject( hPen );
+        }
+    }
 
     if (dwStyle & BS_LEFTTEXT)