Changeset 2895 for trunk/src/comctl32/treeview.cpp

Timestamp:

Feb 25, 2000, 6:00:18 PM (25 years ago)

Author:

cbratschi

Message:

unicode and other changes

File:

• trunk/src/comctl32/treeview.cpp (modified) (26 diffs)

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.1 2000-02-23 17:09:50 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.2 2000-02-25 17:00:18 cbratschi Exp $ */
 /* Treeview control
  *
@@ -32 +32 @@
 /* CB: todo
  - bug in SetScrollInfo/ShowScrollBar: WM_SIZE and WM_NCPAINT problems (i.e. RegEdit)
+ - VK_LEFT in WinHlp32 displays expanded icon
  - tooltips not finished
  - expand not finished
@@ -325 +326 @@
     if (killItem->pszText != LPSTR_TEXTCALLBACKW)
       COMCTL32_Free (killItem->pszText);
+    killItem->pszText = NULL;
     TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)kill, 0);
     if (killItem->firstChild)
@@ -351 +353 @@
  if (wineItem->pszText != LPSTR_TEXTCALLBACKW)
    COMCTL32_Free (wineItem->pszText);
+ wineItem->pszText = NULL;
 
  TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)iItem, 0);
@@ -397 +400 @@
                 if (killItem->pszText != LPSTR_TEXTCALLBACKW)
                   COMCTL32_Free (killItem->pszText);
+                killItem->pszText = NULL;
+
                 TREEVIEW_SendTreeviewNotify
                                         (hwnd, TVN_DELETEITEM, 0, killItem->hItem, 0);
@@ -2847 +2852 @@
   NMTREEVIEWW nmhdr;
   TREEVIEW_ITEM  *wineItem;
-  HWND parent = GetParent(hwnd);
   CHAR *oldText = NULL,*newText = NULL;
   BOOL rc;
@@ -2853 +2857 @@
   ZeroMemory(&nmhdr,sizeof(NMTREEVIEWW));
 
-  nmhdr.hdr.hwndFrom = hwnd;
-  nmhdr.hdr.idFrom =  GetWindowLongW( hwnd, GWL_ID);
-  nmhdr.hdr.code = code;
   nmhdr.action = action;
   if (oldItem)
   {
-    wineItem=& infoPtr->items[(INT)oldItem];
-    nmhdr.itemOld.mask              = wineItem->mask;
-    nmhdr.itemOld.hItem             = wineItem->hItem;
-    nmhdr.itemOld.state             = wineItem->state;
+    wineItem = &infoPtr->items[(INT)oldItem];
+    nmhdr.itemOld.mask      = wineItem->mask;
+    nmhdr.itemOld.hItem     = wineItem->hItem;
+    nmhdr.itemOld.state     = wineItem->state;
     nmhdr.itemOld.stateMask = wineItem->stateMask;
     nmhdr.itemOld.iImage    = wineItem->iImage;
-    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
+    if (!isUnicodeNotify(&infoPtr->header))
     {
       if (!wineItem->pszText) nmhdr.itemOld.pszText = NULL; else
@@ -2885 +2886 @@
   if (newItem)
   {
-    wineItem=& infoPtr->items[(INT)newItem];
+    wineItem = &infoPtr->items[(INT)newItem];
     nmhdr.itemNew.mask              = wineItem->mask;
     nmhdr.itemNew.hItem             = wineItem->hItem;
@@ -2891 +2892 @@
     nmhdr.itemNew.stateMask = wineItem->stateMask;
     nmhdr.itemNew.iImage    = wineItem->iImage;
-    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
-    {
-      if (!wineItem->pszText) nmhdr.itemOld.pszText = NULL; else
+    if (!isUnicodeNotify(&infoPtr->header))
+    {
+      if (!wineItem->pszText) nmhdr.itemNew.pszText = NULL; else
       {
         INT len = lstrlenW(wineItem->pszText)+1;
@@ -2899 +2900 @@
         newText = (CHAR*)COMCTL32_Alloc(len);
         lstrcpyWtoA(newText,wineItem->pszText);
-        nmhdr.itemOld.pszText = (WCHAR*)newText;
+        nmhdr.itemNew.pszText = (WCHAR*)newText;
       }
     } else nmhdr.itemNew.pszText   = wineItem->pszText;
@@ -2912 +2913 @@
   nmhdr.ptDrag.y = 0;
 
-  rc = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)nmhdr.hdr.idFrom,(LPARAM)&nmhdr);
+  rc = (BOOL)sendNotify(hwnd,code,&nmhdr.hdr);
 
   if (oldText) COMCTL32_Free(oldText);
@@ -2928 +2929 @@
   TREEVIEW_ITEM  *wineItem;
 
-  nmhdr.hdr.hwndFrom = hwnd;
-  nmhdr.hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
-  nmhdr.hdr.code = code;
   nmhdr.action = 0;
   wineItem=& infoPtr->items[(INT)dragItem];
@@ -2941 +2939 @@
   nmhdr.ptDrag.y = pt.y;
 
-  return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                                   (WPARAM) GetWindowLongA( hwnd, GWL_ID), (LPARAM)&nmhdr);
+  return (BOOL)sendNotify(hwnd,code,&nmhdr.hdr);
 
 }
@@ -2953 +2950 @@
   BOOL retval;
   WCHAR *buf;
-  HWND parent = GetParent(hwnd);
-
-  tvdi.hdr.hwndFrom     = hwnd;
-  tvdi.hdr.idFrom       = GetWindowLongA( hwnd, GWL_ID);
-  tvdi.hdr.code         = code;
+
   tvdi.item.mask        = what;
   tvdi.item.hItem       = wineItem->hItem;
   tvdi.item.state       = wineItem->state;
   tvdi.item.lParam      = wineItem->lParam;
-  tvdi.item.pszText     = (WCHAR*)COMCTL32_Alloc(128*((infoPtr->header.uNotifyFormat == NFR_UNICODE) ? sizeof(WCHAR):sizeof(char)));
+  tvdi.item.pszText     = (WCHAR*)COMCTL32_Alloc(128*(isUnicodeNotify(&infoPtr->header) ? sizeof(WCHAR):sizeof(char)));
   tvdi.item.cchTextMax = 128;
   buf = tvdi.item.pszText;
 
-  retval = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
+  retval = (BOOL)sendNotify(hwnd,code,&tvdi.hdr);
 
   /* Ignore posible changes */
@@ -2974 +2967 @@
   if (what & TVIF_TEXT)
   {
-    if (infoPtr->header.uNotifyFormat == NFR_UNICODE)
+    if (isUnicodeNotify(&infoPtr->header))
     {
       wineItem->pszText = tvdi.item.pszText;
@@ -3022 +3015 @@
   LPNMCUSTOMDRAW nmcd;
 
-  nmcd =& nmcdhdr.nmcd;
-  nmcd->hdr.hwndFrom = hwnd;
-  nmcd->hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
-  nmcd->hdr.code   = NM_CUSTOMDRAW;
+  nmcd = &nmcdhdr.nmcd;
   nmcd->dwDrawStage= dwDrawStage;
   nmcd->hdc        = hdc;
@@ -3039 +3029 @@
   nmcdhdr.iLevel   = 0;
 
-  return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                               (WPARAM) GetWindowLongA( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
+  return (BOOL)sendNotify(hwnd,NM_CUSTOMDRAW,&nmcdhdr.nmcd.hdr);
 }
 
@@ -3067 +3056 @@
 
   nmcd= & nmcdhdr.nmcd;
-  nmcd->hdr.hwndFrom = hwnd;
-  nmcd->hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
-  nmcd->hdr.code   = NM_CUSTOMDRAW;
   nmcd->dwDrawStage= dwDrawStage;
   nmcd->hdc                = hdc;
@@ -3087 +3073 @@
   //               dwDrawStage, hdc, dwItemSpec, uItemState);
 
-  retval=SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                 (WPARAM) GetWindowLongA( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
+  retval = sendNotify(hwnd,NM_CUSTOMDRAW,&nmcdhdr.nmcd.hdr);
 
   infoPtr->clrText=nmcdhdr.clrText;
@@ -3100 +3085 @@
   NMTVKEYDOWN nmkdhdr;
 
-  nmkdhdr.hdr.hwndFrom = hwnd;
-  nmkdhdr.hdr.idFrom   =  GetWindowLongA( hwnd, GWL_ID);
-  nmkdhdr.hdr.code     = code;
   nmkdhdr.wVKey = wVKey;
   nmkdhdr.flags = 0;
 
-  SendMessageA(GetParent(hwnd),WM_NOTIFY,(WPARAM)nmkdhdr.hdr.idFrom,(LPARAM)&nmkdhdr);
+  sendNotify(hwnd,code,&nmkdhdr.hdr);
 }
 
@@ -3387 +3369 @@
   NMTVDISPINFOW tvdi;
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-  HWND parent = GetParent(hwnd);
   BOOL bCommit;
   WCHAR *textW = NULL;
@@ -3396 +3377 @@
      return FALSE;
 
-  tvdi.hdr.hwndFrom     = hwnd;
-  tvdi.hdr.idFrom       = GetWindowLongA(hwnd, GWL_ID);
-  tvdi.hdr.code         = TVN_ENDLABELEDIT;
   tvdi.item.mask        = 0;
   tvdi.item.hItem       = editedItem->hItem;
@@ -3414 +3392 @@
     //}
 
-    if (infoPtr->header.uNotifyFormat == NFR_UNICODE) tvdi.item.pszText = textW; else
+    if (isUnicodeNotify(&infoPtr->header)) tvdi.item.pszText = textW; else
     {
       INT len = iLength+1;
@@ -3430 +3408 @@
   }
 
-  bCommit = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
+  bCommit = (BOOL)sendNotify(hwnd,TVN_ENDLABELEDIT,&tvdi.hdr);
 
   if (!bCancel && bCommit) /* Apply the changes */
   {
-    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
+    if (!isUnicodeNotify(&infoPtr->header))
       lstrcpynAtoW(textW,textA,iLength+1);
     if (lstrcmpW(textW,editedItem->pszText) != 0)
@@ -3577 +3555 @@
       {
         NMTVGETINFOTIPW tvgit;
-        HWND parent = GetParent(hwnd);
-
-        tvgit.hdr.hwndFrom = hwnd;
-        tvgit.hdr.idFrom   =  GetWindowLongA(hwnd,GWL_ID);
-        tvgit.hdr.code     = (infoPtr->header.uNotifyFormat == NFR_UNICODE) ? TVN_GETINFOTIPW:TVN_GETINFOTIPA;
-        tvgit.pszText    = (WCHAR*)COMCTL32_Alloc((infoPtr->header.uNotifyFormat == NFR_UNICODE) ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
+
+        tvgit.pszText    = (WCHAR*)COMCTL32_Alloc(isUnicodeNotify(&infoPtr->header) ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
         tvgit.cchTextMax = INFOTIPSIZE;
         tvgit.hItem      = item->hItem;
         tvgit.lParam     = item->lParam;
 
-        SendMessageA(parent,WM_NOTIFY,(WPARAM)tvgit.hdr.idFrom,(LPARAM)&tvgit);
-        if (infoPtr->header.uNotifyFormat == NFR_UNICODE)
+        sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_GETINFOTIPW:TVN_GETINFOTIPA,&tvgit.hdr);
+        if (isUnicodeNotify(&infoPtr->header))
         {
           text = tvgit.pszText;
@@ -4010 +3984 @@
 
     case SB_PAGEUP:
-      newY = infoPtr->lefttop.y-MAX(((INT)(infoPtr->uVisibleHeight/infoPtr->uVScrollStep))*infoPtr->uVScrollStep,infoPtr->uVisibleHeight);
+      newY = infoPtr->lefttop.y-MAX(((INT)(infoPtr->uVisibleHeight/infoPtr->uVScrollStep))*infoPtr->uVScrollStep,infoPtr->uVScrollStep);
       if (newY < 0) newY = 0;
       break;
 
     case SB_PAGEDOWN:
-      newY = infoPtr->lefttop.y+MAX(((INT)(infoPtr->uVisibleHeight/infoPtr->uVScrollStep))*infoPtr->uVScrollStep,infoPtr->uVisibleHeight);
+      newY = infoPtr->lefttop.y+MAX(((INT)(infoPtr->uVisibleHeight/infoPtr->uVScrollStep))*infoPtr->uVScrollStep,infoPtr->uVScrollStep);
       if (newY > maxY) newY = maxY;
       break;