Changeset 1115 for trunk/src

Timestamp:

Oct 3, 1999, 10:38:54 PM (26 years ago)

Author:

sandervl

Message:

compile fixes

File:

• trunk/src/user32/uitools.cpp (modified) (7 diffs)

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.8 1999-10-02 13:57:29 cbratschi Exp $ */
+/* $Id: uitools.cpp,v 1.9 1999-10-03 20:38:54 sandervl Exp $ */
 /*
  * User Interface Functions
@@ -465 +465 @@
         /* Bertho Stultiens states above that this function exactly matches win95
          * In win98 BF_FLAT rectangels have an inner border same color as the
-         * middle (COLOR_BTNFACE). I believe it's the same for win95 but since
-         * I don't know I go with Bertho and just sets it for win98 until proven
-         * otherwise.
-         *                                          Dennis Björklund, 10 June, 99
-         */
-        if(LTInnerI != -1 )
+         * middle (COLOR_BTNFACE). I believe it's the same for win95 but since
+         * I don't know I go with Bertho and just sets it for win98 until proven
+         * otherwise.
+         *                                          Dennis Björklund, 10 June, 99
+         */
+        if(LTInnerI != -1 )     
             LTInnerI = RBInnerI = COLOR_BTNFACE;
     }
@@ -560 +560 @@
 
         if((uFlags & BF_MIDDLE) && retval)
-        {
+        {
             FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
-                                                       COLOR_WINDOW : COLOR_BTNFACE));
-        }
-
-        if(uFlags & BF_ADJUST)
-            *rc = InnerRect;
+                                                       COLOR_WINDOW : COLOR_BTNFACE));
+        }
+
+        if(uFlags & BF_ADJUST)
+            *rc = InnerRect;
     }
 
@@ -1408 +1408 @@
  *
  * Author    : Rene Pronk [Thu, 1999/07/29 15:03]
- *             Christoph Bratschi: implemented DT_END_ELLIPSIS (Header control)
  *****************************************************************************/
 
@@ -1415 +1414 @@
 
    int result;
-   UINT oldDTFormat;
 
    dprintf(("USER32:DrawTextExA (%08xh,%s,%08xh,%08xh,%08xh,%08xh).\n",
@@ -1437 +1435 @@
    }
 
-   oldDTFormat = dwDTFormat & ~(DT_END_ELLIPSIS | DT_PATH_ELLIPSIS | DT_MODIFYSTRING | DT_EXPANDTABS);
-   if (dwDTFormat & DT_END_ELLIPSIS && lpchText && (cchText != 0))
-   {
-     int textWidth,width;
-     RECT rect;
-
-     if (cchText == -1) cchText = lstrlenA(lpchText);
-     SetRectEmpty(&rect);
-     DrawTextA(hdc,lpchText,cchText,&rect,oldDTFormat | DT_CALCRECT);
-     width = lprc->right-lprc->left;
-     textWidth = rect.right-rect.left;
-     if (textWidth > width && width > 0)
-     {
-       char* newText;
-       int endWidth,newTextLen;
-
-       DrawTextA(hdc,"...",3,&rect,DT_CALCRECT | DT_SINGLELINE | DT_LEFT);
-       endWidth = rect.right-rect.left;
-       newText = (char*)malloc(cchText+3);
-       lstrcpyA(newText,lpchText);
-       newTextLen = cchText+1;
-       do
-       {
-         newTextLen--;
-         DrawTextA(hdc,newText,newTextLen,&rect,oldDTFormat | DT_CALCRECT);
-         textWidth = rect.right-rect.left;
-       } while (textWidth+endWidth > width && newTextLen > 1);
-
-       lstrcpyA(&newText[newTextLen],"...");
-       result = DrawTextA(hdc,newText,-1,lprc,oldDTFormat);;
-
-       if (dwDTFormat & DT_MODIFYSTRING) lstrcpynA((LPSTR)lpchText,newText,cchText);
-       free(newText);
-     } else result = DrawTextA(hdc,lpchText,cchText,lprc,oldDTFormat);
-   } else
-     result = DrawTextA (hdc, lpchText, cchText, lprc, oldDTFormat);
+   result = DrawTextA (hdc, lpchText, cchText, lprc, dwDTFormat);
 
    if (lpDTParams != NULL) {
@@ -1509 +1472 @@
 
    rc = DrawTextExA (hdc, astring, cchText, lprc, dwDTFormat, lpDTParams);
-   if (dwDTFormat & DT_MODIFYSTRING) AsciiToUnicode(astring,lpchText);
    FreeAsciiString(astring);
    return(rc);