Changeset 2221 for trunk/src/gdi32/text.cpp

Timestamp:

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

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/gdi32/text.cpp (modified) (15 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.5 1999-12-16 16:52:33 cbratschi Exp $ */
+/* $Id: text.cpp,v 1.6 1999-12-27 22:52:39 cbratschi Exp $ */
 
 /*
@@ -99 +99 @@
   LONG lTabs,xLeft,yTop;
 
-  if (!lpchText || cchText == 0 || cchText < -1 || !lprc == NULL)
+  if ((!lpchText) || (cchText == 0) || (cchText < -1) || (!lprc == NULL))
   {
     SetLastError(ERROR_INVALID_PARAMETER);
@@ -138 +138 @@
       bTopBottomIsOkay = TRUE;
 
-    if (lprc->left >= lprc->right || !bTopBottomIsOkay)
+    if ((lprc->left >= lprc->right) || !bTopBottomIsOkay)
     {
       TEXTMETRICA txtMetrics;
@@ -260 +260 @@
   BOOL done = FALSE;
 
-  if (dwDTFormat & DT_END_ELLIPSIS && cchText > 1)
+  if ((dwDTFormat & DT_END_ELLIPSIS) && (cchText > 1))
   {
     int textWidth,width;
@@ -269 +269 @@
     width = rectPtr->right-rectPtr->left;
     textWidth = rect.right-rect.left;
-    if (textWidth > width && width > 0)
+    if ((textWidth > width) && (width > 0))
     {
       char* newText;
@@ -292 +292 @@
       done = TRUE;
     }
-  } else if (dwDTFormat & DT_PATH_ELLIPSIS && cchText > 1)
+  } else if ((dwDTFormat & DT_PATH_ELLIPSIS) && (cchText > 1))
   {
     int textWidth,width;
@@ -303 +303 @@
     width = rectPtr->right-rectPtr->left;
     textWidth = rect.right-rect.left;
-    if (textWidth > width && width > 0)
+    if ((textWidth > width) && (width > 0))
     {
       char *newText,*slashPos;
@@ -346 +346 @@
             OSLibWinDrawTabbedText(pHps,newTextLen,lTabs,newText,&rect,0,0,flCmd | DTOS_QUERYEXTENT);
             textWidth = rect.right-rect.left;
-            if (textWidth <= width || endLen == 0) break;
+            if ((textWidth <= width) || (endLen == 0)) break;
           } while (TRUE);
         }
@@ -363 +363 @@
           OSLibWinDrawTabbedText(pHps,newTextLen,lTabs,newText,&rect,0,0,flCmd | DTOS_QUERYEXTENT);
           textWidth = rect.right-rect.left;
-          if (textWidth <= width || preLen+endLen == 0) break;
+          if ((textWidth <= width) || (preLen+endLen == 0)) break;
           if (endLen > preLen)
           {
@@ -433 +433 @@
   POINTLOS2 widthHeight = {0,0};
 
-  if (!pHps || nCount == 0 || nTabPositions < 0)
+  if (!pHps || (nCount == 0) || (nTabPositions < 0))
     return 0;
 
@@ -441 +441 @@
     return 0;
   }
-  if (lpString == NULL || nCount >  512 || (nTabPositions > 0 && lpnTabStopPositions == NULL))
+  if ((lpString == NULL) || (nCount >  512) || ((nTabPositions > 0) && (lpnTabStopPositions == NULL)))
   {
     SetLastError(ERROR_INVALID_PARAMETER);
@@ -488 +488 @@
   DWORD dimensions;
 
-  if (pHps == NULL || lpString == NULL)
+  if ((pHps == NULL) || (lpString == NULL))
   {
     SetLastError(ERROR_INVALID_HANDLE);
@@ -563 +563 @@
   LONG hits;
 
-  if (!pHps || cbCount < 0 || (lpszString == NULL && cbCount != 0))
+  if (!pHps || (cbCount < 0) || ((lpszString == NULL) && (cbCount != 0)))
   {
     SetLastError(ERROR_INVALID_HANDLE);
@@ -637 +637 @@
   }
 
-  if (lprc && (align & 0x18) == TA_BASELINE)
+  if (lprc && ((align & 0x18) == TA_BASELINE))
   {
     //CB: if TA_BASELINE is set, GPI doesn't fill rect
@@ -649 +649 @@
   hits = OSLibGpiCharStringPosAt(pHps,&ptl,&pmRect,flOptions,cbCount,lpszString,lpDx);
 
-  if (lprc && (align & 0x18) == TA_BASELINE)
+  if (lprc && ((align & 0x18) == TA_BASELINE))
     OSLibGpiSetTextAlignment(pHps,pmHAlign,pmVAlign);