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

Timestamp:

Mar 18, 2000, 5:17:35 PM (25 years ago)

Author:

cbratschi

Message:

Corel 20000317 merge, ccbase finished, bug fixes

File:

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

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.2 2000-02-25 17:00:18 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.3 2000-03-18 16:17:34 cbratschi Exp $ */
 /* Treeview control
  *
@@ -69 +69 @@
 static BOOL    TREEVIEW_SendCustomDrawNotify (HWND hwnd, DWORD dwDrawStage, HDC hdc, RECT rc);
 static BOOL    TREEVIEW_SendCustomDrawItemNotify (HWND hwnd, HDC hdc, TREEVIEW_ITEM *tvItem, UINT uItemDrawState);
+static LRESULT TREEVIEW_RButtonUp (HWND hwnd, LPPOINT pPt);
 static LRESULT TREEVIEW_SelectItem (HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT TREEVIEW_DoSelectItem(HWND hwnd,INT action,HTREEITEM newSelect,INT cause);
@@ -1986 +1987 @@
   txt2 = item->pszText;
 
-  return lstrcmpW(txt1,txt2);
+  return lstrcmpiW(txt1,txt2); //CB: or lstrcmpW?
 }
 
@@ -2429 +2430 @@
 
   wineItem->calculated = FALSE;
+  //TREEVIEW_Sort(hwnd,0,NULL,NULL); //CB: the Corel people do this, I think it's wrong
   TREEVIEW_QueueRefresh(hwnd);
 
@@ -2734 +2736 @@
   infoPtr->hwndToolTip = 0;
   if (!(dwStyle & TVS_NOTOOLTIPS))
-    infoPtr->hwndToolTip = createToolTip(hwnd,TTF_TRACK | TTF_ABSOLUTE);
+    infoPtr->hwndToolTip = createToolTip(hwnd,TTF_TRACK | TTF_ABSOLUTE,TRUE);
 
   if (dwStyle & TVS_CHECKBOXES)
@@ -2797 +2799 @@
   sendNotify(hwnd,NM_SETFOCUS);
 
-  if (!(dwStyle & TVS_SHOWSELALWAYS) && infoPtr->selectedItem)
-    TREEVIEW_RefreshItem(hwnd,TREEVIEW_ValidItem(infoPtr,infoPtr->selectedItem),FALSE);
+  if (!(dwStyle & TVS_SHOWSELALWAYS))
+  {
+    if (infoPtr->selectedItem)
+      TREEVIEW_RefreshItem(hwnd,TREEVIEW_ValidItem(infoPtr,infoPtr->selectedItem),FALSE);
+    else if (infoPtr->firstVisible)
+      TREEVIEW_DoSelectItem(hwnd,TVGN_CARET,infoPtr->firstVisible,TVC_UNKNOWN);
+  }
 
   return 0;
@@ -3199 +3206 @@
   }
 
+  /* If item was collapsed we probably need to change selection */
+  if (flag & TVE_COLLAPSE)
+  {
+     HTREEITEM hItem = infoPtr->selectedItem;
+
+     if (!TREEVIEW_ValidItem (infoPtr, hItem))
+        hItem = wineItem->hItem;
+     else
+     {
+        while ( hItem )
+        {
+           hItem = infoPtr->items[(INT)hItem].parent;
+
+           if (hItem == wineItem->hItem)
+              break;
+        }
+     }
+
+     if (hItem)
+        TREEVIEW_DoSelectItem(hwnd, TVGN_CARET, hItem, TVC_UNKNOWN);
+  }
+
   //CB: todo: optimize!
   TREEVIEW_UnqueueRefresh(hwnd,FALSE,FALSE);
@@ -3486 +3515 @@
                   msg.message <= WM_RBUTTONDBLCLK)
          {
+            if (msg.message == WM_RBUTTONUP)
+              TREEVIEW_RButtonUp (hwnd, &pt);
             break;
          }
@@ -3735 +3766 @@
 
 static LRESULT
+TREEVIEW_RButtonUp (HWND hwnd, LPPOINT pPt)
+{
+    POINT pt;
+
+    pt.x = pPt->x;
+    pt.y = pPt->y;
+
+    /* Change to screen coordinate for WM_CONTEXTMENU */
+    ClientToScreen(hwnd, &pt);
+
+    /* Send the WM_CONTEXTMENU on a right click */
+    SendMessageA( hwnd, WM_CONTEXTMENU, (WPARAM) hwnd, MAKELPARAM(pt.x, pt.y));
+    return 0;
+}
+
+static LRESULT
 TREEVIEW_CreateDragImage (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -4219 +4266 @@
         newItem = (& infoPtr->items[(INT)prevItem->parent]);
 
-        hNewSelection = newItem->hItem;
+        hNewSelection = newItem->hItem; //CB: what does Win32??? Please not the Corel hack!!!
       }