Changeset 2858 for trunk/src/comctl32/treeview.c

Timestamp:

Feb 22, 2000, 6:11:41 PM (26 years ago)

Author:

cbratschi

Message:

Corel 20000212, TREEVIEW_Sort fix, CCBase

File:

• trunk/src/comctl32/treeview.c (modified) (22 diffs)

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.29 2000-02-20 18:29:58 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.30 2000-02-22 17:11:41 cbratschi Exp $ */
 /* Treeview control
  *
@@ -47 +47 @@
 #include "commctrl.h"
 #include "comctl32.h"
+#include "ccbase.h"
 #include "treeview.h"
 
@@ -2002 +2003 @@
   INT            cChildren;
   HTREEITEM      hti;
-  BOOL root;
+  BOOL root = FALSE;
 
   /* Obtain the TVSORTBC struct */
@@ -2690 +2691 @@
 
   /* allocate memory for info structure */
-  infoPtr = (TREEVIEW_INFO *) COMCTL32_Alloc (sizeof(TREEVIEW_INFO));
-
-  SetWindowLongA( hwnd, 0, (DWORD)infoPtr);
+  infoPtr = (TREEVIEW_INFO*)initControl(hwnd,sizeof(TREEVIEW_INFO));
 
   if (infoPtr == NULL) return 0;
-
-  if ((TREEVIEW_INFO*)GetWindowLongA(hwnd,0) != infoPtr) return 0;
 
   hdc = GetDC(hwnd);
@@ -2702 +2699 @@
   /* set default settings */
   infoPtr->uInternalStatus = TV_CALCALL;
-  if (IsWindowUnicode(hwnd)) infoPtr->uInternalStatus |= TV_UNICODE;
   infoPtr->uNumItems = 0;
   infoPtr->clrBk   = GetSysColor (COLOR_WINDOW);
@@ -2809 +2805 @@
    DeleteObject(infoPtr->hBoldFont);
    COMCTL32_Free(infoPtr->pszISearch);
-   COMCTL32_Free (infoPtr);
+   doneControl(hwnd);
 
    return 0;
@@ -2906 +2902 @@
   TREEVIEW_ITEM  *wineItem;
   HWND parent = GetParent(hwnd);
-  BOOL unicode = IsWindowUnicode(parent),rc;
   CHAR *oldText = NULL,*newText = NULL;
+  BOOL rc;
 
   ZeroMemory(&nmhdr,sizeof(NMTREEVIEWW));
@@ -2923 +2919 @@
     nmhdr.itemOld.stateMask = wineItem->stateMask;
     nmhdr.itemOld.iImage    = wineItem->iImage;
-    if (!unicode)
+    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
     {
       if (!wineItem->pszText) nmhdr.itemOld.pszText = NULL; else
@@ -2949 +2945 @@
     nmhdr.itemNew.stateMask = wineItem->stateMask;
     nmhdr.itemNew.iImage    = wineItem->iImage;
-    if (!unicode)
+    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
     {
       if (!wineItem->pszText) nmhdr.itemOld.pszText = NULL; else
@@ -2970 +2966 @@
   nmhdr.ptDrag.y = 0;
 
-  if (unicode)
-    rc = (BOOL)SendMessageW(parent,WM_NOTIFY,(WPARAM)GetWindowLongW(hwnd,GWL_ID),(LPARAM)&nmhdr);
-  else
-    rc = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)GetWindowLongA(hwnd,GWL_ID),(LPARAM)&nmhdr);
+  rc = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)nmhdr.hdr.idFrom,(LPARAM)&nmhdr);
 
   if (oldText) COMCTL32_Free(oldText);
@@ -3010 +3003 @@
 TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem, UINT code, UINT what)
 {
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
   NMTVDISPINFOW tvdi;
   BOOL retval;
   WCHAR *buf;
   HWND parent = GetParent(hwnd);
-  BOOL unicode = IsWindowUnicode(parent);
 
   tvdi.hdr.hwndFrom     = hwnd;
@@ -3023 +3016 @@
   tvdi.item.state       = wineItem->state;
   tvdi.item.lParam      = wineItem->lParam;
-  tvdi.item.pszText     = COMCTL32_Alloc(128*(unicode? sizeof(WCHAR):sizeof(char)));
+  tvdi.item.pszText     = COMCTL32_Alloc(128*((infoPtr->header.uNotifyFormat == NFR_UNICODE) ? sizeof(WCHAR):sizeof(char)));
   tvdi.item.cchTextMax = 128;
   buf = tvdi.item.pszText;
 
-  if (unicode)
-    retval = (BOOL)SendMessageW(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
-  else
-    retval = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
+  retval = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
 
   /* Ignore posible changes */
@@ -3038 +3028 @@
   if (what & TVIF_TEXT)
   {
-    if (unicode)
+    if (infoPtr->header.uNotifyFormat == NFR_UNICODE)
     {
       wineItem->pszText = tvdi.item.pszText;
@@ -3069 +3059 @@
 
   if (what & TVIF_SELECTEDIMAGE)
-                wineItem->iSelectedImage = tvdi.item.iSelectedImage;
+    wineItem->iSelectedImage = tvdi.item.iSelectedImage;
   if (what & TVIF_IMAGE)
-                wineItem->iImage         = tvdi.item.iImage;
+    wineItem->iImage         = tvdi.item.iImage;
   if (what & TVIF_CHILDREN)
-                wineItem->cChildren      = tvdi.item.cChildren;
-
- return retval;
+    wineItem->cChildren      = tvdi.item.cChildren;
+
+  return retval;
 }
 
@@ -3086 +3076 @@
   LPNMCUSTOMDRAW nmcd;
 
-  nmcd= & nmcdhdr.nmcd;
+  nmcd =& nmcdhdr.nmcd;
   nmcd->hdr.hwndFrom = hwnd;
   nmcd->hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
@@ -3452 +3442 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
   HWND parent = GetParent(hwnd);
-  BOOL unicode = IsWindowUnicode(parent);
   BOOL bCommit;
   WCHAR *textW = NULL;
@@ -3479 +3468 @@
     //}
 
-    if (unicode) tvdi.item.pszText = textW; else
+    if (infoPtr->header.uNotifyFormat == NFR_UNICODE) tvdi.item.pszText = textW; else
     {
       INT len = iLength+1;
@@ -3495 +3484 @@
   }
 
-  if (unicode)
-    bCommit=(BOOL)SendMessageW(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
-  else
-    bCommit=(BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
+  bCommit = (BOOL)SendMessageA(parent,WM_NOTIFY,(WPARAM)tvdi.hdr.idFrom,(LPARAM)&tvdi);
 
   if (!bCancel && bCommit) /* Apply the changes */
   {
-    if (!unicode)
+    if (infoPtr->header.uNotifyFormat == NFR_ANSI)
       lstrcpynAtoW(textW,textA,iLength+1);
     if (lstrcmpW(textW,editedItem->pszText) != 0)
@@ -3646 +3632 @@
         NMTVGETINFOTIPW tvgit;
         HWND parent = GetParent(hwnd);
-        BOOL unicode = IsWindowUnicode(parent);
 
         tvgit.hdr.hwndFrom = hwnd;
         tvgit.hdr.idFrom   =  GetWindowLongA(hwnd,GWL_ID);
-        tvgit.hdr.code     = unicode ? TVN_GETINFOTIPW:TVN_GETINFOTIPA;
-        tvgit.pszText    = COMCTL32_Alloc(unicode ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
+        tvgit.hdr.code     = (infoPtr->header.uNotifyFormat == NFR_UNICODE) ? TVN_GETINFOTIPW:TVN_GETINFOTIPA;
+        tvgit.pszText    = COMCTL32_Alloc((infoPtr->header.uNotifyFormat == NFR_UNICODE) ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
         tvgit.cchTextMax = INFOTIPSIZE;
         tvgit.hItem      = item->hItem;
         tvgit.lParam     = item->lParam;
 
-        if (unicode)
+        SendMessageA(parent,WM_NOTIFY,(WPARAM)tvgit.hdr.idFrom,(LPARAM)&tvgit);
+        if (infoPtr->header.uNotifyFormat == NFR_UNICODE)
         {
-          SendMessageW(parent,WM_NOTIFY,(WPARAM)tvgit.hdr.idFrom,(LPARAM)&tvgit);
           text = tvgit.pszText;
         } else
         {
-          SendMessageA(parent,WM_NOTIFY,(WPARAM)tvgit.hdr.idFrom,(LPARAM)&tvgit);
           text = COMCTL32_Alloc(tvgit.cchTextMax*sizeof(WCHAR));
           lstrcpyAtoW(text,(LPSTR)tvgit.pszText);
@@ -4598 +4582 @@
 }
 
-static LRESULT TREEVIEW_GetUnicodeFormat(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-
-  return infoPtr->uInternalStatus & TV_UNICODE;
-}
-
-static LRESULT TREEVIEW_SetUnicodeFormat(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-  BOOL oldFormat = infoPtr->uInternalStatus & TV_UNICODE;
-
-  if (wParam)
-    infoPtr->uInternalStatus |= TV_UNICODE;
-  else
-    infoPtr->uInternalStatus &= ~TV_UNICODE;
-
-  return oldFormat;
-}
-
 static LRESULT WINAPI
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -4760 +4724 @@
         case TVM_GETINSERTMARKCOLOR:
                 return TREEVIEW_GetInsertMarkColor (hwnd,wParam, lParam);
-
-        case TVM_GETUNICODEFORMAT:
-                return TREEVIEW_GetUnicodeFormat(hwnd,wParam,lParam);
-
-        case TVM_SETUNICODEFORMAT:
-                return TREEVIEW_SetUnicodeFormat(hwnd,wParam,lParam);
 
         case WM_COMMAND:
@@ -4853 +4811 @@
               //  FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
               //     uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return defComCtl32ProcA(hwnd,uMsg,wParam,lParam);
       }
     return 0;