Changeset 2221 for trunk/src/comctl32

Timestamp:

Dec 27, 1999, 11:54:49 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/comctl32/trackbar.c (modified) (19 diffs)

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.23 1999-11-17 17:06:23 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.24 1999-12-27 22:54:49 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -95 +95 @@
       for (i = 0;i < infoPtr->uNumTics;i++)
       {
-        if (infoPtr->tics[i] >= infoPtr->nRangeMin && infoPtr->tics[i] <= infoPtr->nRangeMax)
+        if ((infoPtr->tics[i] >= infoPtr->nRangeMin) && (infoPtr->tics[i] <= infoPtr->nRangeMax))
         {
           oldTics[count] = infoPtr->tics[i];
@@ -109 +109 @@
     }
 
-    if (infoPtr->uTicFreq && infoPtr->nRangeMax > infoPtr->nRangeMin && (dwStyle & TBS_AUTOTICKS))
+    if (infoPtr->uTicFreq && (infoPtr->nRangeMax > infoPtr->nRangeMin) && (dwStyle & TBS_AUTOTICKS))
     {
       //Tics without start and end tic
@@ -191 +191 @@
       channel->bottom = lpRect.bottom-CHANNEL_SPACE;
 
-      if (dwStyle & TBS_BOTH || dwStyle & TBS_NOTICKS)
+      if ((dwStyle & TBS_BOTH) || (dwStyle & TBS_NOTICKS))
       { //center
         channel->left  = (lpRect.right-channelSize)/2;
@@ -208 +208 @@
       channel->left = lpRect.left+CHANNEL_SPACE;
       channel->right = lpRect.right-CHANNEL_SPACE;
-      if (dwStyle & TBS_BOTH || dwStyle & TBS_NOTICKS)
+      if ((dwStyle & TBS_BOTH) || (dwStyle & TBS_NOTICKS))
       { //center
         channel->top    = (lpRect.bottom-channelSize)/2;
@@ -281 +281 @@
     range = infoPtr->nRangeMax-infoPtr->nRangeMin;
 
-    if (range <= 0 || selMin == selMax) SetRectEmpty(selection);
+    if ((range <= 0) || (selMin == selMax)) SetRectEmpty(selection);
     else
         if (!(GetWindowLongA(hwnd, GWL_STYLE) & TBS_VERT))
@@ -494 +494 @@
       RECT thumb = infoPtr->rcThumb;
 
-      if (infoPtr->flags & TB_DRAG_MODE || !IsWindowEnabled(hwnd)) hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
+      if ((infoPtr->flags & TB_DRAG_MODE) || !IsWindowEnabled(hwnd)) hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
       else hbr = CreateSolidBrush(GetSysColor(COLOR_3DFACE));
       hbrOld = SelectObject(hdc,hbr);
@@ -803 +803 @@
 
         //check if maximum of visible marks is reached
-        if (dwStyle & TBS_AUTOTICKS && infoPtr->uNumTics > 1 && (INT)(width*infoPtr->tics[0]/range) == (INT)(width*infoPtr->tics[1]/range))
+        if ((dwStyle & TBS_AUTOTICKS) && (infoPtr->uNumTics > 1) && ((INT)(width*infoPtr->tics[0]/range) == (INT)(width*infoPtr->tics[1]/range)))
         {
           //draw all pixels at once -> much faster
@@ -902 +902 @@
      infoPtr->flags &= ~TB_DRAGPOSVALID;
    }
-   if (!mustRedraw && infoPtr->nPos == lastPos) return;
+   if (!mustRedraw && (infoPtr->nPos == lastPos)) return;
 
    if (dwStyle & TBS_NOTHUMB) return;
@@ -931 +931 @@
    if (dwStyle & TBS_VERT)
    {
-     if (lastRect.top > newRect.top && lastRect.top < newRect.bottom)
+     if ((lastRect.top > newRect.top) && (lastRect.top < newRect.bottom))
        BitBlt(hdc,newRect.left,newRect.top,newRect.right-newRect.left,lastRect.bottom-newRect.top,hdcCompatible,newRect.left,newRect.top,SRCCOPY);
-     else if (lastRect.bottom < newRect.bottom && lastRect.bottom > newRect.top)
+     else if ((lastRect.bottom < newRect.bottom) && (lastRect.bottom > newRect.top))
        BitBlt(hdc,lastRect.left,lastRect.top,lastRect.right-lastRect.left,newRect.bottom-lastRect.top,hdcCompatible,lastRect.left,lastRect.top,SRCCOPY);
      else
@@ -942 +942 @@
    } else
    {
-     if (lastRect.right > newRect.left && lastRect.right < newRect.right)
+     if ((lastRect.right > newRect.left) && (lastRect.right < newRect.right))
        BitBlt(hdc,lastRect.left,lastRect.top,newRect.right-lastRect.left,lastRect.bottom-lastRect.top,hdcCompatible,lastRect.left,lastRect.top,SRCCOPY);
-     else if (lastRect.left < newRect.right && lastRect.left > newRect.left)
+     else if ((lastRect.left < newRect.right) && (lastRect.left > newRect.left))
        BitBlt(hdc,newRect.left,newRect.top,lastRect.right-newRect.left,newRect.bottom-newRect.top,hdcCompatible,newRect.left,newRect.top,SRCCOPY);
      else
@@ -1327 +1327 @@
       newMax = x;
     }
-    if (newMin == infoPtr->nRangeMin && newMax == infoPtr->nRangeMax) return 0;
+    if ((newMin == infoPtr->nRangeMin) && (newMax == infoPtr->nRangeMax)) return 0;
 
     infoPtr->nRangeMin = newMin;
@@ -1454 +1454 @@
     newMax = (INT)HIWORD(lParam);
 
-    if (infoPtr->nSelMin == newMin && infoPtr->nSelMax == newMax) return 0;
+    if ((infoPtr->nSelMin == newMin) && (infoPtr->nSelMax == newMax)) return 0;
     infoPtr->nSelMin = newMin;
     infoPtr->nSelMax = newMax;
@@ -1467 +1467 @@
     if (!GetWindowLongA(hwnd, GWL_STYLE) & TBS_ENABLESELRANGE) return 0;
 
-    if (oldMin != newMin || oldMax != newMax)
+    if ((oldMin != newMin) || (oldMax != newMax))
     {
       infoPtr->flags |= TB_SELECTIONCHANGED;
@@ -1613 +1613 @@
     if (dwStyle & TBS_VERT)
     {
-      if (wParam == TBTS_LEFT || wParam == TBTS_RIGHT) infoPtr->fLocation = (INT)wParam;
+      if ((wParam == TBTS_LEFT) || (wParam == TBTS_RIGHT)) infoPtr->fLocation = (INT)wParam;
     } else
     {
-      if (wParam == TBTS_TOP || wParam == TBTS_BOTTOM) infoPtr->fLocation = (INT)wParam;
+      if ((wParam == TBTS_TOP) || (wParam == TBTS_BOTTOM)) infoPtr->fLocation = (INT)wParam;
     }
 
@@ -1815 +1815 @@
     fullThumb = infoPtr->rcFullThumb;
     if ((vertical &&
-         clickPoint.y >= thumb.top &&
-         clickPoint.y <= thumb.bottom &&
-         ((dwStyle & TBS_BOTH &&
-           clickPoint.x >= thumb.left &&
-           clickPoint.x <= thumb.right
+         (clickPoint.y >= thumb.top) &&
+         (clickPoint.y <= thumb.bottom) &&
+         (((dwStyle & TBS_BOTH) &&
+           (clickPoint.x >= thumb.left) &&
+           (clickPoint.x <= thumb.right)
           ) ||
-          (dwStyle & TBS_LEFT &&
-           clickPoint.x <= thumb.right &&
-           (clickPoint.x >= thumb.left ||
-            (clickPoint.x >= fullThumb.left &&
-             (thumb.left-clickPoint.x <= clickPoint.y-thumb.top &&
-              thumb.left-clickPoint.x <= thumb.bottom-clickPoint.y
+          ((dwStyle & TBS_LEFT) &&
+           (clickPoint.x <= thumb.right) &&
+           ((clickPoint.x >= thumb.left) ||
+            ((clickPoint.x >= fullThumb.left) &&
+             ((thumb.left-clickPoint.x <= clickPoint.y-thumb.top) &&
+              (thumb.left-clickPoint.x <= thumb.bottom-clickPoint.y)
              )
             )
@@ -1832 +1832 @@
           ) ||
           (!(dwStyle & (TBS_BOTH | TBS_LEFT)) &&
-           clickPoint.x >= thumb.left &&
-           (clickPoint.x <= thumb.right ||
-            (clickPoint.x <= fullThumb.right &&
-             (clickPoint.x-thumb.right <= clickPoint.y-thumb.top &&
-              clickPoint.x-thumb.right <= thumb.bottom-clickPoint.y
+           (clickPoint.x >= thumb.left) &&
+           ((clickPoint.x <= thumb.right) ||
+            ((clickPoint.x <= fullThumb.right) &&
+             ((clickPoint.x-thumb.right <= clickPoint.y-thumb.top) &&
+              (clickPoint.x-thumb.right <= thumb.bottom-clickPoint.y)
              )
             )
@@ -1843 +1843 @@
         ) ||
         (!vertical &&
-         clickPoint.x >= thumb.left &&
-         clickPoint.x <= thumb.right &&
-         ((dwStyle & TBS_BOTH &&
-           clickPoint.y >= thumb.top &&
-           clickPoint.y <= thumb.bottom
+         (clickPoint.x >= thumb.left) &&
+         (clickPoint.x <= thumb.right) &&
+         (((dwStyle & TBS_BOTH) &&
+           (clickPoint.y >= thumb.top) &&
+           (clickPoint.y <= thumb.bottom)
           ) ||
-          (dwStyle & TBS_TOP &&
-           clickPoint.y <= thumb.bottom &&
-           (clickPoint.y >= thumb.top ||
-            (clickPoint.y >= fullThumb.top &&
-             (thumb.top-clickPoint.y <= clickPoint.x-thumb.left &&
-              thumb.top-clickPoint.y <= thumb.right-clickPoint.x
+          ((dwStyle & TBS_TOP) &&
+           (clickPoint.y <= thumb.bottom) &&
+           ((clickPoint.y >= thumb.top) ||
+            ((clickPoint.y >= fullThumb.top) &&
+             ((thumb.top-clickPoint.y <= clickPoint.x-thumb.left) &&
+              (thumb.top-clickPoint.y <= thumb.right-clickPoint.x)
              )
             )
@@ -1860 +1860 @@
           ) ||
           (!(dwStyle & (TBS_BOTH | TBS_TOP)) &&
-           clickPoint.y >= thumb.top &&
-           (clickPoint.y <= thumb.bottom ||
-            (clickPoint.y <= fullThumb.bottom &&
-             (clickPoint.y-thumb.bottom <= clickPoint.x-thumb.left &&
-              clickPoint.y-thumb.bottom <= thumb.right-clickPoint.x
+           (clickPoint.y >= thumb.top) &&
+           ((clickPoint.y <= thumb.bottom) ||
+            ((clickPoint.y <= fullThumb.bottom) &&
+             ((clickPoint.y-thumb.bottom <= clickPoint.x-thumb.left) &&
+              (clickPoint.y-thumb.bottom <= thumb.right-clickPoint.x)
              )
             )