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

Timestamp:

Dec 28, 1999, 6:04:24 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.26 1999-12-27 22:53:51 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.27 1999-12-28 17:04:22 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -125 +125 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-  if (dwStyle & BS_NOTIFY && !wParam) BUTTON_SendNotify(hwnd,BN_DISABLE);
+  if ((dwStyle & BS_NOTIFY) && !wParam) BUTTON_SendNotify(hwnd,BN_DISABLE);
 
   //PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
@@ -151 +151 @@
     } else checkBoxWidth = checkBoxHeight = 0;
   }
-  if (style < 0L || style >= MAX_BTN_TYPE) return -1; /* abort */
+  if ((style < 0L) || (style >= MAX_BTN_TYPE)) return -1; /* abort */
 
   infoPtr = (BUTTONINFO*)malloc(sizeof(BUTTONINFO));
@@ -409 +409 @@
   if (dwStyle & BS_NOTIFY) BUTTON_SendNotify(hwnd,BN_SETFOCUS);
 
-  if ((style == BS_AUTORADIOBUTTON || style == BS_RADIOBUTTON) &&
+  if (((style == BS_AUTORADIOBUTTON) || (style == BS_RADIOBUTTON)) &&
       (GetCapture() != hwnd) && !(SendMessageA(hwnd,BM_GETCHECK,0,0) & BST_CHECKED))
   {
@@ -484 +484 @@
   HANDLE oldHbitmap = infoPtr->hImage;
 
-  if (dwStyle & BS_BITMAP || dwStyle & BS_ICON) infoPtr->hImage = (HANDLE)lParam;
+  if ((dwStyle & BS_BITMAP) || (dwStyle & BS_ICON)) infoPtr->hImage = (HANDLE)lParam;
 
   return oldHbitmap;
@@ -529 +529 @@
         dwStyle &= ~WS_TABSTOP;
 
-      //if (oldStyle != dwStyle) SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
+      if (oldStyle != dwStyle) SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
     }
     infoPtr->state = (infoPtr->state & ~3) | wParam;
@@ -775 +775 @@
      */
     textLen = GetWindowTextLengthA(hwnd);
-    if (textLen > 0 && (!(dwStyle & (BS_ICON|BS_BITMAP))))
+    if ((textLen > 0) && (!(dwStyle & (BS_ICON|BS_BITMAP))))
     {
         INT format = BUTTON_GetTextFormat(dwStyle,DT_CENTER,DT_VCENTER);
@@ -885 +885 @@
     SelectObject( hDC, hOldBrush );
 
-    if (infoPtr->state & BUTTON_HASFOCUS && IsWindowEnabled(hwnd))
+    if ((infoPtr->state & BUTTON_HASFOCUS) && IsWindowEnabled(hwnd))
     {
         InflateRect( &focus_rect, -1, -1 );
@@ -980 +980 @@
       GetWindowTextA(hwnd,text,textLen);
     }
-    if (action == ODA_DRAWENTIRE || action == ODA_SELECT)
+    if ((action == ODA_DRAWENTIRE) || (action == ODA_SELECT))
     {
         UINT state;