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

Timestamp:

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

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/scroll.cpp (modified) (19 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.29 1999-12-26 17:30:17 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.30 1999-12-28 17:04:23 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -666 +666 @@
   CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam;
 
-  if (!(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && lpCreat->style & (SBS_LEFTALIGN | SBS_RIGHTALIGN))
+  if (!(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && (lpCreat->style & (SBS_LEFTALIGN | SBS_RIGHTALIGN)))
   {
     if (lpCreat->style & SBS_VERT)
@@ -793 +793 @@
         SCROLL_Scrolling = TRUE;
         timerRunning = FALSE;
-        if (SCROLL_FocusWin == hwnd && SCROLL_Highlighted)
+        if ((SCROLL_FocusWin == hwnd) && SCROLL_Highlighted)
         {
           hdc = GetDC(hwnd);
@@ -892 +892 @@
 
       case SCROLL_TOP_ARROW:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -902 +902 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawTopArrow(hdc,infoPtr,&rect,arrowSize,vertical,(hittest == SCROLL_trackHitTest));
           SCROLL_lastHitTest = hittest;
         }
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_LINEUP,hwndCtl);
 
@@ -913 +913 @@
 
       case SCROLL_TOP_RECT:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -923 +923 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
@@ -931 +931 @@
         }
 
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_PAGEUP,hwndCtl);
 
@@ -946 +946 @@
             thumbTrackSent = FALSE;
             SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
-        } else if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        } else if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
         {
           UINT val;
@@ -957 +957 @@
                                     trackThumbPos + lastMousePos - lastClickPos );
 
-          if (val != infoPtr->CurVal || thumbTrackSent)
+          if ((val != infoPtr->CurVal) || thumbTrackSent)
             SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                           MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
@@ -1000 +1000 @@
 
       case SCROLL_BOTTOM_RECT:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1010 +1010 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
@@ -1018 +1018 @@
         }
 
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_PAGEDOWN,hwndCtl);
 
@@ -1024 +1024 @@
 
       case SCROLL_BOTTOM_ARROW:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1034 +1034 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawBottomArrow(hdc,infoPtr,&rect,arrowSize,vertical,(hittest == SCROLL_trackHitTest));
           SCROLL_lastHitTest = hittest;
         }
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_LINEDOWN,hwndCtl);
 
@@ -1045 +1045 @@
     }
 
-    if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+    if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
     {
       SCROLL_trackHitTest = SCROLL_NOWHERE;  /* Terminate tracking */
@@ -1669 +1669 @@
       BOOL rc = FALSE;
 
-      if ((nBar == SB_VERT || nBar == SB_BOTH) && window->getStyle() & WS_VSCROLL)
+      if (((nBar == SB_VERT) || (nBar == SB_BOTH)) && (window->getStyle() & WS_VSCROLL))
       {
         HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getVertScrollHandle());
@@ -1685 +1685 @@
         }
       }
-      if ((nBar == SB_HORZ || (rc && nBar == SB_BOTH)) && window->getStyle() & WS_HSCROLL)
+      if (((nBar == SB_HORZ) || (rc && (nBar == SB_BOTH))) && (window->getStyle() & WS_HSCROLL))
       {
         HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getHorzScrollHandle());
@@ -1713 +1713 @@
 BOOL WINAPI GetScrollBarInfo(HWND hwnd,LONG idObject,PSCROLLBARINFO psbi)
 {
-  if (!psbi || psbi->cbSize != sizeof(SCROLLBARINFO))
+  if (!psbi || (psbi->cbSize != sizeof(SCROLLBARINFO)))
   {
     SetLastError(ERROR_INVALID_PARAMETER);