Changeset 3182 for trunk/src/comctl32/header.cpp

Timestamp:

Mar 21, 2000, 6:30:46 PM (25 years ago)

Author:

cbratschi

Message:

bug fixes and improvements

File:

• trunk/src/comctl32/header.cpp (modified) (9 diffs)

trunk/src/comctl32/header.cpp

@@ -1 @@
-/* $Id: header.cpp,v 1.3 2000-03-18 16:17:23 cbratschi Exp $ */
+/* $Id: header.cpp,v 1.4 2000-03-21 17:30:41 cbratschi Exp $ */
 /*
  *  Header control
@@ -252 +252 @@
     {
       UINT uTextJustify;
-      WCHAR* pszText = phdi->pszText;
+      WCHAR *pszText = phdi->pszText,*orgPtr;
 
       if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER)
@@ -269 +269 @@
         if (isUnicodeNotify(&infoPtr->header))
         {
-          nmhdr.pszText    = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(WCHAR));
+          orgPtr = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(WCHAR));
+          nmhdr.pszText    = orgPtr;
           if (nmhdr.pszText) nmhdr.pszText[0] = 0;
         } else
         {
-          nmhdr.pszText    = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(CHAR));
+          orgPtr = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(CHAR));
+          nmhdr.pszText    = orgPtr;
           if (nmhdr.pszText) ((LPSTR)nmhdr.pszText)[0] = 0;
         }
@@ -291 +293 @@
               lstrcpyW(phdi->pszText,pszText);
             } else phdi->pszText = NULL;
-            COMCTL32_Free(pszText);
+            if (pszText == orgPtr) COMCTL32_Free(pszText);
             pszText = phdi->pszText;
           } else
@@ -302 +304 @@
               lstrcpyAtoW(pszText,(LPSTR)nmhdr.pszText);
             } else pszText = NULL;
-            COMCTL32_Free(nmhdr.pszText);
-
-            if (nmhdr.mask & HDI_DI_SETITEM)
-              phdi->pszText = pszText;
+            if (nmhdr.pszText == orgPtr) COMCTL32_Free(nmhdr.pszText);
+
+            phdi->pszText = pszText;
           }
         }
@@ -329 +330 @@
         }
       }
-      if (phdi->pszText == LPSTR_TEXTCALLBACKW) COMCTL32_Free(pszText);
+      if ((phdi->pszText == LPSTR_TEXTCALLBACKW) && (pszText == orgPtr)) COMCTL32_Free(pszText);
     }
 
@@ -1642 +1643 @@
         HEADER_SendItemClick(hwnd,infoPtr->iMoveItem,0);
       }
-//      TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
       infoPtr->bPressed = FALSE;
     } else if (infoPtr->bTracking)
     {
-//      TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
       infoPtr->bTracking = FALSE;
 
@@ -1666 +1665 @@
           {
             infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
+
+            HEADER_SetItemBounds (hwnd,infoPtr->iMoveItem);
+            HEADER_Refresh(hwnd);
             HEADER_SendItemChanged(hwnd,infoPtr->iMoveItem);
-
-            HEADER_SetItemBounds (hwnd,infoPtr->iMoveItem);
-
-            HEADER_Refresh(hwnd);
           }
         }
@@ -1816 +1814 @@
 
         HEADER_SendTrack(hwnd,infoPtr->iMoveItem);
-//          TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
       }
     }