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

Timestamp:

Dec 21, 1999, 6:03:46 PM (26 years ago)

Author:

cbratschi

Message:

WINE 991212, WM_SETREDRAW fix, MDI work

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.23 1999-12-20 16:45:16 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.24 1999-12-21 17:03:42 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -7 +7 @@
  * Copyright (c) 1999 Christoph Bratschi
  *
- * WINE version: 991031
+ * WINE version: 991212
  *
  * Status: complete
@@ -156 +156 @@
   infoPtr->state = BUTTON_UNCHECKED;
   infoPtr->hFont = 0;
-  infoPtr->hImage = NULL;
+  infoPtr->hImage = 0;
   SetInfoPtr(hwnd,(DWORD)infoPtr);
 
@@ -349 +349 @@
   if (wParam == VK_SPACE)
   {
+    BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
+
     SendMessageA(hwnd,BM_SETSTATE,TRUE,0);
-    SetFocus(hwnd);
-    SetCapture(hwnd);
+    infoPtr->state |= BUTTON_BTNPRESSED;
   }
 
@@ -364 +365 @@
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-    ReleaseCapture();
+    if (!(infoPtr->state & BUTTON_BTNPRESSED)) return 0;
+    infoPtr->state &= BUTTON_NSTATES;
     if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) return 0;
     SendMessageA(hwnd,BM_SETSTATE,FALSE,0);
@@ -383 +385 @@
     }
     BUTTON_SendNotify(hwnd,BN_CLICKED);
-  } else if (wParam != VK_TAB) ReleaseCapture();
+  }
 
   return 0;
@@ -490 +492 @@
       return (HICON)infoPtr->hImage;
     default:
-      return NULL;
+      return (HICON)0;
   }
 }
@@ -784 +786 @@
     }
     if ( ((dwStyle & BS_ICON) || (dwStyle & BS_BITMAP) ) &&
-         (infoPtr->hImage != NULL) )
+         (infoPtr->hImage != 0) )
     {
         int yOffset, xOffset;
@@ -831 +833 @@
         if(xOffset < 0 || yOffset < 0)
         {
-            HRGN hBitmapRgn = NULL;
+            HRGN hBitmapRgn = 0;
             hBitmapRgn = CreateRectRgn(
                 rc.left + xBorderOffset, rc.top +yBorderOffset,
@@ -868 +870 @@
         if(xOffset < 0 || yOffset < 0)
         {
-            SelectClipRgn(hDC, NULL);
+            SelectClipRgn(hDC, 0);
         }
     }
@@ -916 +918 @@
      * instead of a radion button.
      */
-    if (infoPtr->hImage!=NULL)
+    if (infoPtr->hImage != 0)
     {
         BOOL bHighLighted = ((infoPtr->state & BUTTON_HIGHLIGHTED) ||