Changeset 12 for trunk/src/helpers/textview.c

Timestamp:

Nov 4, 2000, 8:55:45 PM (25 years ago)

Author:

umoeller

Message:

Updated string helpers.

File:

• trunk/src/helpers/textview.c (modified) (8 diffs)

trunk/src/helpers/textview.c

@@ -269 +269 @@
     lstInit(&pxfd->llWords,
             TRUE);      // auto-free items
+    xstrInit(&pxfd->strViewText, 0);
 }
 
@@ -1088 +1089 @@
     pxfd->ulViewportCY = 0;
 
-    if (pxfd->pszViewText)
+    if (pxfd->strViewText.cbAllocated)
     {
-        ULONG   ulTextLen = strlen(pxfd->pszViewText);
+        ULONG   ulTextLen = pxfd->strViewText.ulLength;
 
         FORMATLINEBUF   flbuf;
@@ -1102 +1103 @@
         flbuf.pfmtc = &pxfd->fmtcStandard;
         flbuf.lPointSize = pxfd->fmtcStandard.lPointSize;
-        flbuf.pLastChar = pxfd->pszViewText + ulTextLen;
+        flbuf.pLastChar = pxfd->strViewText.psz + ulTextLen;
 
         if (ulTextLen)
@@ -1115 +1116 @@
                  */
 
-                PSZ     pCurrent = pxfd->pszViewText;
+                PSZ     pCurrent = pxfd->strViewText.psz;
 
                 // loop until null terminator
@@ -2394 +2395 @@
                 if (pwndParams->fsStatus & WPM_TEXT)
                 {
-                    xstrcpy(&ptxvd->xfd.pszViewText, pwndParams->pszText);
+                    xstrcpy(&ptxvd->xfd.strViewText, pwndParams->pszText);
                     ptxvd->lViewXOfs = 0;
                     ptxvd->lViewYOfs = 0;
@@ -3061 +3062 @@
 
         case WM_DESTROY:
-            if (ptxvd->xfd.pszViewText)
-                free(ptxvd->xfd.pszViewText);
+            xstrClear(&ptxvd->xfd.strViewText);
             lstClear(&ptxvd->xfd.llRectangles);
             lstClear(&ptxvd->xfd.llWords);
@@ -3472 +3472 @@
 
     // use text from window
-    xfd.pszViewText = pszViewText;
+    xstrcpy(&xfd.strViewText, pszViewText);
 
     // setup page
@@ -3621 +3621 @@
                              hdc,
                              hps,
-                             ptxvd->xfd.pszViewText,
+                             ptxvd->xfd.strViewText.psz,
                              ulSize,
                              pszFaceName,